Add text search to campOfficeNotes & editableInfo and test cases

partio-scout · Jul 17, 2016 · d332676 · d332676
1 parent bf4c1f8
commit d332676
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/common/models/participant.js b/src/common/models/participant.js
@@ -46,6 +46,8 @@ export default function (Participant) {
 
       or.push({ staffPosition: { regexp: `/${stripRegex(string)}/i` } });
       or.push({ staffPositionInGenerator: { regexp: `/${stripRegex(string)}/i` } });
+      or.push({ campOfficeNotes: { regexp: `/${stripRegex(string)}/i` } });
+      or.push({ editableInfo: { regexp: `/${stripRegex(string)}/i` } });
 
       const splitted = string.split(' ', 2);
 

diff --git a/test/text-search.test.js b/test/text-search.test.js
@@ -27,6 +27,7 @@ describe('Text search', () => {
       'memberNumber': 123,
       'staffPosition': null,
       'staffPositionInGenerator': 'Tiskari',
+      'editableInfo': 'Muokattava teksti',
     },
     {
       'participantId': 2,
@@ -42,6 +43,7 @@ describe('Text search', () => {
       'memberNumber': 345,
       'staffPosition': 'Jumppaohjaaja',
       'staffPositionInGenerator': null,
+      'campOfficeNotes': 'Leiritoimiston jutut',
     },
     {
       'participantId': 3,
@@ -189,4 +191,18 @@ describe('Text search', () => {
     })
   );
 
+  it('Query with camp office notes', () =>
+    queryParticipants({ 'textSearch':'Leiritoimisto' }, accessToken)
+    .then(res => {
+      expectParticipants([ 'Tero' ], res.body);
+    })
+  );
+
+  it('Query with editable info', () =>
+    queryParticipants({ 'textSearch':'Muokattava' }, accessToken)
+    .then(res => {
+      expectParticipants([ 'Teemu' ], res.body);
+    })
+  );
+
 });