@izara_project/izara-core-library-service-schemas 1.0.98 → 1.0.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-library-service-schemas",
-  "version": "1.0.98",
+  "version": "1.0.99",
   "description": "Schemas for the service and objects it controls",
   "main": "index.js",
   "scripts": {

package/src/ValidatorSchema.js

@@ -1302,34 +1302,49 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
             validateStatus.status = false;
             validateStatus.validateErrors.push(`${flowSchema.flowTag}.objType is invalid`)
           } else {
-            if (Object.keys(objSchema.storageResources).length > 1) { // check for objectSchema must have 1 storageResource
+
+            let dynamoDBStorageTags = [];
+
+            for (const [storageTag, storageResource] of Object.entries(objSchema.storageResources)) {
+              if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
+                dynamoDBStorageTags.push(storageTag)
+              }
+            }
+
+            if (dynamoDBStorageTags.length > 1) {
               validateStatus.status = false;
-              validateStatus.validateErrors.push(`storageResource of objectType:${objSchema.objectType} serviceTag:${flowSchema.objType.serviceTag} is not single storageResource`)
-            } else if (Object.keys(objSchema.storageResources).length = 1) {
-              for (const storageResource of Object.values(objSchema.storageResources)) {
-                if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
-                  if (flowSchema.statusType === "triggerCache" || flowSchema.statusType === "storedCache") {
-                    let specificFieldNames = Object.values(createSpecificFieldNameForCacheTable(createFlowTypeConcat(_izContext, { flowTag: flowSchema.flowTag, serviceTag: iz_serviceTag }), "cacheTable"))
-                    const fieldNames = Object.keys(objSchema.fieldNames)
-                    for (const specificFieldName of specificFieldNames) { // check for specific fieldName
-                      if (!fieldNames.includes(specificFieldName)) {
-                        validateStatus.status = false;
-                        validateStatus.validateErrors.push(`objectType: ${objSchema.objectType} not have fieldNames: ${specificFieldName} in objectSchema.fieldNames`)
-                      }
+              validateStatus.validateErrors.push(`objectType:${objSchema.objectType} should not shave more than 1 dynamoDB storageResource`)
+            } else {
+
+              if (flowSchema.statusType === "statusField") {
+                let specificFieldNames = Object.values(createSpecificFieldNameForCacheTable(createFlowTypeConcat(_izContext, { flowTag: flowSchema.flowTag, serviceTag: iz_serviceTag }), 'statusField'))
+
+                for (const specificFieldName of specificFieldNames) { // check for specific fieldName
+                  if (objSchema.fieldNames.hasOwnProperty(specificFieldName)) {
+                    if (!objSchema.fieldNames[specificFieldName].storageResourceTags.includes(dynamoDBStorageTags[0])) {
+                      validateStatus.status = false;
+                      validateStatus.validateErrors.push(`objectType: ${objSchema.objectType} fieldNames: ${specificFieldName} not have storageResourceTag: ${dynamoDBStorageTags[0]}`);
                     }
-                  } else if (flowSchema.statusType === "statusField") {
-                    let specificFieldNames = Object.values(createSpecificFieldNameForCacheTable(createFlowTypeConcat(_izContext, { flowTag: flowSchema.flowTag, serviceTag: iz_serviceTag }), 'statusField'))
-                    const fieldNames = Object.keys(objSchema.fieldNames)
-                    for (const specificFieldName of specificFieldNames) { // check for specific fieldName
-                      if (!fieldNames.includes(specificFieldName)) {
-                        validateStatus.status = false;
-                        validateStatus.validateErrors.push(`objectType: ${objSchema.objectType} not have fieldNames: ${specificFieldName} in objectSchema.fieldNames`)
-                      }
+                  } else {
+                    validateStatus.status = false;
+                    validateStatus.validateErrors.push(`objectType: ${objSchema.objectType} not have fieldNames: ${specificFieldName} in objectSchema.fieldNames`)
+                  }
+                }
+
+
+              } else if (flowSchema.statusType === "storedCache" || flowSchema.statusType === "triggerCache") {
+                let specificFieldNames = Object.values(createSpecificFieldNameForCacheTable(createFlowTypeConcat(_izContext, { flowTag: flowSchema.flowTag, serviceTag: iz_serviceTag }), "cacheTable"))
+
+                for (const specificFieldName of specificFieldNames) { // check for specific fieldName
+                  if (objSchema.fieldNames.hasOwnProperty(specificFieldName)) {
+                    if (!objSchema.fieldNames[specificFieldName].storageResourceTags.includes(dynamoDBStorageTags[0])) {
+                      validateStatus.status = false;
+                      validateStatus.validateErrors.push(`objectType: ${objSchema.objectType} fieldNames: ${specificFieldName} not have storageResourceTag: ${dynamoDBStorageTags[0]}`);
                     }
+                  } else {
+                    validateStatus.status = false;
+                    validateStatus.validateErrors.push(`objectType: ${objSchema.objectType} not have fieldNames: ${specificFieldName} in objectSchema.fieldNames`)
                   }
-                } else {
-                  validateStatus.status = false;
-                  validateStatus.validateErrors.push(`storageResource of ObjectType: $${flowSchema.objType.flowTag} from flowTag: ${flowSchema.flowTag} must be dynamoDB`);
                 }
               }
             }