Merge pull request #158 from partio-scout/bugfix/date-filter

Bugfix/date filter
partio-scout · Jul 21, 2016 · 4f3275a · 4f3275a
2 parents f0032e2 + 8195dcd
commit 4f3275a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/scripts/create-fake-data.js b/scripts/create-fake-data.js
@@ -5,6 +5,9 @@ import faker from 'faker';
 const ParticipantModel = app.models.Participant;
 const createParticipant = Promise.promisify(ParticipantModel.create, { context: ParticipantModel });
 
+const ParticipantDateModel = app.models.ParticipantDate;
+const createParticipantDate = Promise.promisify(ParticipantDateModel.create, { context: ParticipantDateModel });
+
 const opts = require('commander')
   .usage('<amount of fake participants to create>')
   .parse(process.argv);
@@ -214,6 +217,7 @@ function createMockParticipants(i) {
     countParticipants();
   } else {
     createParticipant(generateRandomParticipant(i))
+      .tap(addParticipantDate)
       .then(createdParticipantInfo => {
         createMockParticipants(i-1);
       })
@@ -223,5 +227,9 @@ function createMockParticipants(i) {
   }
 }
 
+function addParticipantDate(participant) {
+  return createParticipantDate({ participantId: participant.participantId, date: new Date(2016,6,22) });
+}
+
 console.log(`Attempting to create ${amountToCreate} mock participants.`);
 createMockParticipants(amountToCreate);
diff --git a/src/common/models/participant.js b/src/common/models/participant.js
@@ -89,11 +89,7 @@ export default function (Participant) {
     }
 
     function constructInternalDateFilter(participantIds) {
-      const or = [];
-      participantIds.map( id => {
-        or.push({ participantId: id });
-      });
-      return { or: or };
+      return { participantId: { inq: participantIds } };
     }
   }