@izara_project/izara-market-library-service-schemas 1.0.7 → 1.0.9

package/src/TemplateManager/src/RelationshipPerAction/UpdateRelationshipSchema/updateRelationship/perAction/HdrSqs/data.js

@@ -0,0 +1,59 @@
+/*
+Copyright (C) 2020 Sven Mason <http://izara.io>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+'use strict';
+const path = require('path');
+const fs = require('fs');
+
+const { ACTIONS, HANDLER } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
+
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../../../MainLibs/src/Utils")
+const { DEFAULT_HANDLER_PER_ACTION, createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, SNS_RESOURCE, DYNAMO_RESOURCE, defaultIamRolePerAction, awaitingMultipleStepsRole } = require("../../../../../libs/Consts");
+
+const templatePath = path.join(__dirname, "./template.ejs")
+
+/**
+ * receive objectSchema
+ * create data for hdrInv template
+ *
+ * @return {{ templatePath, templateData, setting } }
+ */
+function data(_izContext, srcPath) {
+  const createSourceParams = createParamForCreateSource(srcPath)
+  return [createSourceParams];
+}
+
+
+function createParamForCreateSource(srcPath) {
+  const functionName = FUNCTION_NAME.updateRel;
+  const handler = HANDLER.hdrSqs
+  return {
+    templatePath: templatePath,
+    templateData: {
+      functionName,
+      queueName: upperCase(functionName) + upperCase(handler),
+    },
+    setting: {
+      savePath: path.join(srcPath, SOURCE_PATH.relationshipPerAction),
+      saveFileName: `${upperCase(functionName)}_${upperCase(handler)}`,
+      fileExtension: '.js',
+      isAppend: false
+    }
+  }
+}
+
+module.exports = data;

package/src/TemplateManager/src/{UpdateRelationshipSchema → RelationshipPerAction/UpdateRelationshipSchema}/updateRelationship/sns-in-sqs/data.js

