Merge pull request #10 from ethical-jobs/feature/activities-filter-or…

…g-fix trello-bug-212 Fixed bug where filter was not fetching correct subjec…
ethical-jobs · Apr 29, 2019 · 1cea219 · 1cea219
2 parents 5610ef7 + f903f68
commit 1cea219
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/activities/__tests__/selectors.spec.js b/src/activities/__tests__/selectors.spec.js
@@ -26,15 +26,21 @@ test('filteredActivity can filter by ... filters', () => {
   const activities = Immutable.fromJS({
     51: {
       id: 51,
-      subject_id: 15,
+      subject: {
+        id: 15
+      },
     },
     52: {
       id: 52,
-      subject_id: 8,
+      subject: {
+        id: 8
+      },
     },
     53: {
       id: 53,
-      subject_id: 15,
+      subject: {
+        id: 15
+      },
     },
   });
   const filters = Immutable.fromJS({

diff --git a/src/activities/filters.js b/src/activities/filters.js
@@ -11,9 +11,9 @@ export function byOrganisations(activity, organisations) {
     return true; // pass through
   }
   if (Immutable.isCollection(organisations)) {
-    return organisations.includes(activity.get('subject_id'));
+    return organisations.includes(activity.getIn(['subject', 'id']));
   }
-  return activity.get('subject_id') === organisations;
+  return activity.getIn(['subject', 'id']) === organisations;
 }
 
 /**