@izara_project/izara-market-library-service-schemas 1.0.40 → 1.0.42

package/src/reStructure/TemplateData/flowSchema/register/wbs/mainFunction/template.ejs

@@ -19,7 +19,7 @@ along with this program. If not, see
 'use strict';
 
 const hash = require('@izara_project/izara-shared-core').objectHash;
-const { getObjectSchema } = require('@izara_project/izara-core-library-service-schemas');
+const { getObjectSchema, identifiersObject } = require('@izara_project/izara-core-library-service-schemas');
 
 const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
 const snsSharedLib = require('@izara_project/izara-core-library-sns');
@@ -59,7 +59,7 @@ module.exports.registerMain = async (
   //(</additionalParams>)
 ) => {
   try {
-    let connecttionId = _izContext.correlationIds.get(consts.CONNECTION_ID)
+    let connectionId = _izContext.correlationIds.get(consts.CONNECTION_ID)
     // receive flowTag and identifiers
     let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
       flowTag: requestParams.flowTag,
@@ -71,12 +71,12 @@ module.exports.registerMain = async (
       throw new NoRetryError(`flowTag not found ${requestParams.flowTag}`)
     }
 
-    const getResult = async (objectType) => {
+    const getResult = async (objType) => {
       const objectSchema = await getObjectSchema.getObjSchemaS3WithCache(
         _izContext,
         {
-          objectType: objectType,
-          serviceTag: process.env.iz_serviceTag,
+          objectType: objType.objectType,
+          serviceTag: objType.serviceTag,
         })
 
       _izContext.logger.debug("==> objectSchema", objectSchema)
@@ -84,46 +84,47 @@ module.exports.registerMain = async (
       const result = await externalRequest.lambda.invokeSync(_izContext,
         await lambdaSharedLib.lambdaFunctionName(_izContext, "GetHdrInv"),
         {
-          identifiers: identifiersLibs.identifiersFromIdentifiersConcat(_izContext, objectType, requestParams.identifiersTask),
-          objectType: objectType
+          identifiers: await identifiersObject.identifiersFromIdentifiersConcat(_izContext, objType, requestParams.identifiersTask),
+          objectType: objType.objectType
         }
       )
 
-      for (const [fieldName, fieldNameSetting] of Object.entries(objectSchema.fieldNames)) {
-        if (fieldNameSetting.hasOwnProperty("statusField") && fieldNameSetting.statusField === true) {
-          if (fieldName[result] !== "complete" || fieldName[result] !== "error") {
-            // if status is not complete or error will save data into table
-            await dynamodbSharedLib.putItem(_izContext,
-              await dynamodbSharedLib.tableName(_izContext, "RegisterRecord"),
-              {
-                identifiersTask: requestParams.identifiersTask,
-                connecttionId: connecttionId
-              }
-            )
-          } else {
-            if (!result) {
-              await generatedCodeLibs.postToConnection({ message: "not have record" }, connecttionId)
+      if (!result) {
+        await generatedCodeLibs.postToConnection({ message: "not have record" }, connectionId)
+      } else {
+        for (const [fieldName, fieldNameSetting] of Object.entries(objectSchema.fieldNames)) {
+          if (fieldNameSetting.hasOwnProperty("statusField") && fieldNameSetting.statusField === true) {
+            if (result.fields[fieldName] !== "complete" && result.fields[fieldName] !== "error") {
+              // if status is not complete or error will save data into table
+              await dynamodbSharedLib.putItem(_izContext,
+                await dynamodbSharedLib.tableName(_izContext, "RegisterRecords"),
+                {
+                  identifiersTask: requestParams.identifiersTask,
+                  connectionId: connectionId
+                }
+              )
             } else {
-              await generatedCodeLibs.postToConnection({ message: result }, connecttionId)
+              await generatedCodeLibs.postToConnection({ message: result }, connectionId)
             }
           }
         }
       }
     }
-
     // Initialize storedCacheData variable that will be used in multiple switch cases
     switch (flowSchema.statusType) {
       case "statusField":
-        await getResult(flowSchema.objType.objectType)
+        await getResult(flowSchema.objType)
         break;
       case "storedCache":
-        await getResult(flowSchema.objType.objectType)
+        await getResult(flowSchema.objType)
         break;
       case "none":
         let identifier = {};
-        if (requestParams.hasOwnProperty("identifiersField") && Array.isArray(requestParams.identifierisField)) {
-          for (const fieldNames of requestParams.identifierisField) {
-            Object.assign(identifier, { [fieldNames]: requestParams[fieldNames] })
+        if (requestParams.hasOwnProperty("identifiersField") && Array.isArray(requestParams.identifiersField)) {
+          for (const fieldNames of requestParams.identifiersField) {
+            Object.assign(identifier, {
+              [fieldNames]: requestParams[fieldNames]
+            })
           }
           identifier = identifier;
         } else {
@@ -132,21 +133,23 @@ module.exports.registerMain = async (
 
         // get task before putItem
         let tasks = await dynamodbSharedLib.query(_izContext,
-          await dynamodbSharedLib.tableName(_izContext, "ResgisterRecords"),
+          await dynamodbSharedLib.tableName(_izContext, "RegisterRecords"),
           {
             identifiersTask: hash(identifier)
           }
         )
-        if (tasks && tasks.length > 0) {
+        if (tasks.Items && tasks.Items.length > 0) {
           await Promise.all(tasks.Items.map(async (task) => {
-            await generatedCodeLibs.postToConnection({ message: task }, task.connecttionId)
+            await generatedCodeLibs.postToConnection({ message: task }, task.connectionId)
           }))
+          await generatedCodeLibs.postToConnection({ message: tasks.Items[0] }, connectionId)
+          return tasks.Items[0]
         } else {
           await dynamodbSharedLib.putItem(_izContext,
             await dynamodbSharedLib.tableName(_izContext, "RegisterRecords"),
             {
               identifiersTask: hash(identifier),
-              connecttionId: connecttionId
+              connectionId: connectionId
             }
           )
         }

package/src/reStructure/TemplateData/flowSchema/templateBystatusType/triggerCacheTemplate.ejs

@@ -1,6 +1,6 @@
   let [triggerCacheStatus, triggerCache] = await triggeredCacheSharedLib.checkTriggeredCache(
     _izContext,
-    <%- tableName %>,
+    "<%- tableName %>",
     {
       //(<keyValueTriggerCacheTable>)
       //(</keyValueTriggerCacheTable>)
@@ -17,4 +17,10 @@ if (triggerCacheStatus !== "process") {
     //(<afterValidateTriggerCacheStatus>)
     //(</afterValidateTriggerCacheStatus>)
   }
+
+  
+  return {
+    //(<validateTriggerCacheProcessing>)
+    //(</validateTriggerCacheProcessing>)
+  }
 }

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

@@ -95,7 +95,7 @@ function createSourceParams(_izContext, allLocalFlowSchemas, srcPath) {
       {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.subscribe]
       },
-      allLocalFlowSchemas.records.map(flowSchema => resourceNames(RESOURCE_CLASSES.sns, flowSchema.flowTag + "Complete_Out"))
+      allLocalFlowSchemas.records.map(flowSchema => resourceNames(RESOURCE_CLASSES.sns, flowSchema.flowTag + "_Out"))
     )
   )
 

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/mainFunction/template.ejs

@@ -127,6 +127,7 @@ module.exports.createObjectComplete = async (
               identifiers: returnValue.objInstanceFull.identifiers,
               fields: returnValue.objInstanceFull.fields
             },
+            relationships: returnValue.relationships,
             status: status,
             errorsFound: errorsFound
           }

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');
 
 
@@ -38,25 +38,25 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath, 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;
 

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

@@ -33,37 +33,38 @@ const objectschemaLocalByPath = require('@izara_project/izara-core-library-servi
 const { firstLetterUpperCase: upperCase, getLocalServiceTag } = require("../../../../MainLibs/src/Utils");
 const { createBasicRelationshipsProperties } = require('../../../../GenerateCodeLibs/src/GenerateCodeLibs');
 const { ADD_ON_DATA_STRUCTURE_TYPE } = require('../../../../TemplateManager/src/libs/Consts');
-async function data(_izContext, settings, srcPath) {
-
-
-  let objectSchema = await objectschemaLocalByPath.getLocalObjectSchemasWithHierarchy(
-    _izContext,
-    settings.objType.objectType,
-    path.join(srcPath, "./schemas")
-  ).then(res => res.records[0]);
-
-  if (!objectSchema) {
-    throw Error(`Invalid objType:${objTypeString(objType)}, cannot generate attribute tree schema cause objectSchema is not exists`)
-  };
-
-  // validate addOnData type PropertyValues
-  let addOn = objectSchema.addOnDataStructure.find(addOn => {
-    return addOn.type === ADD_ON_DATA_STRUCTURE_TYPE.propertyValue && objectSchema.objectType === settings.objType.objectType
-  })
-  console.log("addOn in generate Relationship", addOn)
-  if (!addOn) {
-    throw Error(`Invalid objType:${objTypeString(objType)}, not have setting for generate propertyValues`)
-  }
 
+async function data(_izContext, settings, srcPath) {
+  console.log("create Data function ::", { settings })
   let createSourceRecords = []
-  let generateRelationships = createSourceParams(
-    _izContext,
-    objectSchema,
-    settings,
-    srcPath
-  );
-  createSourceRecords.push(...generateRelationships);
+  for (const settingPropertyValue of settings) {
+    let objectSchema = await objectschemaLocalByPath.getLocalObjectSchemasWithHierarchy(
+      _izContext,
+      settingPropertyValue.objType.objectType,
+      path.join(srcPath, "./schemas")
+    ).then(res => res.records[0]);
+
+    if (!objectSchema) {
+      throw Error(`Invalid objType:${objTypeString(objType)}, cannot generate attribute tree schema cause objectSchema is not exists`)
+    };
+
+    // validate addOnData type PropertyValues
+    let addOn = objectSchema.addOnDataStructure.find(addOn => {
+      return addOn.type === ADD_ON_DATA_STRUCTURE_TYPE.propertyValue && objectSchema.objectType === settingPropertyValue.objType.objectType
+    })
+
+    if (!addOn) {
+      throw Error(`Invalid objType:${objTypeString(objType)}, not have setting for generate propertyValues`)
+    }
 
+    let generateRelationships = createSourceParams(
+      _izContext,
+      objectSchema,
+      settingPropertyValue,
+      srcPath
+    );
+    createSourceRecords.push(...generateRelationships);
+  }
   if (createSourceRecords.length) {
     return {
       templatePath: templatePath,
@@ -82,12 +83,7 @@ async function data(_izContext, settings, srcPath) {
 };
 
 
-function createSourceParams(
-  _izContext,
-  objectSchema,
-  settings,
-  srcPath
-) {
+function createSourceParams(_izContext, objectSchema, settings, srcPath) {
   const attributeRelationships = [];
   // const objectType = objectSchema.objectType; // main objectType
   let propertyValue = settings.propertyValueTag
@@ -100,7 +96,7 @@ function createSourceParams(
       relationshipProperties: createBasicRelationshipsProperties(
         {
           serviceTag: serviceTag,
-          objectType: propertyValue,
+          objectType: objectSchema.objectType,
           linkType: "one",
           requiredOnCreate: false
         },
@@ -120,7 +116,7 @@ function createSourceParams(
       relationshipProperties: createBasicRelationshipsProperties(
         {
           serviceTag: serviceTag,
-          objectType: propertyValue,
+          objectType: objectSchema.objectType,
           linkType: "one",
           requiredOnCreate: false
         },
@@ -128,7 +124,7 @@ function createSourceParams(
           serviceTag: serviceTag,
           objectType: propertyValue + PROPERTYVALUE_TAG.property,
           linkType: "many",
-          requiredOnCreate: true
+          requiredOnCreate: false
         },
         storageResources,
         "from"