@@ -31,10 +31,10 @@ const STORAGE_TYPES = {
   graph: "graph"
 }
 
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, firstLetterUpperCase } = require("../../../../../MainLibs/src/Utils")
-const { DEFAULT_HANDLER_PER_ACTION, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, HANDLER } = require("../../../libs/Consts");
-const snsTemplatePath = path.join(__dirname, "../../../ResourceYaml/sns-in-sqs/snsTemplate.ejs")
-const sqsTemplatePath = path.join(__dirname, "../../../ResourceYaml/sns-in-sqs/sqsTemplate.ejs")
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, firstLetterUpperCase } = require("../../../../../../MainLibs/src/Utils")
+const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, HANDLER } = require("../../../../libs/Consts");
+const snsTemplatePath = path.join(__dirname, "./snsTemplate.ejs")
+const sqsTemplatePath = path.join(__dirname, "./sqsTemplate.ejs")
 
 /**
  * create data for dynamoDbYaml tempalte from objectSchema

package/src/TemplateManager/src/RelationshipPerAction/UpdateRelationshipSchema/updateRelationship/sns-in-sqs/snsTemplate.ejs

@@ -0,0 +1,59 @@
+##===== [Create topic in]
+  In<%- queueName %>:
+    Type: AWS::SNS::Topic
+    Properties:
+      DisplayName: "SNS Message in"
+      TopicName: ${self:custom.iz_resourcePrefix}In<%- queueName %>
+##===== SNS Subscription
+##===== [Topic In]
+  SubscriptionIn<%- queueName %>:
+    Type: AWS::SNS::Subscription
+    Properties:
+      TopicArn: !Ref In<%- queueName %>
+      Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs"
+      Protocol: "sqs"
+##===== [Queue]
+  <%- queueName %>HdrSqs:
+    Type: "AWS::SQS::Queue"
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs
+      RedrivePolicy:
+        deadLetterTargetArn:
+        # !GetAtt
+          Fn::GetAtt:
+            - <%- queueName %>HdrSqsDLQ
+            - Arn
+        maxReceiveCount: 3
+      VisibilityTimeout: 120
+##==== [QueueDLQ]
+  <%- queueName %>HdrSqsDLQ:
+    Type: AWS::SQS::Queue
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqsDLQ
+##==== [QueuePolicy]
+  <%- queueName %>HdrSqsPolicy:
+    Type: AWS::SQS::QueuePolicy
+    Properties:
+      PolicyDocument:
+        Version: "2012-10-17"
+        Statement:
+          - Sid: "allow-sns-messages"
+            Effect: Allow
+            Principal: "*"
+            Resource:
+            # !GetAtt
+              Fn::GetAtt:
+                - <%- queueName %>HdrSqs
+                - Arn
+            Action: "SQS:SendMessage"
+      Queues:
+        - Ref: <%- queueName %>HdrSqs
+  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+
+<%_ function firstLetterUpperCase(text){
+  return text.charAt(0).toUpperCase() + text.slice(1)
+} _%>
+<%_ function firstLetterLowerCase(str) {
+  return str.charAt(0).toLowerCase() + str.slice(1)
+} _%>

package/src/TemplateManager/src/RelationshipPerAction/UpdateRelationshipSchema/updateRelationship/sns-in-sqs/sqsTemplate.ejs

@@ -0,0 +1,43 @@
+#------- queue ---------
+  <%- queueName %>:
+    Type: "AWS::SQS::Queue"
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>
+      RedrivePolicy:
+        deadLetterTargetArn: #!GetAtt
+          Fn::GetAtt:
+            - <%- queueName %>DLQ
+            - Arn
+        maxReceiveCount: 3
+      VisibilityTimeout: 120
+
+  <%- queueName %>DLQ:
+    Type: AWS::SQS::Queue
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>DLQ
+
+  <%- queueName %>Policy:
+    Type: AWS::SQS::QueuePolicy
+    Properties:
+      PolicyDocument:
+        Version: "2012-10-17"
+        Statement:
+          - Sid: "allow-sns-messages"
+            Effect: Allow
+            Principal: "*"
+            Resource: #!GetAtt
+              Fn::GetAtt:
+                - <%- queueName %>
+                - Arn
+            Action: "SQS:SendMessage"
+      Queues:
+        - Ref: <%- queueName %>
+  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+
+<%_ function firstLetterUpperCase(text){
+  return text.charAt(0).toUpperCase() + text.slice(1)
+} _%>
+<%_ function firstLetterLowerCase(str) {
+  return str.charAt(0).toLowerCase() + str.slice(1)
+} _%>

package/src/TemplateManager/src/{UpdateRelationshipSchema → RelationshipPerAction/UpdateRelationshipSchema}/updateRelationship/sns-out/data.js

@@ -31,8 +31,8 @@ const STORAGE_TYPES = {
   graph: "graph"
 }
 
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, firstLetterUpperCase } = require("../../../../../MainLibs/src/Utils")
-const { DEFAULT_HANDLER_PER_ACTION, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME } = require("../../../libs/Consts");
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, firstLetterUpperCase } = require("../../../../../../MainLibs/src/Utils")
+const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME } = require("../../../../libs/Consts");
 const templatePath = path.join(__dirname, '../../../ResourceYaml/sns-out/template.ejs')
 
 /**

package/src/TemplateManager/src/ResourceYaml/dynamodb/mainResourcePerObjectSchemaData.js

@@ -58,6 +58,33 @@ function dataForMainDynamoDbYamlFromObjectSchema(_izContext, objectSchema, srcPa
     if (identifier.type === "partitionKey" || identifier.type === 'sortKey') {
       identifierDetail[identifier.type] = {};
 
+      if (identifier.name) {
+        Object.assign(
+          identifierDetail[identifier.type],
+          {
+            AttributeName: identifier.name,
+            AttributeType: "S"
+          }
+        );
+      } else {
+        let fieldNameType = objectSchema.fieldNames[identifier.fieldName].type;
+        let attributeType;
+        if (fieldNameType === 'string') {
+          attributeType = "S"
+        } else if (fieldNameType === 'number') {
+          attributeType = "N"
+        }
+        Object.assign(
+          identifierDetail[identifier.type],
+          {
+            AttributeName: identifier.fieldName,
+            AttributeType: attributeType
+          }
+        )
+      }
+    } else if (identifier.type === "identifier") {
+      identifierDetail[identifier.type] = {}
+
       if (identifier.name) {
         Object.assign(
           identifierDetail[identifier.type],
@@ -85,9 +112,9 @@ function dataForMainDynamoDbYamlFromObjectSchema(_izContext, objectSchema, srcPa
     }
   }
 
-  if (!identifierDetail.hasOwnProperty("partitionKey")) {
-    return []
-  }
+  // if (!identifierDetail.hasOwnProperty("partitionKey")) {
+  //   return []
+  // }
 
   for (let storageResource of Object.values(objectSchema.storageResources)) {
     if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {

package/src/TemplateManager/src/ResourceYaml/dynamodb/template.ejs

@@ -9,7 +9,7 @@
       <%_ }) _%>
       KeySchema:
       <%_ attributes.forEach(attribute => { -%>
-      <%_ if (attribute.keyType === 'partitionKey') { -%>
+      <%_ if (attribute.keyType === 'partitionKey' || attribute.keyType === "identifier") { -%>
       - AttributeName: <%- attribute["AttributeName"] %>
         KeyType: HASH
         <%_ } -%>

package/src/TemplateManager/src/ResourceYaml/sns-in-sqs/defaultSnsInSqsForFindDataAndProcessLogical.js

@@ -25,7 +25,7 @@ const path = require("path")
 // STORAGE_TYPES
 // } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
 
-
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../MainLibs/src/Utils")
 const STORAGE_TYPES = {
   dynamoDB: "dynamoDB",
   graph: "graph"
@@ -33,7 +33,7 @@ const STORAGE_TYPES = {
 
 const snsTemplatePath = path.join(__dirname, './snsTemplate.ejs');
 const sqsTemplatePath = path.join(__dirname, './sqsTemplate.ejs');
-const { SOURCE_PATH, SAVE_FILE_NAME } = require('../../libs/Consts')
+const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, HANDLER } = require('../../libs/Consts')
 
 
 /**
@@ -57,13 +57,13 @@ function createDataForDefaultSnsInSqs(_izContext, srcPath) {
   let resultsForCreateDefaultSnsInSqs = [];
   const defaultSnsInSqsDataList = [
     {
-      queueName: "FindData"
+      queueName: upperCase(FUNCTION_NAME.findData)
     },
     {
-      queueName: "ProcessLogical"
+      queueName: upperCase(FUNCTION_NAME.processLogical)
     },
     {
-      queueName: "PaginateProcessLogical"
+      queueName: upperCase(FUNCTION_NAME.paginateProcessLogical)
     }
   ]
 
@@ -77,7 +77,7 @@ function createDataForDefaultSnsInSqs(_izContext, srcPath) {
 
   let defaultDsqQueueDataList = [
     {
-      queueName: "PaginateProcessLogicalHdrDsq"
+      queueName: upperCase(FUNCTION_NAME.paginateProcessLogical) + upperCase(HANDLER.hdrDsq)
     }
   ]
   for (let defaultDsqQueueData of defaultDsqQueueDataList) {

package/src/TemplateManager/src/ResourceYaml/sns-out/defaultSnsOutForFindDataAndProcessLogical.js

@@ -49,10 +49,10 @@ function createDataForDefaultSnsOut(_izContext, srcPath) {
   let resultsForCreateDefaultSnsOut = [];
   const defaultSnsOutDataList = [
     {
-      "queueName": "FindDataComplete"
+      queueName: "OutFindDataComp"
     },
     {
-      "queueName": "ProcessLogicalComplete"
+      queueName: "OutProcessLogicalComp"
     }
   ]
 

package/src/TemplateManager/src/TranslateIdReq/ProcessingTranslateIds/functionYaml/data.js

@@ -22,11 +22,9 @@ const fs = require('fs');
 const { ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../MainLibs/src/Utils")
-const { DEFAULT_HANDLER_PER_ACTION, createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, defaultIamRolePerAction } = require("../../../libs/Consts");
+const { DEFAULT_HANDLER_PER_ACTION, createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, defaultIamRolePerAction, SNS_RESOURCE, DYNAMO_RESOURCE, shortNameHandler } = require("../../../libs/Consts");
 const templatePath = path.join(__dirname, "./template.ejs");
 
-defaultIamRolePerAction()
-
 /**
  * receive objectSchema
  * create data for hdrInv template
@@ -55,7 +53,7 @@ function createParamForCreateSource(_izContext, srcPath) {
             SQS_RESOURCE.sendMessage,
             SQS_RESOURCE.getQueueUrl,
           ],
-        [RESOURCE_CLASSES.sns]: ["Publish"]
+        [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
       },
       [
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + handlerType),
@@ -65,7 +63,7 @@ function createParamForCreateSource(_izContext, srcPath) {
     ),
     createIamRole(
       {
-        [RESOURCE_CLASSES.dynamoDbTable]: ["GetItem", "UpdateItem", "Query", "PutItem"]
+        [RESOURCE_CLASSES.dynamoDbTable]: Object.values(DYNAMO_RESOURCE)
       },
       [
         resourceNames(RESOURCE_CLASSES.dynamoDbTable, "TranslateIdsCacheMain"),
@@ -81,7 +79,8 @@ function createParamForCreateSource(_izContext, srcPath) {
       functionName,
       handlerType,
       additionalResourcePermission,
-      resourceLocation: SOURCE_PATH.resourceLocationTranslateId
+      resourceLocation: SOURCE_PATH.resourceLocationTranslateId,
+      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType))
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/TemplateManager/src/TranslateIdReq/ProcessingTranslateIds/functionYaml/template.ejs

@@ -1,5 +1,5 @@
 <%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>:
+<%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   events:

package/src/TemplateManager/src/TranslateIdReq/ProcessingTranslateIds/handler/dataHdrDsq.js

@@ -38,7 +38,7 @@ function createParamsForCreateSource(_izContext, srcPath) {
     templateData: {
       functionName,
       queueName,
-      handlerType
+      handlerType,
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.translateIdsRequestFile),

package/src/TemplateManager/src/TranslateIdReq/ProcessingTranslateIds/handler/template.ejs

@@ -29,9 +29,7 @@ const perRecordsValidatorSchema = {
   type: "object",
   required: [
     "fromObjType",
-    // "fromTypeId",
     "toObjType",
-    // "toTypeId",
     "relType",
   ],
   properties: {
@@ -46,8 +44,8 @@ const perRecordsValidatorSchema = {
     fromTypeId: {
       type: "string",
     },
-    concatinateIdentifier: {
-      type: "string",
+    identifiers: {
+      type: "array",
     },
     fromTable: {
       type: "string",
@@ -150,7 +148,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // add argument (to invoke lambda) to passOnProperties[]
       passOnProperties.push(record.body.Message.fromObjType)
       passOnProperties.push(record.body.Message.fromTypeId)
-      passOnProperties.push(record.body.Message.concatinateIdentifier)
+      passOnProperties.push(record.body.Message.identifiers)
       passOnProperties.push(record.body.Message.fromTable)
       passOnProperties.push(record.body.Message.fromPartitionKeyId)
       passOnProperties.push(record.body.Message.fromPartitionKeyFieldName)

package/src/TemplateManager/src/TranslateIdReq/ProcessingTranslateIds/mainFunction/template.ejs

@@ -38,7 +38,7 @@ const { firstLetterUpperCase: upperCase } = require('@izara_project/izara-market
  * translate ids from one object to another related object
  * @param {Object} _izContext
  * @param {object} fromObjType - the type of object we are translating ids from
- * @param {string} concatinateIdentifier
+ * @param {Object[]} identifiers
  * @param {string} fromTypeId - the type of object we are translating ids from
  * @param {string} fromTable - table name
  * @param {string} fromPartitionKeyId - partition key value
@@ -58,7 +58,7 @@ module.exports.processTranslateIds = async (
   _izContext,
   fromObjType,
   fromTypeId,
-  concatinateIdentifier,
+  identifiers, // identifiers
   fromTable,
   fromPartitionKeyId,
   fromPartitionKeyFieldName,
@@ -79,10 +79,10 @@ module.exports.processTranslateIds = async (
   // MediaLinkPropertyTranslation: filter dataId is propertyIds
   // translate 2 time , propertyIds from MediaLinkProperty and   propertyIds from MediaLinkPropertyTranslation
   try {
-    _izContext.logger.debug("=== Function:TranslateIdsRequest ===", {
+    _izContext.logger.debug("=== Function:ProcessTranslateIds ===", {
       fromObjType: fromObjType,
       fromTypeId: fromTypeId,
-      concatinateIdentifier: concatinateIdentifier,
+      identifiers: identifiers,
       fromTable: fromTable,
       fromPartitionKeyId: fromPartitionKeyId,
       fromPartitionKeyFieldName: fromPartitionKeyFieldName,
@@ -106,7 +106,7 @@ module.exports.processTranslateIds = async (
      just validate to check for error or use for do something further
      if false throw error if true continue translateIds+
     */
