Merge branch 'master' into feature/show-familycamp-details

partio-scout · Jul 20, 2016 · decf8c1 · decf8c1
2 parents 272ccd2 + bc6c3c2
commit decf8c1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/conf/payment-date-mappings.json b/conf/payment-date-mappings.json
@@ -43,6 +43,6 @@
   "su 31.7.": ["2016-07-31"],
 
   "Osallistun koko leirin ajaksi": ["2016-07-20","2016-07-21","2016-07-22","2016-07-23","2016-07-24","2016-07-25","2016-07-26","2016-07-27"],
-  "Osallistun koko purkuleirille (4 päivää) ja saan alennusta leirimaksusta 20 euroa. Alennuksen saa käteisellä purkuleiriltä poistuttaessa.": ["2016-07-28","2016-07-29","2016-07-30","2016-07-31"],
+  "Osallistun koko purkuleirille (4 päivää) ja saan alennusta leirimaksusta 20 euroa. Summa hyvitetään purkuleirin jälkeen..": ["2016-07-28","2016-07-29","2016-07-30","2016-07-31"],
   "Osallistun vain rakennus-/purkuleirille tai Home Hospitalityn isäntäperheenä.": []
 }
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/src/kuksa-integration/rebuild-tables.js b/src/kuksa-integration/rebuild-tables.js
@@ -69,8 +69,6 @@ function rebuildParticipantsTable() {
   function getSubCamp(participant) {
     if (participant.accommodation === 'Perheleirissä') {
       return 'Riehu';
-    } else if (getSelectionForGroup(participant, 'Osallistun seuraavan ikäkauden ohjelmaan:') === 'perheleirin ohjelmaan (0-11v.), muistathan merkitä lisätiedot osallistumisesta \"vain perheleirin osallistujille\" -osuuteen.') {
-      return 'Riehu';
     }
     return _.get(participant, 'subCamp.name') || 'Muu';
   }

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);
     })