Merge branch 'release/0.6.4'

CodeTanzania · Mar 2, 2020 · 0665b92 · 0665b92
2 parents 861a464 + 1033569
commit 0665b92
Show file tree

Hide file tree

Showing 7 changed files with 119 additions and 88 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+#### 0.6.4 (2020-03-02)
+
+##### Bug Fixes
+
+* **seed:**  ensure seed order of csv, json & seeds ([712eecff](https://github.com/codetanzania/ewea-common/commit/712eecff2125f6bc185d0acd57518a37c94b4d88))
+
 #### 0.6.3 (2020-02-29)
 
 ##### Refactors

diff --git a/es/index.js b/es/index.js
@@ -823,7 +823,7 @@ const seedPredefine = (optns, done) => {
   const fromSeeds = next => seedFromSeeds(options, error => next(error));
   const fromJson = next => seedFromJson(options, error => next(error));
   const fromCsv = next => seedFromCsv(options, error => next(error));
-  const stages = [fromSeeds, fromJson, fromCsv];
+  const stages = [fromCsv, fromJson, fromSeeds];
 
   // do seed predefine
   return waterfall(stages, done);
@@ -876,7 +876,7 @@ const seedParty = (optns, done) => {
   const fromSeeds = next => seedFromSeeds(options, error => next(error));
   const fromJson = next => seedFromJson(options, error => next(error));
   const fromCsv = next => seedFromCsv(options, error => next(error));
-  const stages = [fromSeeds, fromJson, fromCsv];
+  const stages = [fromCsv, fromJson, fromSeeds];
 
   // do seed party
   return waterfall(stages, done);
@@ -921,7 +921,7 @@ const seedEvent = (optns, done) => {
   const fromSeeds = next => seedFromSeeds(options, error => next(error));
   const fromJson = next => seedFromJson(options, error => next(error));
   const fromCsv = next => seedFromCsv(options, error => next(error));
-  const stages = [fromSeeds, fromJson, fromCsv];
+  const stages = [fromCsv, fromJson, fromSeeds];
 
   // do seed event
   return waterfall(stages, done);

diff --git a/lib/index.js b/lib/index.js
@@ -824,7 +824,7 @@ const seedPredefine = (optns, done) => {
   const fromSeeds = next => seedFromSeeds(options, error => next(error));
   const fromJson = next => seedFromJson(options, error => next(error));
   const fromCsv = next => seedFromCsv(options, error => next(error));
-  const stages = [fromSeeds, fromJson, fromCsv];
+  const stages = [fromCsv, fromJson, fromSeeds];
 
   // do seed predefine
   return async.waterfall(stages, done);
@@ -877,7 +877,7 @@ const seedParty = (optns, done) => {
   const fromSeeds = next => seedFromSeeds(options, error => next(error));
   const fromJson = next => seedFromJson(options, error => next(error));
   const fromCsv = next => seedFromCsv(options, error => next(error));
-  const stages = [fromSeeds, fromJson, fromCsv];
+  const stages = [fromCsv, fromJson, fromSeeds];
 
   // do seed party
   return async.waterfall(stages, done);
@@ -922,7 +922,7 @@ const seedEvent = (optns, done) => {
   const fromSeeds = next => seedFromSeeds(options, error => next(error));
   const fromJson = next => seedFromJson(options, error => next(error));
   const fromCsv = next => seedFromCsv(options, error => next(error));
-  const stages = [fromSeeds, fromJson, fromCsv];
+  const stages = [fromCsv, fromJson, fromSeeds];
 
   // do seed event
   return async.waterfall(stages, done);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@codetanzania/ewea-common",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Common utilities for EWEA",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -75,7 +75,7 @@
     "@babel/preset-env": "^7.8.6",
     "@babel/register": "^7.8.6",
     "@benmaruchu/faker": "^4.3.0",
-    "@codetanzania/emis-stakeholder": "^2.1.0",
+    "@codetanzania/emis-stakeholder": "^2.2.1",
     "@codetanzania/ewea-event": "^0.5.2",
     "@commitlint/cli": "^8.3.5",
     "@commitlint/config-conventional": "^8.3.4",
@@ -86,15 +86,15 @@
     "chai": "^4.2.0",
     "commitizen": "^4.0.3",
     "coveralls": "^3.0.9",
-    "csv-parse": "^4.8.6",
+    "csv-parse": "^4.8.7",
     "csv-to-array": "^1.0.2",
     "cz-conventional-changelog": "^3.1.0",
     "doxdox": "^3.0.0",
     "eslint": "^6.8.0",
     "eslint-config-airbnb-base": "^14.0.0",
     "eslint-config-prettier": "^6.10.0",
     "eslint-plugin-import": "^2.20.1",
-    "eslint-plugin-jsdoc": "^21.0.0",
+    "eslint-plugin-jsdoc": "^22.0.0",
     "eslint-plugin-mocha": "^6.3.0",
     "eslint-plugin-prettier": "^3.1.2",
     "generate-changelog": "^1.8.0",
@@ -104,7 +104,7 @@
     "lodash.template": "^4.5.0",
     "mocha": "^7.1.0",
     "mongoose": ">=5.9.2",
-    "npm-check-updates": "^4.0.2",
+    "npm-check-updates": "^4.0.3",
     "nyc": "^15.0.0",
     "prettier": "^1.19.1",
     "rimraf": "^3.0.2",