Merge pull request #149 from partio-scout/bugfix/filtering-dates-amon…

…g-other-fields Bugfix/filtering dates among other fields
partio-scout · Jul 20, 2016 · 76acdf1 · 76acdf1
2 parents 819edb6 + 34130ce
commit 76acdf1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/common/models/participant.js b/src/common/models/participant.js
@@ -35,8 +35,10 @@ export default function (Participant) {
 
       if (where.and) {
         dates = where.and.filter(filter => filter.dates);
-        dates = dates.dates;
-        where.and = where.and.filter(filter => !filter.dates);
+        if (dates && !_.isEmpty(dates)) {
+          dates = dates[0].dates;
+          where.and = where.and.filter(filter => !filter.dates);
+        }
       } else {
         dates = where.dates;
       }

diff --git a/test/date-search.test.js b/test/date-search.test.js
@@ -34,7 +34,7 @@ describe('Date search', () => {
       'campGroup': 'Leirilippukunta',
       'village': 'Kylä',
       'subCamp': 'Alaleiri2',
-      'ageGroup': 'sudenpentu',
+      'ageGroup': 'seikkailija',
       'memberNumber': 345,
     },
     {
@@ -104,7 +104,7 @@ describe('Date search', () => {
   it('Query with other filter', () =>
     queryParticipants({ 'ageGroup':'sudenpentu' }, accessToken)
     .then(res => {
-      expectParticipants([ 'Tero', 'Teemu' ], res.body);
+      expectParticipants([ 'Teemu' ], res.body);
     })
   );
 
@@ -116,14 +116,14 @@ describe('Date search', () => {
   );
 
   it('Query with one date', () =>
-    queryParticipants({ 'dates': ['2016-07-23T00:00:00.000Z'] }, accessToken)
+    queryParticipants({ 'dates': ['2016-07-22T00:00:00.000Z'] }, accessToken)
     .then(res => {
       expectParticipants([ 'Tero', 'Teemu' ], res.body);
     })
   );
 
   it('Query with one date and other filter', () =>
-    queryParticipants({ 'and': [ { 'dates': ['2016-07-23T00:00:00.000Z'] }, { 'subCamp': 'Alaleiri2' } ] }, accessToken)
+    queryParticipants({ 'and': [ { 'dates': ['2016-07-23T00:00:00.000Z'] }, { 'ageGroup': 'seikkailija' } ] }, accessToken)
     .then(res => {
       expectParticipants([ 'Tero' ], res.body);
     })