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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-library-service-schemas",
-  "version": "1.0.98",
+  "version": "1.0.100",
   "description": "Schemas for the service and objects it controls",
   "main": "index.js",
   "scripts": {
@@ -25,11 +25,11 @@
     "@aws-sdk/client-lambda": "^3.862.0",
     "@aws-sdk/client-s3": "^3.862.0",
     "@aws-sdk/crc64-nvme-crt": "^3.862.0",
-    "@izara_project/izara-core-library-core": "^1.0.24",
+    "@izara_project/izara-core-library-core": "^1.0.27",
     "@izara_project/izara-core-library-external-request": "^1.0.21",
     "@izara_project/izara-core-library-lambda": "^1.0.5",
     "@izara_project/izara-core-library-logger": "^1.0.7",
-    "@izara_project/izara-shared-core": "^1.0.2",
+    "@izara_project/izara-shared-core": "^1.0.4",
     "@izara_project/izara-shared-service-schemas": "^1.0.32",
     "glob": "^11.0.3",
     "lodash": "^4.17.21",

package/src/GetObjectSchema.js

@@ -21,7 +21,6 @@ along with this program.If not, see < http://www.gnu.org/licenses/>.
 const glob = require('glob')
 const path = require('path')
 const lodash = require('lodash');
-
 const hash = require('@izara_project/izara-shared-core').objectHash;
 
 const sharedServiceSchema = require("@izara_project/izara-shared-service-schemas");
@@ -1128,6 +1127,46 @@ async function getObjectSchemaForUpdate(_izContext, objType) {
   return await getObjectSchemaForUpdateShared(getSchemaByNameWithCache, objType, process.env.iz_serviceSchemaBucketName)
 }
 
+
+// collect dynamoDB storageResources of objType in flowType
+async function getTableNamesByFlowType(_izContext, flowType) {
+  let tableNamesStorageResource = [];
+  const flowSchema = await getFlowSchemaS3WithCache(_izContext, flowType);
+
+  // validate flowSchema
+  if (!flowSchema) {
+    throw new NoRetryError(`Flow schema not found for flowType: ${JSON.stringify(flowType)}`);
+  }
+
+  // validate flowSchema
+  if (!flowSchema.objType) {
+    throw new NoRetryError(`Invalid Flow schema not have objType: ${JSON.stringify(flowType)}`);
+  }
+
+
+  const objectSchema = await getObjSchemaS3WithHierarchy(_izContext, flowSchema.objType);
+
+  // validate objectSchemaTriggerCache
+  if (!objectSchema) {
+    throw new NoRetryError(`Object schema not found for flowType: ${JSON.stringify(flowType)}, objType: ${JSON.stringify(flowSchema.objType)}`);
+  }
+
+  //collect storageResourceDynamoDB
+  for (const storageTag in objectSchema.storageResources) {
+    const storageResource = objectSchema.storageResources[storageTag];
+    if (storageResource.storageType === 'dynamoDB') {
+
+      tableNamesStorageResource.push({
+        ...storageResource,
+        storageTag
+      })
+    }
+  }
+
+  return tableNamesStorageResource;
+}
+
+
 module.exports = {
   // getObjectTypes,
   getDataFromPath,
@@ -1186,6 +1225,8 @@ module.exports = {
 
   getObjectSchemaForCreate,
   getObjectSchemaForUpdate,
+
+  getTableNamesByFlowType
 }
 
 

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`);
                 }
               }
             }