@izara_project/izara-market-library-service-schemas 1.0.41 → 1.0.44

package/src/reStructure/TemplateData/flowSchema/webSocketComplete/sqs/data.js

@@ -0,0 +1,97 @@
+/*
+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 {
+//   HANDLER,
+// STORAGE_TYPES
+// } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
+
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../MainLibs/src/Utils.js");
+const STORAGE_TYPES = {
+  dynamoDB: "dynamoDB",
+  graph: "graph"
+}
+
+const templatePath = path.join(__dirname, './template.ejs');
+
+
+const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, HANDLER } = require('../../../../../MainLibs/src/Consts.js');
+
+/**
+ * create data for dynamoDbYaml tempalte from objectSchema
+ * return array of dynamoDb data
+ * because one objectSchema can create multiple dynamoDb table
+ *
+ * @param {Object} _izContext
+ * @param {String} saveFilePath
+ * @returns {Object[]}              - data of multiple dynamoDb template
+ */
+
+function createDataForDefaultSnsInSqs(_izContext, allFlowSchema, srcPath) {
+  let resultsForCreateDefaultSnsInSqs = [];
+  let defaultDsqQueueDataList = [];
+  for (const flowSchema of allFlowSchema.records) {
+    if (flowSchema.hasOwnProperty("flowSteps")) {
+
+      let flowSteps = Object.keys(flowSchema.flowSteps);
+      if (flowSteps.length && flowSteps.length > 0) {
+        // console.log("create topic by flowSteps", flowSteps)
+
+
+
+        if (flowSchema.outputTopic) {
+          if (flowSteps.includes("Out")) {
+            if (flowSchema.outputTopic) {
+              let topicOut = `${upperCase(flowSchema.flowTag)}`;
+              defaultDsqQueueDataList.push({
+                queueName: `WebSocketComplete` + upperCase(HANDLER.hdrSqs),
+                subscribeTo: topicOut
+              }
+              )
+
+            }
+          }
+        }
+      }
+    }
+  }
+
+  if (defaultDsqQueueDataList.length) {
+    for (let defaultDsqQueueData of defaultDsqQueueDataList) {
+      resultsForCreateDefaultSnsInSqs.push({
+        templatePath: templatePath,
+        templateData: defaultDsqQueueData,
+        setting: {
+          initialData: "Resources:\n",
+          savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
+          saveFileName: SAVE_FILE_NAME.snsInSqsYaml,
+          fileExtension: ".yml",
+          isAppend: true
+        }
+      })
+    }
+  }
+
+  return resultsForCreateDefaultSnsInSqs;
+}
+
+module.exports = createDataForDefaultSnsInSqs;

package/src/reStructure/TemplateData/flowSchema/webSocketComplete/sqs/template.ejs

@@ -0,0 +1,52 @@
+<% if (subscribeTo) { %>
+##===== SNS Subscription
+  SubscriptionToOut<%- subscribeTo %>:
+    Type: AWS::SNS::Subscription
+    Properties:
+      TopicArn: !Ref Out<%- subscribeTo %>
+      Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>"
+      Protocol: "sqs"
+  <% } %>
+#------- 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/reStructure/TemplateData/perActionComplete/create/handler/template.ejs

