@izara_project/izara-core-library-service-schemas 1.0.88 → 1.0.90

package/package.json

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

package/src/Utils.js

@@ -743,8 +743,8 @@ async function getApiLinksV2(objectTypes) {
 
     do {
       const apisRes = await client.send(new GetApisCommand({ NextToken: nextToken }));
-
-      for (const api of apisRes.Items) {
+      let httpsApi = apisRes.Items.filter(api => api.ApiEndpoint && api.ApiEndpoint.startsWith("https:"))
+      for (const api of httpsApi) {
         const { Name: apiName, ApiId: apiId } = api;
         let routeResResult = []
         let routeRestToken;
@@ -764,12 +764,12 @@ async function getApiLinksV2(objectTypes) {
             if (routeKeyParts.length !== 2) continue; // Invalid format
 
             const [method, path] = routeKeyParts;
-            const [_, object, action] = path.split("/")
+            const [_, serviceTag, object, action] = path.split("/")
             for (const objectType of objectTypes) {
               if (method === "POST" && path.endsWith("get")) {
                 if (object === consts.firstLetterLowerCase(objectType)) {
                   // console.log({ path, objectType: consts.firstLetterLowerCase(objectType) })
-                  const fullUrl = `https://${apiId}.execute-api.${process.env.iz_region}.amazonaws.com/${process.env.iz_serviceTag}${path}`;
+                  const fullUrl = `https://${apiId}.execute-api.${process.env.iz_region}.amazonaws.com${path}`;
                   urls.push({
                     Url: fullUrl,
                   });
@@ -792,6 +792,7 @@ async function getApiLinksV2(objectTypes) {
     console.error("Error fetching API info:", err);
   }
 }
+
 module.exports = {
   createObjType,
   getIdentifierTypeByPriority,

package/src/ValidatorSchema.js

@@ -25,7 +25,7 @@ const Logger = require('@izara_project/izara-core-library-logger');
 const uploadUseCase = require('./libs/UploadUseCase')
 
 const { getGraphServiceTag, getServiceName } = require('./ServiceConfig')
-const { createLinkTypeId } = require('./Utils');
+const { createLinkTypeId, createFlowTypeConcat } = require('./Utils');
 const hash = require('@izara_project/izara-shared-core').objectHash;
 const {
   validateObjectSchema,
@@ -67,6 +67,35 @@ const {
 } = require("./Consts");
 const { validateObjType } = require('@izara_project/izara-shared-service-schemas').validateObjType;
 
+// module.exports.createFieldNameUniqueRequestId = (prefix = 'cache') => {
+//   return prefix + "UniqueRequestId";
+// }
+
+// module.exports.createFieldNameStatus = (prefix = 'cache') => {
+//   return prefix + 'Status';
+// }
+
+// module.exports.createFieldNameErrorsFound = (prefix = 'cache') => {
+//   return prefix + 'ErrorsFound';
+// }
+
+// module.exports.createFieldNameCacheComplete = (prefix = 'cache') => { // timeStamp
+//   return prefix + 'CacheComplete';
+// }
+
+// module.exports.createFlowParamsFieldName = (prefix = 'cache') => {
+//   return prefix + 'FlowParams';
+// }
+
+function createSpecificFieldNameForCacheTable(prefix = 'cache') {
+  return {
+    uniqueRequestId: prefix + "UniqueRequestId",
+    fieldNameStatus: prefix + "Status",
+    errorsFound: prefix + 'ErrorsFound',
+    cacheComplete: prefix + 'CacheComplete',
+    flowParams: prefix + 'FlowParams'
+  }
+}
 
 /**
  * helper function: generate validatorSchemaTree of fieldName
@@ -1221,7 +1250,7 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
       for (const flowSchema of allFlowSchemas) {
         const [status, errors] = validateBasicFlowSchema(_izContext, flowSchema)
 
-        if (flowSchema.statusType === "storedCache" || flowSchema.statusType === "statusField" || flowSchema.statusType === "triggerCache") {
+        if (flowSchema.statusType === "storedCache" || flowSchema.statusType === "triggerCache") { // validate triggerCache
           if (!flowSchema.hasOwnProperty("objType")) {
             validateStatus.status = false;
             validateStatus.validateErrors.push(`flowSchema ${flowSchema.flowTag} must have objType`)
@@ -1233,13 +1262,53 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
 
             if (!objSchema) {
               validateStatus.status = false;
-              validateStatus.validateErrors.push(`${flowSchema}.objType is invalid`)
+              validateStatus.validateErrors.push(`${flowSchema.flowTag}.objType is invalid`)
+            } else {
+              if (Object.keys(objSchema.storageResources).length > 1) { // check for objectSchema must have 1 storageResource
+                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) { // check for dynamoDB storageResource
+                    let specificFieldNames = Object.values(createSpecificFieldNameForCacheTable(createFlowTypeConcat(_izContext, { flowTag: flowSchema.flowTag, serviceTag: iz_serviceTag })))
+                    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(`storageResource of objectType:${objSchema.objectType} serviceTag:${flowSchema.objType.serviceTag} must be dynamoDb`)
+                  }
+                }
+              }
+            }
+
+
+
+            if (!status) {
+              validateStatus.status = false;
+              validateStatus.validateErrors.push(errors);
             }
           }
+        }
 
-          if (!status) {
+        if (flowSchema.statusType === "statusField") {
+          if (!flowSchema.hasOwnProperty("objType")) {
             validateStatus.status = false;
-            validateStatus.validateErrors.push(errors);
+            validateStatus.validateErrors.push(`flowSchema ${flowSchema.flowTag} must have objType`)
+          } else {
+            let objSchema = await getObjSchemaS3WithHierarchy(_izContext, {
+              objectType: flowSchema.objType.objectType,
+              serviceTag: flowSchema.objType.serviceTag
+            })
+
+            if (!objSchema) {
+              validateStatus.status = false;
+              validateStatus.validateErrors.push(`${flowSchema.flowTag}.objType is invalid`)
+            }
           }
         }
       }