Merge branch 'develop' of github.com:CodeTanzania/ewea-reports into d…

…evelop

package.json

@@ -96,13 +96,13 @@
     "eslint-config-airbnb-base": "^14.1.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-jsdoc": "^27.0.2",
+    "eslint-plugin-jsdoc": "^27.0.3",
     "eslint-plugin-mocha": "^7.0.1",
     "eslint-plugin-prettier": "^3.1.3",
     "generate-changelog": "^1.8.0",
     "handlebars": "^4.7.6",
     "husky": "^4.2.5",
-    "lint-staged": "^10.2.8",
+    "lint-staged": "^10.2.9",
     "lodash.template": "^4.5.0",
     "mocha": "^7.2.0",
     "mongoose": ">=5.9.17",

test/fixtures/cases.js

@@ -37,7 +37,7 @@ const cases = [
         },
         model: 'Predefine',
       },
-      'victiom.area': {
+      'victim.area': {
         match: { namespace: 'AdministrativeArea', 'strings.name.en': 'Ilala' },
         model: 'Predefine',
       },

test/fixtures/predefines/index.js

@@ -1,25 +1,37 @@
 import units from './units';
+import priorities from './priorities';
 import administrativeLevels from './administrativelevels';
 import featureTypes from './featuretypes';
 import eventIndicators from './eventindicators';
 import eventTopics from './eventtopics';
-import eventCertainties from './eventcertainties';
 import eventLevels from './eventlevels';
 import eventSeverities from './eventseverities';
+import eventCertainties from './eventcertainties';
 import eventStatuses from './eventstatuses';
 import eventUrgencies from './eventurgencies';
-import eventGroups from './eventgroups';
-import eventTypes from './eventtypes';
-import eventQuestions from './eventquestions';
+import eventResponses from './eventresponses';
+import partyOwnerships from './partyownerships';
 import partyGroups from './partygroups';
 import partyRoles from './partyroles';
+import partyGenders from './partygenders';
+import partyOccupations from './partyoccupations';
+import vehicleTypes from './vehicletypes';
+import vehicleModels from './vehiclemodels';
+import vehicleMakes from './vehiclemakes';
+import vehicleStatuses from './vehiclestatuses';
+import eventGroups from './eventgroups';
+import eventTypes from './eventtypes';
 import eventFunctions from './eventfunctions';
 import eventActions from './eventactions';
+import eventQuestions from './eventquestions';
 import administrativeAreas from './administrativeareas';
+import features from './features';
+import vehicles from './vehicles';
 import eventActionCatalogues from './eventactioncatalogues';
 
 const predefines = [
   ...units,
+  ...priorities,
   ...administrativeLevels,
   ...featureTypes,
   ...eventIndicators,
@@ -29,15 +41,26 @@ const predefines = [
   ...eventCertainties,
   ...eventStatuses,
   ...eventUrgencies,
-  ...eventGroups,
-  ...eventTypes,
+  ...eventResponses,
+  ...partyOwnerships,
   ...partyGroups,
   ...partyRoles,
-  ...eventQuestions,
+  ...partyGenders,
+  ...partyOccupations,
+  ...vehicleTypes,
+  ...vehicleModels,
+  ...vehicleMakes,
+  ...vehicleStatuses,
+  ...eventGroups,
+  ...eventTypes,
   ...eventFunctions,
   ...eventActions,
+  ...eventQuestions,
   ...administrativeAreas,
+  ...features,
+  ...vehicles,
   ...eventActionCatalogues,
+  // ...notificationTemplates,
 ];
 
 export default predefines;

test/fixtures/predefines/partyoccupations.js

@@ -1,4 +1,4 @@
-const genders = [
+const occupations = [
   {
     namespace: 'PartyOccupation',
     strings: { name: { en: 'Health Care Worker' } },
@@ -10,4 +10,4 @@ const genders = [
   },
 ];
 
-export default genders;
+export default occupations;

test/fixtures/vehicledispatches.js

@@ -81,7 +81,7 @@ const dispatches = [
         match: { namespace: 'PartyGender', 'strings.name.en': 'Female' },
         model: 'Predefine',
       },
-      'victiom.area': {
+      'victim.area': {
         match: { namespace: 'AdministrativeArea', 'strings.name.en': 'Ilala' },
         model: 'Predefine',
       },

test/integration/bootstrap.spec.js

@@ -28,7 +28,10 @@ before((done) => connect(done));
 
 before((done) => clear(done));
 
-before((done) => seed(done));
+before((done) => {
+  // enableDebug();
+  return seed(done);
+});
 
 after((done) => clear(done));