fix: mongo collection renaming

platforms/makhno/backend/package.json

@@ -25,7 +25,7 @@
     "moment": "^2.29.2",
     "mongodb": "^4.3.1",
     "nacl-signature": "^1.0.0",
-    "nconf": "^0.8.5",
+    "nconf": "^0.11.3",
     "node-fetch": "^2.6.7",
     "tweetnacl": "^0.14.5"
   },

platforms/tktrex/backend/config/settings.json

@@ -5,9 +5,8 @@
     "htmls": "htmls",
     "metadata": "metadata",
     "full": "full",
-    "directives": "directives",
     "emails": "emails2",
-    "experiments": "experiments"
+    "experiments": "experiments2"
   },
 
   "mongoHost": "localhost",

platforms/tktrex/backend/config/trexstats.json

@@ -81,5 +81,11 @@
                 "selector": { }
             }
         ]
+    },
+    {
+        "name": "experiments",
+        "column": "experiments2",
+        "timevar": "when",
+        "variables": [{ "name": "total", "selector": {} }]
     }]
 }

platforms/tktrex/backend/lib/experiments.js

@@ -11,7 +11,7 @@ const mongo3 = require('./mongo3');
 
 async function pickDirective(experimentId) {
   const mongoc = await mongo3.clientConnect({ concurrency: 1 });
-  const rb = await mongo3.readOne(mongoc, nconf.get('schema').directives, {
+  const rb = await mongo3.readOne(mongoc, nconf.get('schema').experiments, {
     experimentId,
   });
   await mongoc.close();
@@ -25,7 +25,7 @@ async function registerDirective(directives) {
     directives,
   });
   const mongoc = await mongo3.clientConnect({ concurrency: 1 });
-  const exist = await mongo3.readOne(mongoc, nconf.get('schema').directives, {
+  const exist = await mongo3.readOne(mongoc, nconf.get('schema').experiments, {
     experimentId,
   });
 
@@ -46,7 +46,7 @@ async function registerDirective(directives) {
 
   /* else, we don't had such data, hence */
   debug('Registering new experiment %s: %j', experimentId, directives);
-  await mongo3.writeOne(mongoc, nconf.get('schema').directives, {
+  await mongo3.writeOne(mongoc, nconf.get('schema').experiments, {
     when: new Date(),
     directives,
     experimentId,

platforms/tktrex/backend/package.json

@@ -6,6 +6,7 @@
   "scripts": {
     "lint": "eslint ./",
     "test": "jest",
+    "coc": "DEBUG=* ts-node bin/count-o-clock.js",
     "tto:watch": "key=fuffa DEBUG=\"*,-express:*,-body-parser:*,-send\" ts-node-dev -r tsconfig-paths/register --respawn --transpile-only bin/observatory",
     "tto:start": "DEBUG=\"*,-express:*,-body-parser:*,-send\" ts-node bin/observatory",
     "watch": "key=fuffa DEBUG=\"*,-express:*,-body-parser:*,-send\" ts-node-dev -r tsconfig-paths/register --respawn --transpile-only bin/server",
@@ -32,7 +33,7 @@
     "moment": "^2.29.2",
     "mongodb": "^4.3.1",
     "nacl-signature": "^1.0.0",
-    "nconf": "^0.8.5",
+    "nconf": "^0.11.3",
     "node-fetch": "^2.6.7",
     "nodemon": "^1.19.4",
     "tweetnacl": "^0.14.5"

platforms/tktrex/backend/routes/__tests__/personal.e2e.ts

@@ -16,7 +16,7 @@ describe('Events', () => {
     appTest = await GetTest();
     await appTest.mongo3.insertMany(
       appTest.mongo,
-      appTest.config.get('schema').directives,
+      appTest.config.get('schema').experiments,
       [experiment]
     );
   });

platforms/tktrex/backend/routes/directives.js

@@ -53,7 +53,7 @@ async function getPublic(req) {
   // TODO this API can also be cached with the same logic of statistics
   const publicDirectives = await mongo3.readLimit(
     mongoc,
-    nconf.get('schema').directives,
+    nconf.get('schema').experiments,
     {}, // TODO { visibility: 'public' },
     { when: -1 },
     20,

platforms/tktrex/backend/routes/experiments.js

@@ -136,7 +136,7 @@ async function list(req) {
 
   const configured = await mongo3.readLimit(
     mongoc,
-    nconf.get('schema').directives,
+    nconf.get('schema').experiments,
     filter,
     { when: -1 },
     MAX,

platforms/tktrex/backend/scripts/build-indexes.js

@@ -1,24 +1,24 @@
-ret = db.metadata2.createIndex({id: 1}, {unique: true }); checkret('metadata id', ret);
-ret = db.metadata2.createIndex({videoId: 1}); checkret('metadata videoId', ret);
-ret = db.metadata2.createIndex({"sections.videos.videoId": 1}); checkret('metadata sections.videos.href', ret);
-ret = db.metadata2.createIndex({authorName: 1}); checkret('metadata authorName', ret);
-ret = db.metadata2.createIndex({publicKey: 1}); checkret('metadata publicKey', ret);
-ret = db.metadata2.createIndex({savingTime: -1}); checkret('metadata savingTime', ret);
-ret = db.metadata2.createIndex({type: -1}); checkret('metadata type', ret);
+ret = db.metadata.createIndex({id: 1}, {unique: true }); checkret('metadata id', ret);
+ret = db.metadata.createIndex({videoId: 1}); checkret('metadata videoId', ret);
+ret = db.metadata.createIndex({"sections.videos.videoId": 1}); checkret('metadata sections.videos.href', ret);
+ret = db.metadata.createIndex({authorName: 1}); checkret('metadata authorName', ret);
+ret = db.metadata.createIndex({publicKey: 1}); checkret('metadata publicKey', ret);
+ret = db.metadata.createIndex({savingTime: -1}); checkret('metadata savingTime', ret);
+ret = db.metadata.createIndex({type: -1}); checkret('metadata type', ret);
 
 ret = db.supporters.createIndex({ publicKey: 1 }, { unique: true }); checkret('supporters publicKey:', ret);
 
+ret = db.experiments2.createIndex({ experimentId: -1, unique: true });
+checkret('experiments2 experimentId', ret);
+ret = db.experiments2.createIndex({ when: -1 });
+checkret('experiments2 when', ret);
+
 ret = db.htmls.createIndex({ id: 1 }, { unique: true} ); checkret('htmls id', ret);
 ret = db.htmls.createIndex({ savingTime: -1 }); checkret('htmls savingTime', ret);
 ret = db.htmls.createIndex({ publicKey: -1 }); checkret('htmls publicKey', ret);
 ret = db.htmls.createIndex({ metadataId: -1 }); checkret('htmls metadataId', ret);
 ret = db.htmls.createIndex({ processed: 1 }); checkret('htmls processed', ret);
 
-ret = db.retrieved.createIndex({ videoId: 1 }, { unique: true} ); checkret('retrieved videoId', ret);
-ret = db.retrieved.createIndex({ when: -1 }); checkret('retrieved when', ret);
-
-ret = db.categories.createIndex({ videoId: 1 }, { unique: true} ); checkret('categories videoId', ret);
-ret = db.categories.createIndex({ when: -1 }); checkret('categories when', ret);
 
 function checkret(info, retval) {
     retval.info = info;

platforms/yttrex/backend/config/settings.json

@@ -9,8 +9,7 @@
       "answers": "answers",
       "recommendations": "recommendations",
       "ytvids": "ytvids",
-      "experiments": "experiments",
-      "directives": "directives",
+      "experiments": "experiments2",
       "emails": "emails",
       "tokens": "tokens",
       "creators": "creators",

platforms/yttrex/backend/config/trexstats.json

@@ -91,7 +91,7 @@
         },
         {
           "name": "experiment",
-          "selector": { "type": "video", "experiment": { "$exists": true } }
+          "selector": { "type": "video", "experimentId": { "$exists": true } }
         }
       ]
     },
@@ -129,7 +129,7 @@
         },
         {
           "name": "experiment",
-          "selector": { "experiment": { "$exists": true }, "type": "search" }
+          "selector": { "experimentId": { "$exists": true }, "type": "search" }
         }
       ]
     },
@@ -145,10 +145,16 @@
         { "name": "home", "selector": { "nature.type": "home" } },
         {
           "name": "experiment",
-          "selector": { "experiment": { "$exists": true } }
+          "selector": { "experimentId": { "$exists": true } }
         }
       ]
     },
+    {
+      "name": "experiments",
+      "column": "experiments2",
+      "timevar": "when",
+      "variables": [{ "name": "total", "selector": {} }]
+    },
     {
       "name": "creators",
       "column": "creators",

platforms/yttrex/backend/lib/automo.js

@@ -830,7 +830,7 @@ async function registerDirective(directives, directiveType) {
     directives,
   });
   const mongoc = await mongo3.clientConnect({ concurrency: 1 });
-  const exist = await mongo3.readOne(mongoc, nconf.get('schema').directives, {
+  const exist = await mongo3.readOne(mongoc, nconf.get('schema').experiments, {
     experimentId,
   });
 
@@ -845,7 +845,7 @@ async function registerDirective(directives, directiveType) {
   }
 
   /* else, we don't had such data, hence */
-  await mongo3.writeOne(mongoc, nconf.get('schema').directives, {
+  await mongo3.writeOne(mongoc, nconf.get('schema').experiments, {
     when: new Date(),
     directiveType,
     directives,
@@ -858,7 +858,7 @@ async function registerDirective(directives, directiveType) {
 
 async function pickDirective(experimentId) {
   const mongoc = await mongo3.clientConnect({ concurrency: 1 });
-  const rb = await mongo3.readOne(mongoc, nconf.get('schema').directives, {
+  const rb = await mongo3.readOne(mongoc, nconf.get('schema').experiments, {
     experimentId,
   });
   await mongoc.close();

platforms/yttrex/backend/package.json

@@ -44,7 +44,7 @@
     "moment": "^2.29.2",
     "mongodb": "^4.3.1",
     "nacl-signature": "^1.0.0",
-    "nconf": "^0.8.5",
+    "nconf": "^0.11.3",
     "node-fetch": "^2.6.7",
     "numeral": "^2.0.6",
     "ts-endpoint": "^2.0.0",

platforms/yttrex/backend/routes/__tests__/personal.e2e.ts

@@ -30,7 +30,7 @@ describe('Events', () => {
     appTest = await GetTest();
     await appTest.mongo3.insertMany(
       appTest.mongo,
-      appTest.config.get('schema').directives,
+      appTest.config.get('schema').experiments,
       [experiment]
     );
   });

platforms/yttrex/backend/routes/directives.js

@@ -187,7 +187,7 @@ async function getPublic(req) {
 
   const publicDirectives = await mongo3.readLimit(
     mongoc,
-    nconf.get('schema').directives,
+    nconf.get('schema').experiments,
     filter,
     { when: -1 },
     20,

platforms/yttrex/backend/routes/experiments.js

@@ -248,7 +248,7 @@ async function list(req) {
 
   const configured = await mongo3.readLimit(
     mongoc,
-    nconf.get('schema').directives,
+    nconf.get('schema').experiments,
     filter,
     { when: -1 },
     options.amount,
@@ -264,7 +264,7 @@ async function list(req) {
 
   const total = await mongo3.count(
     mongoc,
-    nconf.get('schema').directives,
+    nconf.get('schema').experiments,
     filter
   );
 
@@ -327,7 +327,7 @@ async function emergency(req) {
   const experimentId = params.getString(req, 'experimentId', true);
   const directive = await mongo3.readOne(
     mongoc,
-    nconf.get('schema').directives,
+    nconf.get('schema').experiments,
     {
       experimentId,
       directiveType: 'comparison',

platforms/yttrex/backend/scripts/build-indexes.js

@@ -52,6 +52,21 @@ checkret('errors id', ret);
 ret = db.errors.createIndex({ when: -1 });
 checkret('errors when', ret);
 
+
+ret = db.ads.createIndex({ metadataId: 1 });
+checkret('ads metadataId', ret);
+ret = db.ads.createIndex({ savingTime: -1 });
+checkret('ads savingTime', ret);
+ret = db.ads.createIndex({ id: 1 }, { unique: true });
+checkret('ads id', ret);
+
+ret = db.experiments2.createIndex({ experimentId: -1, unique: true });
+checkret('experiments2 experimentId', ret);
+ret = db.experiments2.createIndex({ when: -1 });
+checkret('experiments2 when', ret);
+
+
+/* below this the collections are for youchoose */
 ret = db.recommendations.createIndex({ urlId: 1 }, { unique: true });
 checkret('recommendations urlId', ret);
 ret = db.recommendations.createIndex({ when: -1 });
@@ -62,16 +77,6 @@ checkret('ytvids videoId', ret);
 ret = db.ytvids.createIndex({ creatorId: -1 });
 checkret('ytvids creatorId', ret);
 
-ret = db.directives.createIndex({ experimentId: -1 }, { unique: true });
-checkret('directives experimentId', ret);
-
-ret = db.experiments.createIndex({ experimentId: -1 });
-checkret('experiments experimentId', ret);
-ret = db.experiments.createIndex({ publicKey: -1 });
-checkret('experiments publicKey', ret);
-ret = db.experiments.createIndex({ testTime: -1 });
-checkret('experiments testTime', ret);
-
 ret = db.tokens.createIndex({ channelId: 1 }, { unique: true });
 checkret('tokens unique channelId', ret);
 ret = db.tokens.createIndex({ verificationToken: 1 });
@@ -87,12 +92,6 @@ checkret('creators channelId', ret);
 ret = db.creators.createIndex({ accessToken: 1 });
 checkret('creators accessToken', ret);
 
-ret = db.ads.createIndex({ metadataId: 1 });
-checkret('ads metadataId', ret);
-ret = db.ads.createIndex({ savingTime: -1 });
-checkret('ads savingTime', ret);
-ret = db.ads.createIndex({ id: 1 }, { unique: true });
-checkret('ads id', ret);
 
 function checkret(info, retval) {
   retval.info = info;