GPII-3138: Update snapsets in data base

README.md

@@ -98,12 +98,22 @@ have set the `NODE_ENV` variable.
 
 ### Convert Preferences Data
 
-GPII has 2 set of preferences JSON5 data files:
-
-* The preferences files for running GPII are located at %gpii-universal/testData/preferences
-* The preferences files for running node tests are located at %gpii-universal/tests/data/preferences
-
-When any preferences file in either one of these 2 directories are modified, running `npm run postinstall` will generate
+GPII has two sets of preferences JSON5 data files, located at `%gpii-universal/testData/preferences` and `%gpii-universal/tests/data/preferences`:
+
+* The preferences files for running GPII and for integration tests are located at
+  `%gpii-universal/testData/preferences`.  These files are converted into two types of preferences safes and GPII keys:
+  * They are converted into `snapset` preferences safes and GPII keys and placed into the
+    `%gpii-universal/build/dbData/snapset/` folder.   These are used to update the snapsets in CouchDB when GPII is
+    run in a production or staging configuration.
+  * They are also converted into `user` preferences safes and GPII keys and placed into the
+    `%gpii-universal/build/dbData/user/` folder.   These are used with PouchDB when GPII runs in a development
+    configuration or when running GPII integration tests.
+* The preferences files for running node tests are located at `%gpii-universal/tests/data/preferences`.  These files
+  are converted into preferences safes and GPII keys:
+  * They are converted into `user` preferences safes and GPII keys and placed into the
+    `%gpii-universal/build/tests/dbData/user` folder.   These are used during testing with PouchDB.
+
+When any preferences file in either one of these two directories are modified, running `npm run postinstall` will generate
 gpiiKeys.json and prefsSafes.json, the files that are in the structure to be loaded into PouchDB/CouchDB, based off
 these directories. This step is needed for the modification to be applied to GPII.
 

package.json

@@ -78,6 +78,6 @@
         "test:vagrantProduction": "vagrant ssh -c 'cd /home/vagrant/sync/universal; DISPLAY=:0; ./scripts/vagrantCloudBasedContainers.sh'",
         "posttest": "node node_modules/nyc/bin/nyc.js report -r text-summary -r html --report-dir reports --temp-directory coverage",
         "start": "node gpii.js",
-        "postinstall": "node scripts/browserifyTestDependency.js && node scripts/convertPrefs.js testData/preferences/ build/dbData/ && node scripts/convertPrefs.js tests/data/preferences/ build/tests/dbData/"
+        "postinstall": "node scripts/browserifyTestDependency.js && node scripts/convertPrefs.js testData/preferences/ build/dbData/snapset/ snapset && node scripts/convertPrefs.js testData/preferences/ build/dbData/user/ user && node scripts/convertPrefs.js tests/data/preferences/ build/tests/dbData/ user"
     }
 }

scripts/convertPrefs.js

@@ -11,10 +11,10 @@ https://github.com/GPII/universal/blob/master/LICENSE.txt
 // This script reads files from an input directory that contains preferences JSON5 files and convert them to JSON files of GPII keys and
 // preferences safes suitable for direct loading into CouchDB or PouchDB, which comply with the new GPII data model:
 // https://wiki.gpii.net/w/Keys,_KeyTokens,_and_Preferences in the target directory
-// Usage: node scripts/convertPrefs.js {input_path} {target_path}
+// Usage: node scripts/convertPrefs.js {input_path} {target_path} {prefsSafeType}, where {prefsSafeType} is one of "snapset" or "user" and defaults to "user"
 //
 // A sample command that runs this script in the universal root directory:
-// node scripts/convertPrefs.js testData/preferences/ build/dbData/
+// node scripts/convertPrefs.js testData/preferences/ build/dbData/ snapset
 
 "use strict";
 
@@ -25,13 +25,19 @@ var fs = require("fs"),
 
 var inputDir = process.argv[2];
 var targetDir = process.argv[3];
+var prefsSafeType = process.argv[4] || "user";
 
+if (prefsSafeType !== "snapset" && prefsSafeType !== "user") {
+    console.log("Usage: node scripts/convertPrefs.js InputFolder OutputFolder PrefsSafeType");
+    console.log("  where PrefsSafeType, is one of 'snapset' or 'user' (defaults to 'user')");
+    process.exit(1);
+}
 var prefsSafes = [];
 var gpiiKeys = [];
 
 var filenames = fs.readdirSync(inputDir);
 
-console.log("Converting preferences data in the source directory " + inputDir + " to the target directory " + targetDir + " ...");
+console.log("Converting preferences data in the source directory " + inputDir + " to the target directory " + targetDir + " as " + prefsSafeType + " Prefs Safes ...");
 
 // Read and loop thru json5 files in the input directory
 rimraf(targetDir, function () {
@@ -60,7 +66,7 @@ rimraf(targetDir, function () {
                     "_id": prefsSafeId,
                     "type": "prefsSafe",
                     "schemaVersion": "0.1",
-                    "prefsSafeType": "user",
+                    "prefsSafeType": prefsSafeType,
                     "name": gpiiKey,
                     "password": null,
                     "email": null,