Dev+hotfix (#140)

* Use subfieldValues: false for toMarcRecord * Fix tests * More tests * Update marc-record:v8.0.0
NatLibFi · Oct 27, 2023 · acaa6b3 · acaa6b3
1 parent 48c1a92
commit acaa6b3
Show file tree

Hide file tree

Showing 18 changed files with 354 additions and 32 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "url": "[email protected]:natlibfi/melinda-rest-api-commons.git"
   },
   "license": "AGPL-3.0+",
-  "version": "4.0.16-alpha.8",
+  "version": "4.0.17-alpha.3",
   "main": "./dist/index.js",
   "engines": {
     "node": ">=18"
@@ -38,7 +38,7 @@
     "build": "babel src --source-maps --copy-files --delete-dir-on-start --out-dir=dist"
   },
   "dependencies": {
-    "@natlibfi/marc-record": "^7.3.1",
+    "@natlibfi/marc-record": "^8.0.0",
     "@natlibfi/marc-record-serializers": "^10.1.1",
     "@natlibfi/marc-record-validate": "^8.0.1",
     "@natlibfi/marc-record-validators-melinda": "^10.13.0",

diff --git a/src/amqp.js b/src/amqp.js
@@ -276,8 +276,8 @@ export default async function (AMQP_URL, runHealthCheck = false) {
 
     return messages.map(message => {
       const content = JSON.parse(message.content.toString());
-      // Should we have here validationOptions
-      return new MarcRecord(content.data);
+      // Use subfieldValues: false validationOption here
+      return new MarcRecord(content.data, {subfieldValues: false});
     });
   }
 

diff --git a/test-fixtures/amqp/03/expectedMessage.json b/test-fixtures/amqp/03/expectedMessage.json
@@ -4,7 +4,7 @@
   },
   "records": [
     {
-      "_validationOptions": {},
+      "_validationOptions": {"subfieldValues": false},
       "fields": [
         {
           "tag": "001",

diff --git a/test-fixtures/amqp/04/expectedMessage.json b/test-fixtures/amqp/04/expectedMessage.json
@@ -4,7 +4,7 @@
   },
   "records": [
     {
-      "_validationOptions": {},
+      "_validationOptions": {"subfieldValues": false},
       "fields": [
         {
           "tag": "001",

diff --git a/test-fixtures/amqp/05/expectedMessage.json b/test-fixtures/amqp/05/expectedMessage.json
@@ -4,7 +4,7 @@
   },
   "records": [
     {
-      "_validationOptions": {},
+      "_validationOptions": {"subfieldValues": false},
       "fields": [
         {
           "tag": "001",

diff --git a/test-fixtures/amqp/06/expectedMessage.json b/test-fixtures/amqp/06/expectedMessage.json
@@ -4,7 +4,7 @@
   },
   "records": [
     {
-      "_validationOptions": {},
+      "_validationOptions": {"subfieldValues": false},
       "fields": [
         {
           "tag": "001",

diff --git a/test-fixtures/amqp/08/expectedResult.json b/test-fixtures/amqp/08/expectedResult.json
@@ -1,6 +1,6 @@
 [
   {
-    "_validationOptions": {},
+    "_validationOptions": {"subfieldValues": false},
     "leader": "02518cam a2200745zi 4500",
     "fields": [
       {
@@ -10,7 +10,7 @@
     ]
   },
   {
-    "_validationOptions": {},
+    "_validationOptions": {"subfieldValues": false},
     "leader": "02518cam a2200745zi 4500",
     "fields": [
       {
@@ -20,7 +20,7 @@
     ]
   },
   {
-    "_validationOptions": {},
+    "_validationOptions": {"subfieldValues": false},
     "leader": "02518cam a2200745zi 4500",
     "fields": [
       {

diff --git a/test-fixtures/amqp/09/expectedResult.json b/test-fixtures/amqp/09/expectedResult.json
@@ -1,6 +1,6 @@
 [
   {
-    "_validationOptions": {},
+    "_validationOptions": {"subfieldValues": false},
     "leader": "02518cam a2200745zi 4500",
     "fields": [
       {
@@ -10,7 +10,7 @@
     ]
   },
   {
-    "_validationOptions": {},
+    "_validationOptions": {"subfieldValues": false},
     "leader": "02518cam a2200745zi 4500",
     "fields": [
       {
@@ -20,7 +20,7 @@
     ]
   },
   {
-    "_validationOptions": {},
+    "_validationOptions": {"subfieldValues": false},
     "leader": "02518cam a2200745zi 4500",
     "fields": [
       {

diff --git a/test-fixtures/amqp/20/expectedResult.json b/test-fixtures/amqp/20/expectedResult.json
@@ -0,0 +1,59 @@
+[
+  {
+    "_validationOptions": {"subfieldValues": false},
+    "leader": "02518cam a2200745zi 4500",
+    "fields": [
+      {
+        "tag": "001",
+        "value": "000019640"
+      },
+      {
+        "tag": "CAT",
+        "ind1": " ",
+        "ind2": " ",
+        "subfields": [
+          {
+            "code": "a",
+            "value": "IMP_HELMET"
+          },
+          {
+            "code": "b",
+            "value": ""
+          },
+          {
+            "code": "c",
+            "value": "20220109"
+          },
+          {
+            "code": "l",
+            "value": "FIN01"
+          },
+          {
+            "code": "h",
+            "value": "0838"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "_validationOptions": {"subfieldValues": false},
+    "leader": "02518cam a2200745zi 4500",
+    "fields": [
+      {
+        "tag": "001",
+        "value": "000019641"
+      }
+    ]
+  },
+  {
+    "_validationOptions": {"subfieldValues": false},
+    "leader": "02518cam a2200745zi 4500",
+    "fields": [
+      {
+        "tag": "001",
+        "value": "000019642"
+      }
+    ]
+  }
+]
diff --git a/test-fixtures/amqp/20/input.json b/test-fixtures/amqp/20/input.json
@@ -0,0 +1,77 @@
+[
+  {
+    "queue": "TESTQUEUE",
+    "correlationId": "aaaaaaaa-0000-aaaa-0000-000000000000",
+    "headers": {
+      "correlationId": "aaaaaaaa-0000-aaaa-0000-000000000000"
+    },
+    "data": {
+      "leader": "02518cam a2200745zi 4500",
+      "fields": [
+        {
+          "tag": "001",
+          "value": "000019640"
+        },
+        {
+          "tag": "CAT",
+          "ind1": " ",
+          "ind2": " ",
+          "subfields": [
+            {
+              "code": "a",
+              "value": "IMP_HELMET"
+            },
+            {
+              "code": "b",
+              "value": ""
+            },
+            {
+              "code": "c",
+              "value": "20220109"
+            },
+            {
+              "code": "l",
+              "value": "FIN01"
+            },
+            {
+              "code": "h",
+              "value": "0838"
+            }
+          ]
+        }
+      ]
+    }
+  },
+  {
+    "queue": "TESTQUEUE",
+    "correlationId": "aaaaaaaa-0000-aaaa-0000-000000000000",
+    "headers": {
+      "correlationId": "aaaaaaaa-0000-aaaa-0000-000000000000"
+    },
+    "data": {
+      "leader": "02518cam a2200745zi 4500",
+      "fields": [
+        {
+          "tag": "001",
+          "value": "000019641"
+        }
+      ]
+    }
+  },
+  {
+    "queue": "TESTQUEUE",
+    "correlationId": "aaaaaaaa-0000-aaaa-0000-000000000000",
+    "headers": {
+      "correlationId": "aaaaaaaa-0000-aaaa-0000-000000000000"
+    },
+    "data": {
+      "leader": "02518cam a2200745zi 4500",
+      "fields": [
+        {
+          "tag": "001",
+          "value": "000019642"
+        }
+      ]
+    }
+  }
+]
diff --git a/test-fixtures/amqp/20/metadata.json b/test-fixtures/amqp/20/metadata.json
@@ -0,0 +1,8 @@
+{
+    "description": "CheckQueue - accept records with empty subfield values: basic, toRecord",
+    "skip": false,
+    "only": false,
+    "expectedMessageCount": 0,
+    "sentToQueue": true,
+    "checkQueueStyle": "basicToRecord"
+    }