@@ -35,7 +35,7 @@ let perRecordsValidatorSchema = {
   required: [
     'returnValue',
     'status',
-    'errorFounds',
+    'errorsFound',
     'graphServiceTag'
   ],
   properties: {
@@ -45,7 +45,7 @@ let perRecordsValidatorSchema = {
     status: {
       type: 'string',
     },
-    errorFounds: {
+    errorsFound: {
       type: 'array',
       default: []
     },
@@ -93,7 +93,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // add argument (to invoke lambda) to passOnProperties[]
       passOnProperties.push(record.body.Message.returnValue)
       passOnProperties.push(record.body.Message.status)
-      passOnProperties.push(record.body.Message.errorFounds)
+      passOnProperties.push(record.body.Message.errorsFound)
       passOnProperties.push(record.body.Message.graphServiceTag)
       passOnProperties.push(callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(record.body.Message)) // is Ok PassBackProperties
       // passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message)) // is Ok callinfFlow

package/src/reStructure/TemplateData/perActionComplete/create/mainFunction/template.ejs

@@ -143,6 +143,12 @@ module.exports.createObjectComplete = async (
           _izContext.logger.debug("Send message to OutCreateObjectComplete :::>", sendMessageOutCreateObjectComplete)
           await sns.publishAsync(_izContext, sendMessageOutCreateObjectComplete);
 
+          await asyncFlowSharedLib.removeAwaitingMultipleStep(
+            _izContext,
+            awaitingStepId,
+            pendingStepId
+          );
+          
           //(<afterSendMessage>)
           //(</afterSendMessage>)
         }

package/src/reStructure/TemplateData/perActionComplete/create/yaml/template.ejs

@@ -8,6 +8,7 @@
         batchSize: 10
         filterPatterns: #**** need to update serverless framwork upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%-firstLetterUpperCase(functionName) %>"]}}} # functionName of callingFlow
+          - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>

package/src/reStructure/TemplateData/perActionComplete/delete/handler/template.ejs

@@ -36,7 +36,7 @@ let perRecordsValidatorSchema = {
   required: [
     'returnValue',
     'status',
-    'errorFounds'
+    'errorsFound'
   ],
   properties: {
     returnValue: {
@@ -45,7 +45,7 @@ let perRecordsValidatorSchema = {
     status: {
       type: 'string',
     },
-    errorFounds: {
+    errorsFound: {
       type: 'array',
       default: []
     }
@@ -90,7 +90,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // add argument (to invoke lambda) to passOnProperties[]
       passOnProperties.push(record.body.Message.returnValue)
       passOnProperties.push(record.body.Message.status)
-      passOnProperties.push(record.body.Message.errorFounds)
+      passOnProperties.push(record.body.Message.errorsFound)
       passOnProperties.push(callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(record.body.Message)) // is Ok PassBackProperties
       // passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message)) // is Ok callinfFlow
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);

package/src/reStructure/TemplateData/perActionComplete/delete/yaml/template.ejs

@@ -8,6 +8,7 @@
         batchSize: 10
         filterPatterns: #**** need to update serverless framwork upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%-firstLetterUpperCase(functionName) %>"]}}} # functionName of callingFlow
+          - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>

package/src/reStructure/TemplateData/perActionComplete/get/handler/template.ejs

@@ -35,7 +35,7 @@ let perRecordsValidatorSchema = {
   required: [
     'returnValue',
     'status',
-    'errorFounds'
+    'errorsFound'
   ],
   properties: {
     returnValue: {
@@ -44,7 +44,7 @@ let perRecordsValidatorSchema = {
     status: {
       type: 'string',
     },
-    errorFounds: {
+    errorsFound: {
       type: 'array',
       default: []
     }
@@ -89,7 +89,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // add argument (to invoke lambda) to passOnProperties[]
       passOnProperties.push(record.body.Message.returnValue)
       passOnProperties.push(record.body.Message.status)
-      passOnProperties.push(record.body.Message.errorFounds)
+      passOnProperties.push(record.body.Message.errorsFound)
       passOnProperties.push(callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(record.body.Message)) // is Ok PassBackProperties
       // passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message)) // is Ok callinfFlow
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);

package/src/reStructure/TemplateData/perActionComplete/get/yaml/template.ejs

@@ -8,6 +8,7 @@
         batchSize: 10
         filterPatterns: #**** need to update serverless framwork upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%-firstLetterUpperCase(functionName) %>"]}}} # functionName of callingFlow
+          - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>

package/src/reStructure/TemplateData/perActionComplete/update/handler/template.ejs

@@ -35,7 +35,7 @@ let perRecordsValidatorSchema = {
   required: [
     'returnValue',
     'status',
-    'errorFounds'
+    'errorsFound'
   ],
   properties: {
     returnValue: {
@@ -44,7 +44,7 @@ let perRecordsValidatorSchema = {
     status: {
       type: 'string',
     },
-    errorFounds: {
+    errorsFound: {
       type: 'array',
       default: []
     }
@@ -89,7 +89,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // add argument (to invoke lambda) to passOnProperties[]
       passOnProperties.push(record.body.Message.returnValue)
       passOnProperties.push(record.body.Message.status)
-      passOnProperties.push(record.body.Message.errorFounds)
+      passOnProperties.push(record.body.Message.errorsFound)
       passOnProperties.push(callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(record.body.Message)) // is Ok PassBackProperties
       // passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message)) // is Ok callinfFlow
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);

package/src/reStructure/TemplateData/perActionComplete/update/yaml/template.ejs

@@ -8,6 +8,7 @@
         batchSize: 10
         filterPatterns: #**** need to update serverless framwork upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%-firstLetterUpperCase(functionName) %>"]}}} # functionName of callingFlow
+          - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>

package/src/reStructure/TemplateData/perActionEndpoint/mainFunction/update/template.ejs

@@ -73,12 +73,12 @@ module.exports.<%- functionName %>Main = async (
     _izContext.logger.debug("<%- functionName %> requestParams", requestParams)
     _izContext.logger.debug("<%- functionName %> callingFlowConfig", callingFlowConfig)
 
-    let errorFounds = [];
+    let errorsFound = [];
     const userId = _izContext.correlationIds.get(coreConsts.BASE_USER_ID);
     const targetId = _izContext.correlationIds.get(coreConsts.TARGET_ID);
 
     if (!userId) {
-      errorFounds.push("Not have userId")
+      errorsFound.push("Not have userId")
     }
 
     const OBJECT_TYPE = "<%- objectType %>"
@@ -105,7 +105,7 @@ module.exports.<%- functionName %>Main = async (
     _izContext.logger.debug("objectSchema", objectSchema);
 
     if (objectSchema.hasOwnProperty("belongTo") && !targetId) {
-      errorFounds.push('not have targetId')
+      errorsFound.push('not have targetId')
     }
 
     let updateDataDetails = await createUpdateDataDetail(_izContext, objectSchema);
@@ -149,26 +149,26 @@ module.exports.<%- functionName %>Main = async (
       _izContext.logger.debug("missingVersionedDataIdLabels:: ", missingVersionedDataIdLabels);
 
       if (missingVersionedDataIdLabels.length) {
-        errorFounds.push(`missing versionedDataIds of versionedDataLabel '${missingVersionedDataIdLabels.join(", ")}'`)
+        errorsFound.push(`missing versionedDataIds of versionedDataLabel '${missingVersionedDataIdLabels.join(", ")}'`)
       }
 
       // check missing update data of versionedDataLabels
       const missingDataVersionedDataLabels = versionedDataIdLabelKeys.filter(label => !versionedDataIdLabelKeys.includes(label))
       if (missingDataVersionedDataLabels.length) {
-        errorFounds.push(`missing data of versionedDataLabels '${missingDataVersionedDataLabels.join(", ")}'`);
+        errorsFound.push(`missing data of versionedDataLabels '${missingDataVersionedDataLabels.join(", ")}'`);
       }
       // check mainNode Data should not exists
       if (Object.keys(updateMainNodeData).length) {
-        errorFounds.push("cannot update mainNode if have versionedDataIds");
+        errorsFound.push("cannot update mainNode if have versionedDataIds");
       }
     }
 
     let messageAttributes
 
-    if (errorFounds.length) {
+    if (errorsFound.length) {
       let updateNodeCompleteMessage = {
         objType: {
-          objecType: OBJECT_TYPE,
+          objectType: OBJECT_TYPE,
           serviceTag: SERVICE_TAG
         },
         objInstanceFull: {
@@ -177,7 +177,7 @@ module.exports.<%- functionName %>Main = async (
         },
         versionedDataIds: versionedDataIds,
         status: 'error',
-        errorFounds: errorFounds
+        errorsFound: errorsFound
       };
 
 
@@ -205,7 +205,7 @@ module.exports.<%- functionName %>Main = async (
           if (updateDataDetail.storageType === consts.STORAGE_TYPES.graph) {
             // let graphServiceName = await getGraphServiceTagWithCache(_izContext, getDataDetail.graphServiceTag)
 
-            awaitingStepIds.push( // createAwaitingstepId if updateGraph
+            awaitingStepIds.push( // create Awaiting stepId if updateGraph
               asyncFlowSharedLib.createAwaitingStepId(
                 hash({
                   objectType: OBJECT_TYPE,
@@ -266,7 +266,7 @@ module.exports.<%- functionName %>Main = async (
               TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GRAPH_HANDLER.inUpdateNode, storageTag, )
             }
 
-            _izContext.logger.debug('requset param before send to topic InUpdateNode:::', updateNodeMessageBody);
+            _izContext.logger.debug('request param before send to topic InUpdateNode:::', updateNodeMessageBody);
 
             let resSNS = await sns.publishAsync(_izContext, updateNodeMessageBody)
             _izContext.logger.debug('resSNS send to topic InUpdateNode finish!', resSNS);
@@ -341,7 +341,7 @@ module.exports.<%- functionName %>Main = async (
         versionedDataIds: versionedDataIds
       },
       status: "complete",
-      errorFounds
+      errorsFound
     }
   } catch (err) {
     _izContext.logger.error('error AddressUpdate: ', err)

package/src/reStructure/TemplateData/propertyValueSchema/generateTemplateData.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 
 // Import required modules
-console.log("generate main PropertyValue Schema");
+// console.log("generate main PropertyValue Schema");
 const { join } = require('path');
 
 
@@ -34,29 +34,29 @@ const modules = {
  */
 async function generateCodeWithTemplate(_izContext, objSchemaPath, settings) {
   try {
-    console.log("settings generateCodeWithTemplate", settings)
+    // console.log("settings generateCodeWithTemplate", settings)
     let allCreateSource = [];
     const srcPath = join(objSchemaPath, '../');
 
-    if (settings.generateName === "propertyValue") {
-      let objSchemaPropertyNode = await modules.objectPropertyNodeSchema(
-        _izContext,
-        settings,
-        srcPath
-      );
-      allCreateSource.push(...objSchemaPropertyNode);
+    // if (settings.generateName === "propertyValue") {
+    let objSchemaPropertyNode = await modules.objectPropertyNodeSchema(
+      _izContext,
+      settings,
+      srcPath
+    );
+    allCreateSource.push(...objSchemaPropertyNode);
 
-      let relationshipSchemaPropertyNode = await modules.relationshipPropertyNodeSchema(
-        _izContext,
-        settings,
-        srcPath
-      );
-      allCreateSource.push(relationshipSchemaPropertyNode);
-
-    } else {
-      throw Error(`Generate propertyNode schema Invalid generateName:${settings.generateName} `);
-    }
+    let relationshipSchemaPropertyNode = await modules.relationshipPropertyNodeSchema(
+      _izContext,
+      settings,
+      srcPath
+    );
+    allCreateSource.push(relationshipSchemaPropertyNode);
 
+    // } else {
+    // throw Error(`Generate propertyNode schema Invalid generateName:${settings.generateName} `);
+    // }
+    // console.log("allCreateSource propertyValues", JSON.stringify(allCreateSource, null, 2))
     return allCreateSource;
   } catch (error) {
     _izContext.logger.error('Error generating code with template propertyNode schema:', error);

package/src/reStructure/TemplateData/propertyValueSchema/objectPropertyValueSchema/data.js

@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 
-console.log("=== property value schema ===");
+// console.log("=== property value schema ===");
 
 const path = require('path');
 const fs = require('fs');
@@ -39,89 +39,92 @@ const objectschemaLocalByPath = require('@izara_project/izara-core-library-servi
 
 
 async function data(_izContext, settings, srcPath) {
-
-  let objectSchema = await objectschemaLocalByPath.getLocalObjectSchemasWithHierarchy(
-    _izContext,
-    settings.objType.objectType,
-    path.join(srcPath, "./schemas")
-  ).then(res => res.records[0]);
-  _izContext.logger.debug("objectSchema objectSchema::", objectSchema)
-
-  if (!objectSchema) {
-    throw Error(`Invalid objType:${objTypeString(objType)}, cannot generate attribute tree schema cause objectSchema is not exists`)
-  };
-
   let propertyValueObjectSchemas = [];
   let createSources = [];
-
-  // let objectType = settings.objType.objectType;
-  let propertyValueTag = settings.propertyValueTag
-  // validate only addOnndataStructure is type propertyNode.
-
-  if (!objectSchema.hasOwnProperty("addOnDataStructure") || !Array.isArray(objectSchema.addOnDataStructure) || !objectSchema.addOnDataStructure.length) {
-    console.log(`Not have data in addOnDataStructure in objectType:${objectSchema.objectType}`);
-    throw Error(`Not have data in addOnDataStructure in objectType:${objectSchema.objectType}`)
-
-  };
-
-  const storageResources = objectSchema.storageResources; // storageResource from main objectType
-  const storageResourceTag = Object.keys(storageResources); // storage ResourceTag from main objectType
-  const compositeKeyDeliminator = objectSchema.compositeKeyDeliminator;
-
-  propertyValueObjectSchemas.push(
-    { // {subject}property
-      objectType: propertyValueTag + PROPERTYVALUE_TAG.property,
-      fieldNames: {
-        [propertyValueTag + PROPERTYVALUE_TAG.property + "Id"]: fieldNameSetting(FIELD_NAME_TPYE.randomOnCreateFieldName),
-      },
-      identifiers: [
-        {
-          type: "identifier",
-          fieldName: propertyValueTag + PROPERTYVALUE_TAG.property + "Id"
+  for (const settingPropertyNode of settings) {
+    if (settingPropertyNode.generateName === "propertyValue") {
+      let objectSchema = await objectschemaLocalByPath.getLocalObjectSchemasWithHierarchy(
+        _izContext,
+        [settingPropertyNode.objType.objectType],
+        path.join(srcPath, "./schemas")
+      ).then(res => res.records[0]);
+      _izContext.logger.debug("objectSchema objectSchema::", objectSchema)
+
+      if (!objectSchema) {
+        throw Error(`Invalid objType:${objTypeString(objType)}, cannot generate attribute tree schema cause objectSchema is not exists`)
+      };
+
+
+      // let objectType = settings.objType.objectType;
+      let propertyValueTag = settingPropertyNode.propertyValueTag
+      // validate only addOnndataStructure is type propertyNode.
+
+      if (!objectSchema.hasOwnProperty("addOnDataStructure") || !Array.isArray(objectSchema.addOnDataStructure) || !objectSchema.addOnDataStructure.length) {
+        // console.log(`Not have data in addOnDataStructure in objectType:${objectSchema.objectType}`);
+        throw Error(`Not have data in addOnDataStructure in objectType:${objectSchema.objectType}`)
+
+      };
+
+      const storageResources = objectSchema.storageResources; // storageResource from main objectType
+      const storageResourceTag = Object.keys(storageResources); // storage ResourceTag from main objectType
+      const compositeKeyDeliminator = objectSchema.compositeKeyDeliminator;
+
+      propertyValueObjectSchemas.push(
+        { // {subject}property
+          objectType: propertyValueTag + PROPERTYVALUE_TAG.property,
+          fieldNames: {
+            [propertyValueTag + PROPERTYVALUE_TAG.property + "Id"]: fieldNameSetting(FIELD_NAME_TPYE.randomOnCreateFieldName),
+          },
+          identifiers: [
+            {
+              type: "identifier",
+              fieldName: propertyValueTag + PROPERTYVALUE_TAG.property + "Id"
+            }
+          ]
+        },
+        { // {subject}propertyLabel
+          objectType: propertyValueTag + PROPERTYVALUE_TAG.propertyLabel,
+          fieldNames: {
+            [propertyValueTag + PROPERTYVALUE_TAG.propertyLabel + "Id"]: fieldNameSetting(FIELD_NAME_TPYE.randomOnCreateFieldName),
+          },
+          identifiers: [
+            {
+              type: "identifier",
+              fieldName: propertyValueTag + PROPERTYVALUE_TAG.propertyLabel + "Id"
+            }
+          ]
         }
-      ]
-    },
-    { // {subject}propertyLabel
-      objectType: propertyValueTag + PROPERTYVALUE_TAG.propertyLabel,
-      fieldNames: {
-        [propertyValueTag + PROPERTYVALUE_TAG.propertyLabel + "Id"]: fieldNameSetting(FIELD_NAME_TPYE.randomOnCreateFieldName),
-      },
-      identifiers: [
-        {
-          type: "identifier",
-          fieldName: propertyValueTag + PROPERTYVALUE_TAG.propertyLabel + "Id"
+      );
+
+      for (let propertyValueObjectSchema of propertyValueObjectSchemas) {
+        Object.assign(propertyValueObjectSchema, {
+          storageResources: storageResources, // add storageResources
+          compositeKeyDeliminator: compositeKeyDeliminator
+        })
+        for (let attributeTreeFieldName of Object.values(propertyValueObjectSchema.fieldNames)) {
+          Object.assign(attributeTreeFieldName, { storageResourceTags: storageResourceTag }) // add storageResourceTags for each fieldName
         }
-      ]
-    }
-  );
-
-  for (let propertyValueObjectSchema of propertyValueObjectSchemas) {
-    Object.assign(propertyValueObjectSchema, {
-      storageResources: storageResources, // add storageResources
-      compositeKeyDeliminator: compositeKeyDeliminator
-    })
-    for (let attributeTreeFieldName of Object.values(propertyValueObjectSchema.fieldNames)) {
-      Object.assign(attributeTreeFieldName, { storageResourceTags: storageResourceTag }) // add storageResourceTags for each fieldName
-    }
-  };
-  for (const propertyValueObjectSchema of propertyValueObjectSchemas) {
-    createSources.push({
-      templatePath: templatePath,
-      templateData: {
-        fieldNames: JSON.stringify(propertyValueObjectSchema.fieldNames, null, 2),
-        identifiers: JSON.stringify(propertyValueObjectSchema.identifiers, null, 2),
-        objectType: propertyValueObjectSchema.objectType,
-        storageResources: JSON.stringify(propertyValueObjectSchema.storageResources, null, 2),
-        compositeKeyDeliminator: propertyValueObjectSchema.compositeKeyDeliminator
-      },
-      setting: {
-        savePath: path.join(srcPath, SOURCE_PATH.generatedPropertyValue, propertyValueObjectSchema.objectType + "/"),
-        hookPath: path.join(srcPath, "schemaHook", "propertyValue", propertyValueObjectSchema.objectType, "/"),
-        saveFileName: SAVE_FILE_NAME.objectSchema,
-        fileExtension: ".js",
-        isAppend: false
+      };
+      for (const propertyValueObjectSchema of propertyValueObjectSchemas) {
+        createSources.push({
+          templatePath: templatePath,
+          templateData: {
+            fieldNames: JSON.stringify(propertyValueObjectSchema.fieldNames, null, 2),
+            identifiers: JSON.stringify(propertyValueObjectSchema.identifiers, null, 2),
+            objectType: propertyValueObjectSchema.objectType,
+            storageResources: JSON.stringify(propertyValueObjectSchema.storageResources, null, 2),
+            compositeKeyDeliminator: propertyValueObjectSchema.compositeKeyDeliminator
+          },
+          setting: {
+            savePath: path.join(srcPath, SOURCE_PATH.generatedPropertyValue, propertyValueObjectSchema.objectType + "/"),
+            hookPath: path.join(srcPath, "schemaHook", "propertyValue", propertyValueObjectSchema.objectType, "/"),
+            saveFileName: SAVE_FILE_NAME.objectSchema,
+            fileExtension: ".js",
+            isAppend: false
+          }
+        })
       }
-    })
+    }
   };
   return createSources;