update with final fixes

gondzo · gondzo · commit 635b6195ecdf · 2017-12-20T18:12:03.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -5,10 +5,6 @@ logs
 *.log
 npm-debug.log*
 
-#kyle
-.DS_Store
-*.csv
-
 # Runtime data
 pids
 *.pid
diff --git a/config/default.json b/config/default.json
@@ -2,7 +2,7 @@
   "dataset_url": "https://www.data.va.gov/data.json",
   "logLevel": "info",
   "dbConfig": {
-    "db_url": "postgres://user:pass@localhost:5432/va"
+    "db_url": "postgres://postgres:pass@localhost:5432/va"
   },
   "downloadPath": "downloads"
 }
diff --git a/csvCounts.txt b/csvCounts.txt
diff --git a/models/Branch.js b/models/Branch.js
@@ -8,11 +8,15 @@
  * Branch model definition
  */
 module.exports = (sequelize, DataTypes) => sequelize.define('Branch', {
+  id: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    primaryKey: true,
+    autoIncrement: true
+  },
   value: {
     type: DataTypes.STRING,
-    allowNull: null,
-    primaryKey: true,
-    unique: true
+    allowNull: false
   }
 }, {
   timestamps: false
diff --git a/models/Rank.js b/models/Rank.js
@@ -8,11 +8,15 @@
  * Rank model definition
  */
 module.exports = (sequelize, DataTypes) => sequelize.define('Rank', {
+  id: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    primaryKey: true,
+    autoIncrement: true
+  },
   value: {
     type: DataTypes.STRING,
-    allowNull: null,
-    primaryKey: true,
-    unique: true
+    allowNull: false
   }
 }, {
   timestamps: false
diff --git a/models/Veteran.js b/models/Veteran.js
@@ -17,8 +17,8 @@ module.exports = (sequelize, DataTypes) => sequelize.define('Veteran', {
   d_first_name: { type: DataTypes.STRING, allowNull: false },
   d_mid_name: DataTypes.STRING,
   d_last_name: { type: DataTypes.STRING, allowNull: false },
-  d_birth_date: { type: DataTypes.DATE, allowNull: false },
-  d_death_date: { type: DataTypes.DATE, allowNull: false },
+  d_birth_date: { type: DataTypes.DATEONLY, allowNull: false },
+  d_death_date: { type: DataTypes.DATEONLY, allowNull: false },
   d_suffix: DataTypes.STRING
 }, {
   timestamps: false
diff --git a/models/War.js b/models/War.js
@@ -8,11 +8,15 @@
  * War model definition
  */
 module.exports = (sequelize, DataTypes) => sequelize.define('War', {
+  id: {
+    type: DataTypes.INTEGER,
+    allowNull: false,
+    primaryKey: true,
+    autoIncrement: true
+  },
   value: {
     type: DataTypes.STRING,
-    allowNull: null,
-    primaryKey: true,
-    unique: true
+    allowNull: false
   }
 }, {
   timestamps: false
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,13 +14,14 @@
   },
   "license": "ISC",
   "dependencies": {
+    "ascii-progress": "^1.0.5",
     "chalk": "^2.3.0",
     "co": "^4.6.0",
     "config": "^1.27.0",
     "csv-parse": "^2.0.0",
     "dotenv": "^4.0.0",
     "lodash": "^4.17.4",
-    "moment": "^2.19.4",
+    "moment": "^2.20.0",
     "pg": "^7.4.0",
     "request": "^2.83.0",
     "request-promise": "^4.2.2",
diff --git a/scripts/import-data.js b/scripts/import-data.js
@@ -16,19 +16,17 @@ const datasetService = require('../services/dataset');
 const dataService = require('../services/data');
 const { syncDB } = require('../models');
 
-const downloadPath = `${__dirname}/../${config.downloadPath}/`;
-
 co(function* () {
   yield syncDB();
-  const files = datasetService.getFilenames(downloadPath);
+  const files = datasetService.getFilenames(config.downloadPath);
 
   /**
     * Read each dataset recursively.
     * @param {integer} index - The dataset index
     */
   function* readfile(index) {
     logger.info(`Processing file: ${files[index]}`);
-    yield dataService.processFile(yield datasetService.readCSV(`${downloadPath}/${files[index]}`));
+    yield dataService.processFile(yield datasetService.readCSV(`${config.downloadPath}/${files[index]}`));
     return index < files.length - 1 ? yield readfile(index + 1) : true;
   }
 
diff --git a/services/data.js b/services/data.js
diff --git a/services/dataset.js b/services/dataset.js

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"dataset_url": "https://www.data.va.gov/data.json",`
`3`	`3`	`"logLevel": "info",`
`4`	`4`	`"dbConfig": {`
`5`		`- "db_url": "postgres://user:pass@localhost:5432/va"`
	`5`	`+ "db_url": "postgres://postgres:pass@localhost:5432/va"`
`6`	`6`	`},`
`7`	`7`	`"downloadPath": "downloads"`
`8`	`8`	`}`