Add test etc. (#139)

* add tests * improve old tests * add test to bad date
NatLibFi · Oct 24, 2023 · f98f5fa · f98f5fa
1 parent f4ed42b
commit f98f5fa
Show file tree

Hide file tree

Showing 21 changed files with 2,177 additions and 370 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/mongoLog.js b/src/mongoLog.js
@@ -42,7 +42,7 @@ export default async function (MONGO_URI, dbName = 'rest-api') {
   const client = await MongoClient.connect(MONGO_URI, {useNewUrlParser: true, useUnifiedTopology: true});
   const db = client.db(dbName);
   const collection = 'logs';
-  return {addLogItem, query, queryById, getListOfLogs, getCatalogersListOfLogs, getExpandedListOfLogs, protect, remove, removeBySequences};
+  return {addLogItem, query, queryById, getListOfLogs, getListOfCatalogers, getExpandedListOfLogs, protect, remove, removeBySequences};
 
   async function addLogItem(logItem) {
     const time = moment().toDate();
@@ -52,14 +52,14 @@ export default async function (MONGO_URI, dbName = 'rest-api') {
       protected: false
     };
     try {
-      console.log(newLogItem); // eslint-disable-line
+      // console.log(newLogItem); // eslint-disable-line
       checkLogItemType(logItem.logItemType, false);
       const result = await db.collection(collection).insertOne(newLogItem);
       if (result.acknowledged) {
         const {blobSequence, blobSequenceStart, blobSequenceEnd} = logItem;
         const itemString = blobSequenceStart && blobSequenceEnd ? `${blobSequenceStart} - ${blobSequenceEnd}` : `${blobSequence}`;
         logger.info(`*** New ${logItem.logItemType} added for ${logItem.correlationId}, blobSequence(s): ${itemString}. ***`);
-        console.log('addLogItem done', result); // eslint-disable-line
+        // console.log('addLogItem done', result); // eslint-disable-line
         return;
       }
       throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);
@@ -109,8 +109,8 @@ export default async function (MONGO_URI, dbName = 'rest-api') {
     return {status: result.length > 0 ? httpStatus.OK : httpStatus.NOT_FOUND, payload: result.length > 0 ? result : 'No logs found'};
   }
 
-  async function getCatalogersListOfLogs() {
-    logger.debug(`Getting expanded list of logs`);
+  async function getListOfCatalogers() {
+    logger.debug(`Getting list of Catalogers`);
 
     const result = await db.collection(collection) // eslint-disable-line functional/immutable-data
       .distinct('cataloger');
@@ -163,13 +163,15 @@ export default async function (MONGO_URI, dbName = 'rest-api') {
     return {status: fixedResult.length > 0 ? httpStatus.OK : httpStatus.NOT_FOUND, payload: fixedResult.length > 0 ? fixedResult : 'No logs found'};
 
     function generateMatchObject(logItemTypes, catalogers, dateBefore, dateAfter) {
+      const dateBeforeIso = new Date(dateBefore).toISOString();
+      const dateAfterIso = new Date(dateAfter).toISOString();
       const matchOptions = {
         '$match': {
           'logItemType': logItemTypes.length > 0 ? {'$in': logItemTypes} : /.*/ui,
           'cataloger': catalogers.length > 0 ? {'$in': catalogers} : /.*/ui,
           'creationTime': {
-            '$gte': new Date(dateAfter).toISOString(),
-            '$lte': new Date(dateBefore).toISOString()
+            '$gte': dateAfterIso,
+            '$lte': dateBeforeIso
           }
         }
       };

diff --git a/src/mongoLog.spec.js b/src/mongoLog.spec.js
@@ -64,14 +64,14 @@ async function callback({
 
   if (functionName === 'getCatalogersListOfLogs') {
     const result = await mongoLogOperator.getCatalogersListOfLogs();
-    console.log(result); // eslint-disable-line
+    // console.log(result); // eslint-disable-line
 
     return expect(result).to.eql(expectedResult);
   }
 
   if (functionName === 'getExpandedListOfLogs') {
     const result = await mongoLogOperator.getExpandedListOfLogs(params);
-    console.log(result); // eslint-disable-line
+    // console.log(result); // eslint-disable-line
 
     return expect(result).to.eql(expectedResult);
   }

diff --git a/test-fixtures/mongoLog/02/metadata.json b/test-fixtures/mongoLog/02/metadata.json
@@ -1,8 +1,8 @@
 {
-  "description": "Function: getCatalogersListOfLogs, gets 3 uniq catalogers from 3 logs (MATCH_LOG and MERGE_LOG)",
+  "description": "Function: getListOfCatalogers, gets 3 uniq catalogers from 3 logs (MATCH_LOG and MERGE_LOG)",
   "only": false,
   "skip": false,
-  "functionName": "getCatalogersListOfLogs",
+  "functionName": "getListOfCatalogers",
   "preFillDb": true,
   "params": []
 }
diff --git a/test-fixtures/mongoLog/04/expectedResult.json b/test-fixtures/mongoLog/04/expectedResult.json
@@ -13,6 +13,13 @@
         "creationTime": "2023-08-08T01:25:59.348Z",
         "logCount": 1,
         "logItemType": "MERGE_LOG"
+      },
+      {
+        "cataloger": "IMP_TEST3",
+        "correlationId": "7207c1f2-cbc4-4a0c-bd64-344a746ee605",
+        "creationTime": "2023-09-21T01:07:26.693Z",
+        "logCount": 1,
+        "logItemType": "MATCH_LOG"
       }
     ],
     "status": 200

diff --git a/test-fixtures/mongoLog/04/metadata.json b/test-fixtures/mongoLog/04/metadata.json
@@ -1,8 +1,8 @@
 {
-  "description": "Function: getExpandedListOfLogs - Empty params get all 3",
+  "description": "Function: getExpandedListOfLogs - params {logItemTypes: [MERGE_LOG, MATCH_LOG]} get all 3",
   "only": false,
   "skip": false,
   "functionName": "getExpandedListOfLogs",
   "preFillDb": true,
-  "params": {"logItemTypes": ["MERGE_LOG"]}
+  "params": {"logItemTypes": ["MERGE_LOG", "MATCH_LOG"]}
 }
diff --git a/test-fixtures/mongoLog/05/metadata.json b/test-fixtures/mongoLog/05/metadata.json
@@ -1,8 +1,8 @@
 {
-  "description": "Function: getExpandedListOfLogs - logItemType and default dates - get 2/3",
-  "only": true,
+  "description": "Function: getExpandedListOfLogs - params {logItemTypes: [MERGE_LOG]} get 2",
+  "only": false,
   "skip": false,
   "functionName": "getExpandedListOfLogs",
   "preFillDb": true,
-  "params": {"logItemTypes": ["MERGE_LOG"], "dateAfter": "Sat Jan 01 2000 02:00:00 GMT+0200 (Eastern European Standard Time)", "dateBefore": "Fri Oct 20 2023 16:37:00 GMT+0300 (Eastern European Summer Time)"}
+  "params": {"logItemTypes": ["MERGE_LOG"]}
 }
diff --git a/test-fixtures/mongoLog/06/expectedResult.json b/test-fixtures/mongoLog/06/expectedResult.json
@@ -1,9 +1,9 @@
   {
     "payload": [
       {
-        "cataloger": "IMP_TEST2",
-        "correlationId": "f63bad0b-8820-428a-b570-c172f209ee94",
-        "creationTime": "2023-08-08T01:25:59.348Z",
+        "cataloger": "IMP_TEST1",
+        "correlationId": "bdce85eb-0ca2-4525-b00e-ae67d43b68ec",
+        "creationTime": "2023-08-07T01:21:38.392Z",
         "logCount": 1,
         "logItemType": "MERGE_LOG"
       }

diff --git a/test-fixtures/mongoLog/06/metadata.json b/test-fixtures/mongoLog/06/metadata.json
@@ -1,8 +1,8 @@
 {
-  "description": "Function: getExpandedListOfLogs - logItemType and default dates - get 2/3",
-  "only": true,
+  "description": "Function: getExpandedListOfLogs - params {catalogers: [IMP_TEST1]} get 1",
+  "only": false,
   "skip": false,
   "functionName": "getExpandedListOfLogs",
   "preFillDb": true,
-  "params": {"logItemTypes": ["MERGE_LOG"], "dateAfter": "2023-08-07T01:24:00", "dateBefore": "Fri Oct 20 2023 16:37:00 GMT+0300 (Eastern European Summer Time)"}
+  "params": {"catalogers": ["IMP_TEST1"]}
 }