@izara_project/izara-core-library-service-schemas 1.0.83 → 1.0.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-library-service-schemas",
-  "version": "1.0.83",
+  "version": "1.0.85",
   "description": "Schemas for the service and objects it controls",
   "main": "index.js",
   "scripts": {
@@ -29,7 +29,7 @@
     "@izara_project/izara-core-library-lambda": "^1.0.4",
     "@izara_project/izara-core-library-logger": "^1.0.7",
     "@izara_project/izara-shared-core": "^1.0.2",
-    "@izara_project/izara-shared-service-schemas": "^1.0.26",
+    "@izara_project/izara-shared-service-schemas": "^1.0.27",
     "glob": "^11.0.3",
     "lodash": "^4.17.21",
     "object-hash": "^3.0.0",

package/src/Consts.js

@@ -342,6 +342,14 @@ const UPLOAD_PATH_S3 = {
   getEndpointPerService: getEndpointPerService
 }
 
+function firstLetterUpperCase(str) {
+  return str.charAt(0).toUpperCase() + str.slice(1)
+}
+
+function firstLetterLowerCase(str) {
+  return str.charAt(0).toLowerCase() + str.slice(1)
+}
+
 // --------- End Upload path ---------------
 
 module.exports = {
@@ -370,4 +378,7 @@ module.exports = {
 
   LOCAL_FILENAME: LOCAL_FILENAME,
   createValidationFieldNameForEachType,
+  
+  firstLetterUpperCase,
+  firstLetterLowerCase
 }

package/src/ServiceConfig.js

@@ -42,7 +42,7 @@ async function getServiceName(
   _izContext.logger.debug("getServiceName: ", serviceTag)
 
   const getObjectParam = {
-    Bucket: process.env.iz_serviceSchemaBucketName,
+    Bucket: process.env.iz_serviceSchemaBucketName || OBJECT_SCHEMA_BUCKET_NAME,
     Key: UPLOAD_PATH_S3.serviceName(_izContext, serviceTag),
   };
   _izContext.logger.debug("getObjectParam", getObjectParam)
@@ -82,7 +82,7 @@ const getServiceNameWithCache = inMemoryCacheLib(
 async function getGraphServiceTag(
   _izContext,
   graphServerTag,
-  bucketName = process.env.iz_serviceSchemaBucketName
+  bucketName = process.env.iz_serviceSchemaBucketName || OBJECT_SCHEMA_BUCKET_NAME
 ) {
 
   // get all graph serverTag

package/src/SharedUtils.js

@@ -78,7 +78,7 @@ async function _processNodeRelationships(
   storageResourceTags,
   objectRelationships,
   relationshipSchema,
-  bucketName
+  bucketName = process.env.iz_serviceSchemaBucketName
 ) {
   const { node, isBase, relationshipDirection } = nodeConfig;
   const results = [];
@@ -500,7 +500,7 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
               storageResourceTags,
               objectRelationships,
               relationshipSchema,
-              bucketName
+              process.env.iz_serviceSchemaBucketName
             );
             results.push(...secondNodeResults);
           } catch (error) {
@@ -554,8 +554,7 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
         _izContext,
         relType.relationshipTag,
         objectLinksGroup,
-        { depth: loopSetting.depth + 1 },
-        bucketName
+        { depth: loopSetting.depth + 1 }
       )
     }
 
@@ -640,7 +639,6 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
         relType.relationshipTag,
         objectLinksGroup,
         { depth: loopSetting.depth + 1 },
-        bucketName
       )
     }
   } catch (error) {

package/src/UploadObjSchema.js

@@ -49,7 +49,7 @@ const {
   validateRelationshipSchema,
   validateRefRelationshipSchema,
   validateBasicFlowSchema,
-  getApiLinks
+  getApiLinksV2
 } = require('./Utils')
 
 const {
@@ -328,7 +328,7 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
       )
     );
 
-    let apiLink = await getApiLinks();
+    let apiLink = await getApiLinksV2(objSchema);
     // console.log("apiLink", apiLink)
     uploadList.push(
       uploadObjectToS3(
@@ -338,13 +338,13 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
       )
     )
 
-    uploadList.push(
-      uploadObjectToS3(
-        _izContext,
-        UPLOAD_PATH_S3.getEndpointPerService(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];

package/src/Utils.js

@@ -52,6 +52,13 @@ const {
   GetMethodCommand,
 } = require("@aws-sdk/client-api-gateway");
 
+const {
+  ApiGatewayV2Client,
+  GetApisCommand,
+  GetRoutesCommand,
+  GetStagesCommand,
+} = require("@aws-sdk/client-apigatewayv2");
+
 function createObjType(objectType, serviceTag) {
   if (!process.env.iz_serviceTag && !serviceTag) {
     throw new NoRetryError('serviceNameTag not defined and  iz_serviceNameTag not defined in environment variables');
@@ -683,7 +690,7 @@ function switchDirection(direction) {
   }
 }
 
-async function getApiLinks() {
+async function getApiLinksV1() {
   try {
     let apiGateway = {}
     let position;
@@ -707,7 +714,7 @@ async function getApiLinks() {
     const resourcesRes = await client.send(
       new GetResourcesCommand({ restApiId: foundApi.id })
     );
-
+    console.log({ resourcesRes })
     for (const resource of resourcesRes.items) {
       if (resource.resourceMethods) {
         const methods = Object.keys(resource.resourceMethods);
@@ -728,6 +735,61 @@ async function getApiLinks() {
   }
 }
 
+async function getApiLinksV2(objSchema) {
+  try {
+    const client = new ApiGatewayV2Client({ region: process.env.iz_region });
+    const urls = [];
+    const apiLink = {};
+    let nextToken;
+
+    do {
+      const apisRes = await client.send(new GetApisCommand({ NextToken: nextToken }));
+
+      for (const api of apisRes.Items) {
+        const { Name: apiName, ApiId: apiId } = api;
+        let routeResResult = []
+        let routeRestToken;
+
+        try {
+
+          do {
+            const routesRes = await client.send(new GetRoutesCommand({ ApiId: apiId, NextToken: routeRestToken }));
+            routeResResult.push(...routesRes.Items)
+            routeRestToken = routesRes.NextToken;
+
+          } while (routeRestToken)
+
+          for (const route of routeResResult) {
+
+            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${path}`;
+                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;
+  } catch (err) {
+    console.error("Error fetching API info:", err);
+  }
+}
 module.exports = {
   createObjType,
   getIdentifierTypeByPriority,
@@ -753,5 +815,6 @@ module.exports = {
   explodedFlowTypeConcat,
 
   createLinkTypeId,
-  getApiLinks
+  getApiLinksV1,
+  getApiLinksV2
 }

package/src/ValidatorSchema.js

@@ -383,7 +383,7 @@ async function generateValidatorSchemaForCreate(_izContext, objType, settings =
   }
   _izContext.logger.debug("Function:generateValidatorSchemaForCreate ", {
     objType,
-    specificFieldNames: settings.specificFieldNames
+    settings
   })
 
   const objectSchema = await getObjSchemaS3WithHierarchy(_izContext, objType);