remove prototype filtering code from assessments

yeatmanlab · Feb 28, 2024 · 494f1ad · 494f1ad
1 parent 6b6d8f9
commit 494f1ad
Showing 1 changed file with 8 additions and 42 deletions.
diff --git a/src/helpers/query/assignments.js b/src/helpers/query/assignments.js
@@ -129,47 +129,13 @@ export const getAssignmentsRequestBody = ({
     }
 
     if (!_isEmpty(filter)) {
-      if (filter.value === 'Completed' || filter.value === 'Assigned' || filter.value === 'Started') {
-        console.log('completed called');
-        if (filter.value === 'Completed') {
-          // console.log('completed called');
-          // requestBody.structuredQuery.where.compositeFilter.filters.push({
-          //   unaryFilter: {
-          //     op: 'IS_NOT_NULL',
-          //     field: { fieldPath: `completed` },
-          //   },
-          // });
-          requestBody.structuredQuery.where.compositeFilter.filters.push({
-            fieldFilter: {
-              field: { fieldPath: `assessments` },
-              op: 'EQUAL',
-              value: { stringValue: '2' },
-            },
-          });
-        } else if (filter.value === 'Assigned') {
-          requestBody.structuredQuery.where.compositeFilter.filters.push({
-            unaryFilter: {
-              op: 'IS_NULL',
-              field: { fieldPath: `startedOn` },
-            },
-          });
-        } else if (filter.value === 'Started') {
-          requestBody.structuredQuery.where.compositeFilter.filters.push({
-            unaryFilter: {
-              op: 'IS_NOT_NULL',
-              field: { fieldPath: `startedOn` },
-            },
-          });
-        }
-      } else {
-        requestBody.structuredQuery.where.compositeFilter.filters.push({
-          fieldFilter: {
-            field: { fieldPath: `userData.${filter.field}` },
-            op: 'EQUAL',
-            value: { stringValue: filter.value },
-          },
-        });
-      }
+      requestBody.structuredQuery.where.compositeFilter.filters.push({
+        fieldFilter: {
+          field: { fieldPath: `userData.${filter.field}` },
+          op: 'EQUAL',
+          value: { stringValue: filter.value },
+        },
+      });
     }
   } else {
     const currentDate = new Date().toISOString();
@@ -685,7 +651,7 @@ export const assignmentCounter = (adminId, orgType, orgId, filters = []) => {
     }
   });
   let requestBody;
-  if (nonOrgFilter && nonOrgFilter.collection === 'scores' && nonOrgFilter.constraint.value !== 'Assigned') {
+  if (nonOrgFilter && nonOrgFilter.collection === 'scores') {
     let orgFilter = null;
     let gradeFilter = null;
     if (orgFilters && orgFilters.collection === 'schools' && !_isEmpty(orgFilters.value)) {