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

package/package.json

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

package/src/Consts.js

@@ -310,7 +310,7 @@ function getEndpointPerObjectType(_izContext, objType) {
   return `${PREFIX_PATH_S3.perServiceSchemas}/${objType.serviceTag}/FrontEnd/Endpoint/Endpoint_Get_${objType.objectType}.json`
 }
 
-function getEndpointPerService(serviceTag) {
+function getEndpointPerService(_izContext, serviceTag) {
   if (typeof serviceTag !== "string" || !serviceTag) {
     throw new NoRetryError("invalid serviceTag.")
   }
@@ -378,7 +378,7 @@ module.exports = {
 
   LOCAL_FILENAME: LOCAL_FILENAME,
   createValidationFieldNameForEachType,
-  
+
   firstLetterUpperCase,
   firstLetterLowerCase
 }

package/src/UploadObjSchema.js

@@ -328,24 +328,6 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
       )
     );
 
-    let apiLink = await getApiLinksV2(objSchema);
-    // console.log("apiLink", apiLink)
-    uploadList.push(
-      uploadObjectToS3(
-        _izContext,
-        UPLOAD_PATH_S3.getEndpointPerObjectType(_izContext, { objectType: objSchema.objectType, serviceTag: process.env.iz_serviceTag }),
-        apiLink
-      )
-    )
-
-    // uploadList.push(
-    //   uploadObjectToS3(
-    //     _izContext,
-    //     UPLOAD_PATH_S3.getEndpointPerService(process.env.iz_serviceTag),
-    //     apiLink
-    //   )
-    // )
-
     // upload to refObjectRelationships for each objectType that have createBy at UserAccount Service and belongTo
     let existsRefObjectRel = refRelationshipPerObjectType[objSchema.objectType];
     if (existsRefObjectRel) {
@@ -396,6 +378,15 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
     )
   );
 
+  let apiLinks = await getApiLinksV2(foundedObjectTypes);
+  uploadList.push(
+    uploadObjectToS3(
+      _izContext,
+      UPLOAD_PATH_S3.getEndpointPerService(_izContext, process.env.iz_serviceTag),
+      apiLinks
+    )
+  )
+
   let belongsTo = [];
   let createdBys = [];
   let translations = [];

package/src/Utils.js

@@ -714,7 +714,7 @@ async function getApiLinksV1() {
     const resourcesRes = await client.send(
       new GetResourcesCommand({ restApiId: foundApi.id })
     );
-    console.log({ resourcesRes })
+    // console.log({ resourcesRes })
     for (const resource of resourcesRes.items) {
       if (resource.resourceMethods) {
         const methods = Object.keys(resource.resourceMethods);
@@ -735,10 +735,10 @@ async function getApiLinksV1() {
   }
 }
 
-async function getApiLinksV2(objSchema) {
+async function getApiLinksV2(objectTypes) {
   try {
     const client = new ApiGatewayV2Client({ region: process.env.iz_region });
-    const apiLink = {};
+    const urls = [];
     let nextToken;
 
     do {
@@ -759,32 +759,35 @@ async function getApiLinksV2(objSchema) {
           } while (routeRestToken)
 
           for (const route of routeResResult) {
-
+            // console.log("route::", route)
             const routeKeyParts = route.RouteKey.split(" ");
             if (routeKeyParts.length !== 2) continue; // Invalid format
 
             const [method, path] = routeKeyParts;
-            if (method === "POST" && path.endsWith("get")) {
-              if (path.includes(consts.firstLetterLowerCase(objSchema.objectType))) {
-                const fullUrl = `https://${apiId}.execute-api.${process.env.iz_region}.amazonaws.com/${process.env.iz_serviceTag}${path}`;
-                Object.assign(apiLink, { Url: fullUrl })
+            const [_, 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}`;
+                  urls.push({
+                    Url: fullUrl,
+                  });
+                  // Object.assign(apiLink, { Url: fullUrl })
+                  // }
+                }
               }
-              // urls.push({
-              //   url: fullUrl,
-              // });
             }
+
           }
         } catch (err) {
           console.error(`Error processing API "${apiName}":`, err);
         }
       }
-
       nextToken = apisRes.NextToken;
 
     } while (nextToken);
-    // console.log(apiLink)
-    return apiLink;
-    // return api;
+    return urls;
   } catch (err) {
     console.error("Error fetching API info:", err);
   }

package/src/ValidatorSchema.js

@@ -1225,12 +1225,22 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
           if (!flowSchema.hasOwnProperty("objType")) {
             validateStatus.status = false;
             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}.objType is invalid`)
+            }
           }
-        }
 
-        if (!status) {
-          validateStatus.status = false;
-          validateStatus.validateErrors.push(errors);
+          if (!status) {
+            validateStatus.status = false;
+            validateStatus.validateErrors.push(errors);
+          }
         }
       }
     }