feat(CSAF2.1): #373 add mandatory test 6.1.44 - refactor input schema

Author: rainer-exxcellent

csaf_2_1/mandatoryTests/mandatoryTest_6_1_44.js

@@ -2,43 +2,33 @@ import Ajv from 'ajv/dist/jtd.js'
 
 const ajv = new Ajv()
 
-const branchSchema = /** @type {const} */ ({
+const fullProductNameSchema = /** @type {const} */ ({
   additionalProperties: true,
   optionalProperties: {
-    branches: {
-      elements: {
-        additionalProperties: true,
-        properties: {},
-      },
-    },
-    product: {
+    product_identification_helper: {
       additionalProperties: true,
       optionalProperties: {
-        product_identification_helper: {
-          additionalProperties: true,
-          optionalProperties: {
-            serial_numbers: { elements: { type: 'string' } },
-          },
-        },
+        serial_numbers: { elements: { type: 'string' } },
       },
     },
   },
 })
 
-const validateBranch = ajv.compile(branchSchema)
-
-const fullProductNameSchema = /** @type {const} */ ({
+const branchSchema = /** @type {const} */ ({
   additionalProperties: true,
   optionalProperties: {
-    product_identification_helper: {
-      additionalProperties: true,
-      optionalProperties: {
-        serial_numbers: { elements: { type: 'string' } },
+    branches: {
+      elements: {
+        additionalProperties: true,
+        properties: {},
       },
     },
+    product: fullProductNameSchema,
   },
 })
 
+const validateBranch = ajv.compile(branchSchema)
+
 /*
   This is the jtd schema that needs to match the input document so that the
   test is activated. If this schema doesn't match, it normally means that the input
@@ -105,8 +95,8 @@ export function checkSerialNumbers(serialNumbers) {
   const invalidNumbers = []
   if (serialNumbers) {
     for (let i = 0; i < serialNumbers.length; i++) {
-      const modelNumber = serialNumbers[i]
-      if (containMultipleUnescapedStars(modelNumber)) {
+      const serialNumber = serialNumbers[i]
+      if (containMultipleUnescapedStars(serialNumber)) {
         invalidNumbers.push('' + i)
       }
     }