-    // let validateObjTypeStatus = await validateFromTypeToToTypeWithRelType(_izContext, fromObjType, toObjType, relType)
+    // let validateObjTypeStatus = await validateFromTypeToToTypeWithRelType(_izContext, fromObjType, toObjType, relType
     let validateObjTypes = await TranslateIdsLibs.validateObjtypesAndRelType(_izContext, [fromObjType, toObjType], relType)
     if (validateObjTypes == null) {
       errorsFound = errorsFound.concat(`can't find ${fromObjType} and ${toObjType} in relationshipTag:${JSON.stringify(relType)}`)
@@ -119,7 +119,9 @@ module.exports.processTranslateIds = async (
     let resultDatas;
     let lastEvaluatedKeyResultDatas;
 
-    if (concatinateIdentifier == null || concatinateIdentifier == undefined) {
+
+    // incase didn't send identifiers
+    if (!identifiers) {
 
       let getFromObjectSchema = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, fromObjType);
       _izContext.logger.debug("getFromObjectSchema", getFromObjectSchema);
@@ -139,7 +141,7 @@ module.exports.processTranslateIds = async (
         if not have resultDatas it mean you cant query identifier from table and you didn't send identifier it will return error
       */
       _izContext.logger.debug("resultDatas query fromtable =>", resultDatas);
-      if (!resultDatas && concatinateIdentifier === null) {
+      if (!resultDatas && identifiers === undefined) {
         errorsFound.push(`Can not get resultDatas form Table${fromTable} and not have concatinateIdentifier to TranslateIds`)
       }
     }
@@ -156,23 +158,23 @@ module.exports.processTranslateIds = async (
       fromObjType,
       toObjType,
       relType,
-      concatinateIdentifier
+      identifier
     ) {
       _izContext.logger.debug("==== Function processOneRecord =====:", {
         translateIdsCacheId: translateIdsCacheId,
         fromObjType: fromObjType,
         toObjType: toObjType,
         relType: relType,
-        concatinateIdentifier: concatinateIdentifier
+        identifiers: identifier
       });
       //if true return becase has cache per FromdataId ,eles false found toDataId;
       /*
       check cache from each dataId
       */
-      let [cacheExist, errorsFoundPerconcatinateIdentifier, translateIdsCacheFromId] = await translateIdsSharedLib.translateIdsCheckCacheFromId(
+      let [cacheExist, errorsFoundPerIdentifier, translateIdsCacheFromId] = await translateIdsSharedLib.translateIdsCheckCacheFromId(
         _izContext,
         fromObjType,
-        concatinateIdentifier,
+        identifier,
         toObjType,
         relType,
         translateIdsCacheId,
@@ -182,38 +184,38 @@ module.exports.processTranslateIds = async (
 
       _izContext.logger.debug('After check translateIdsCheckCacheFromId', {
         cacheExist: cacheExist,
-        errorsFoundPerconcatinateIdentifier: errorsFoundPerconcatinateIdentifier,
+        errorsFoundPerIdentifier: errorsFoundPerIdentifier,
         translateIdsCacheFromId: translateIdsCacheFromId
       })
 
       if (cacheExist) {
-        if (errorsFoundPerconcatinateIdentifier.length > 0) {
-          errorsFound = errorsFound.concat(errorsFoundPerconcatinateIdentifier)
+        if (errorsFoundPerIdentifier.length > 0) {
+          errorsFound = errorsFound.concat(errorsFoundPerIdentifier)
         }
         return;
       };
       // toDataIds from string to Object using function
       let toDataIds = []
-      // transfrom Identifier string to Identifier object to use getNodeAndRelationship
-      let identifierObject = await identifiersObject.identifiersObjectFromCompositeIdentifier(
-        _izContext,
-        fromObjType,
-        concatinateIdentifier
-      )
-      _izContext.logger.debug("identifierObject", identifierObject)
+
+      // let identifierObject = await identifiersObject.identifiersFromIdentifiersConcat(
+      //   _izContext,
+      //   fromObjType,
+      //   identifier
+      // )
+      // _izContext.logger.debug("identifierObject", identifierObject)
 
       let dataIdFromGetNodeAndRelationship = await graphSharedLib.getNodeAndRelationshipsV2(
         _izContext,
         "GraphHandler",
         fromObjType,
-        identifierObject,
+        identifier,
         relType
       )
       _izContext.logger.debug("dataIdFromGetNodeAndRelationship: ", dataIdFromGetNodeAndRelationship);
 
       await Promise.all(
         dataIdFromGetNodeAndRelationship[0].relNodes.map(async (getNodeAndRelResult) => {
-          let dataIdFromIdentifiersObject = await identifiersObject.compositeIdentifierFromIdentifiersObject(
+          let dataIdFromIdentifiersObject = await identifiersObject.identifiersConcatFromIdentifiers(
             _izContext,
             toObjType,
             getNodeAndRelResult.properties
@@ -231,9 +233,9 @@ module.exports.processTranslateIds = async (
         status = passOnStatus;
       }
 
-      if (errorsFoundPerconcatinateIdentifier.length > 0) {
+      if (errorsFoundPerIdentifier.length > 0) {
         status = 'error';
-        passOnErrorsFound = passOnErrorsFound.concat(errorsFoundPerconcatinateIdentifier);
+        passOnErrorsFound = passOnErrorsFound.concat(errorsFoundPerIdentifier);
 
       } else {
         _izContext.logger.debug('saveTranslateIdsCacheBothDataTables')
@@ -251,7 +253,7 @@ module.exports.processTranslateIds = async (
         _izContext,
         translateIdsCacheFromId,
         status,
-        errorsFoundPerconcatinateIdentifier
+        errorsFoundPerIdentifier
       );
     } // end processOneRecord
 
@@ -260,7 +262,7 @@ module.exports.processTranslateIds = async (
     check concatinateIdentifier
     if not use data from resultDatas that query from dynamo
     */
-    if (concatinateIdentifier == null || concatinateIdentifier == undefined) {
+    if (!identifiers.length) {
 
 
       for (let resultData of resultDatas.Items) {
@@ -281,17 +283,18 @@ module.exports.processTranslateIds = async (
 
 
     } else {
-
-      resultPromises.push(
-        processOneRecord(
-          _izContext,
-          translateIdsCacheId, //fromPartitionKeyId, toType
-          fromObjType,
-          toObjType,
-          relType,
-          concatinateIdentifier, //value of DataId
-        )
-      );
+      for (const identifier of identifiers) {
+        resultPromises.push(
+          processOneRecord(
+            _izContext,
+            translateIdsCacheId, //fromPartitionKeyId, toType
+            fromObjType,
+            toObjType,
+            relType,
+            identifier, //value of DataId
+          )
+        );
+      }
 
     }
     await Promise.all(resultPromises);
@@ -307,7 +310,7 @@ module.exports.processTranslateIds = async (
     await translateIdsSharedLib.translateIdsContinueProcessing( //translateIdsCheckCache the rest next  frsit resultDatas fininsh
       _izContext,
       fromObjType,
-      concatinateIdentifier,
+      identifiers,
       fromTable,
       fromPartitionKeyId,
       fromPartitionKeyFieldName,

package/src/TemplateManager/src/TranslateIdReq/TranslateIds/functionYaml/HdrDsq/data.js

@@ -22,35 +22,9 @@ const fs = require('fs');
 const { ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../../MainLibs/src/Utils")
-const { DEFAULT_HANDLER_PER_ACTION, createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, externalResourceName } = require("../../../../libs/Consts");
+const { DEFAULT_HANDLER_PER_ACTION, createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, externalResourceName, defaultIamRolePerAction, DYNAMO_RESOURCE, SNS_RESOURCE, shortNameHandler } = require("../../../../libs/Consts");
 
-const templatePath = path.join(__dirname, '../../../../PerActionEndpoint/FunctionYaml/HdrDsq/template.ejs');
-
-function defaultIamRolePerAction() {
-  let defaultIamRole = [];
-
-  defaultIamRole.push(
-    createIamRole(
-      {
-        [RESOURCE_CLASSES.s3]: ["GetObject", "GetObjectVersion"],
-      },
-      [
-        resourceNames(RESOURCE_CLASSES.s3, "object-schema/perServiceSchemas/*"),
-        resourceNames(RESOURCE_CLASSES.s3, "object-schema/serviceConfig/ServiceNameConfig.json"),
-        resourceNames(RESOURCE_CLASSES.s3, "object-schema/serviceConfig/GraphServerTags.json")
-      ]
-    ),
-    createIamRole(
-      {
-        [RESOURCE_CLASSES.s3]: ["ListBucket"]
-      },
-      [
-        resourceNames(RESOURCE_CLASSES.s3, "object-schema")
-      ]
-    )
-  )
-  return defaultIamRole
-}
+const templatePath = path.join(__dirname, './template.ejs');
 
 /**
  * create data for function yaml for translateIds HdrDsq
@@ -76,7 +50,7 @@ function createTranslateIdFunctionYamlHdrDsq(srcPath) {
         ],
         [RESOURCE_CLASSES.sns]:
           [
-            "Publish", "Subscribe"
+            SNS_RESOURCE.publish, SNS_RESOURCE.subscription
           ]
       },
       [
@@ -88,7 +62,7 @@ function createTranslateIdFunctionYamlHdrDsq(srcPath) {
     ),
     createIamRole(
       {
-        [RESOURCE_CLASSES.dynamoDbTable]: ["GetItem", "UpdateItem"]
+        [RESOURCE_CLASSES.dynamoDbTable]: [DYNAMO_RESOURCE.getItem, DYNAMO_RESOURCE.updateItem]
       },
       [
         resourceNames(RESOURCE_CLASSES.dynamoDbTable, "TranslateIdsCacheMain")
@@ -102,7 +76,8 @@ function createTranslateIdFunctionYamlHdrDsq(srcPath) {
       functionName,
       handlerType,
       additionalResourcePermission,
-      resourceLocation: SOURCE_PATH.resourceLocationTranslateId
+      resourceLocation: SOURCE_PATH.resourceLocationTranslateId,
+      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType))
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),