@izara_project/izara-market-library-service-schemas 1.0.33 → 1.0.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {

package/src/GenerateCodeLibs/src/Consts.js

@@ -78,7 +78,8 @@ const TOPIC_NAME_GENERATE_CODE = {
   reservedLimitComplete: "ReservedLimitComplete",
   createPresignUrl: "CreatePresignUrl",
   flowSchemaOwnTopicComplete: "FlowSchemaOwnTopicComplete",
-  flowSchemaOwnTopicEndpointComplete: "flowSchemaOwnTopicEndpointComplete",
+  flowSchemaOwnTopicEndpointComplete: "FlowSchemaOwnTopicEndpointComplete",
+  createRecordComplete: "CreateRecordComplete"
 }
 
 const GRAPH_HANDLER_SERVICE_NAME = {

package/src/GenerateCodeLibs/src/GenerateCodeLibs.js

@@ -82,11 +82,11 @@ function validateSchemaMiddleware(
   middleware.setServiceSchema(
     schemaFunctionPerAction[action],
     explodeDataPerAction[action],
-    // {
-    //   objectType: objectType,
-    //   specificFieldNames: setting?.specificFieldNames ? setting.specificFieldNames : [],
-    //   action: action
-    // },
+    {
+      //   objectType: objectType,
+      //   specificFieldNames: setting?.specificFieldNames ? setting.specificFieldNames : [],
+      action: action
+    },
   );
 }
 
@@ -1058,6 +1058,19 @@ function createBasicRelationshipsProperties(from, to, storageResources, baseDire
   return relationshipProperties
 }
 
+function createFieldNamesFromRequestParamsByObjectSchema(_izContext, requestParams, objectSchema) {
+  let createFieldNameParams = {};
+  _izContext.logger.debug("createFieldNamesFromRequestParamsByObjectSchema ::", { requestParams, objectSchema })
+  for (const fieldName of Object.keys(objectSchema.fieldNames)) {
+    if (Object.keys(requestParams).includes(fieldName)) {
+      if (!createFieldNameParams.hasOwnProperty(fieldName)) {
+        Object.assign(createFieldNameParams, { [fieldName]: requestParams[fieldName] })
+      }
+    }
+  }
+  return createFieldNameParams
+}
+
 module.exports = {
   sendMsgOutComplete,
   messageToDlq,
@@ -1077,7 +1090,8 @@ module.exports = {
   createDeleteDataDetail,
 
   createFieldForUpdateDynamoDb,
-  createBasicRelationshipsProperties
+  createBasicRelationshipsProperties,
+  createFieldNamesFromRequestParamsByObjectSchema
 }
 
 

package/src/MainLibs/src/Consts.js

@@ -28,7 +28,7 @@ const { firstLetterUpperCase: upperCase } = require("./Utils")
 const { getGraphServiceNameFromGraphServerTagWithCache, getGraphServiceTagWithCache } = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig');
 
 const DEFAULT_HANDLER_PER_ACTION = {
-  [ACTIONS.create]: [HANDLER.hdrApi, HANDLER.hdrSqs],
+  [ACTIONS.create]: [HANDLER.hdrApi, HANDLER.hdrSqs, HANDLER.hdrInv],
   [ACTIONS.update]: [HANDLER.hdrApi, HANDLER.hdrSqs],
   [ACTIONS.get]: [HANDLER.hdrApi, HANDLER.hdrInv],
   [ACTIONS.delete]: [HANDLER.hdrApi, HANDLER.hdrSqs]
@@ -116,22 +116,31 @@ const SOURCE_PATH = {
   resourceLocationRelationshipPerAction: 'src/generatedCode/RelationshipPerAction/source/',
   resourceLocationTranslateId: 'src/generatedCode/TranslateId/source/',
   resourceLocationProcessLogical: "src/generatedCode/ProcessLogical/source/",
+  // ** FlowSchema
   webSocket: "../src/generatedCode/FlowSchema/UploadS3/",
   resourceLocationWebSocket: "src/generatedCode/FlowSchema/UploadS3/",
+  // * FlowSchema event
   flowSchemaOwnTopic: "../src/generatedCode/FlowSchema/FlowSchemaOwnTopic/",
   resourceLocationFlowSchemaOwnTopic: "src/generatedCode/flowSchemaOwnTopic/",
   flowSchemaExternalTopic: "../src/generatedCode/FlowSchema/FlowSchemaExternalTopic/",
   resourceLocationFlowSchemaExternalTopic: "src/generatedCode/flowSchemaExternalTopic/",
   flowSchemaEventBridge: "../src/generatedCode/FlowSchema/EventBridge/",
   resourceLocationFlowSchemaEventBridge: "src/generatedCode/FlowSchema/EventBridge/",
+  // * FlowSchema Register
+  flowSchemaRegister: "../src/generatedCode/FlowSchema/Register/",
+  resourceLocationFlowSchemaRegister: "src/generatedCode/FlowSchema/Register/",
+
   generateCodeLib: "../src/generatedCode/libs/source/",
   logicalFunctionHook: "../src/generatedCode/WebSocket/source/FlowSchemaHook/HookLogicFunction/source/",
   resourceLocationLogicalFunctionHook: "src/generatedCode/WebSocket/source/FlowSchemaHook/HookLogicFunction/source",
   generatedCodeHookFunction: "../src/generatedCode/WebSocket/source/FlowSchemaHook/HookFunctionGeneratedCode/source/",
   resourceLocationGeneratedCodeHookFunction: "src/generatedCode/WebSocket/source/FlowSchemaHook/HookFunctionGeneratedCode/source/",
-  generatedAttributeTree: "../src/schemas/generatedCode/source/",
+  generatedAttributeTree: "../src/schemas/generatedCode/attributeTree/",
+  generatedPropertyNode: "../src/schemas/generatedCode/propertyNode/",
   endpointPerService: "../src/generatedCode/ActionEndpoint/source/",
-  resourceLocationHandlerEndpointPerService: "src/generatedCode/ActionEndpoint/source/"
+  resourceLocationHandlerEndpointPerService: "src/generatedCode/ActionEndpoint/source/",
+  createRecordComplete: "../src/generatedCode/CreateRecordComplete/",
+  resourceLocationCreateRecordComplete: "src/generatedCode/CreateRerordComplete/"
 };
 
 const DEFAULT_LAMBDA_ROLE_PER_ACTION = {
@@ -228,9 +237,11 @@ const SAVE_FILE_NAME = {
   flowSchema: "flowSchema",
   S3Bucket: "generated-s3-bucket",
   sharedResourceYaml: "generate-SharedResource",
-  attributeTreeObjectRelationship: "ObjectRelationships",
-  attributeTreeRefObjectRelationship: "RefObjectRelationships",
-  attributeTreeObjectSchema: "ObjectFieldSchema",
+  objectRelationship: "ObjectRelationships",
+  refObjectRelationship: "RefObjectRelationships",
+  objectSchema: "ObjectFieldSchema",
+
+
 };
 
 const FUNCTION_NAME = {
@@ -263,6 +274,9 @@ const FUNCTION_NAME = {
   flowSchemaOwnTopicEndpoint: "flowSchemaOwnTopicEndpoint",
   flowSchemaOwnTopicEndpointComplete: "flowSchemaOwnTopicEndpointComplete",
   flowSchemaExternalTopic: "externalTopic",
+  flowSchemaEventBridge: "flowSchemaEventBridge",
+  createRecordComplete: "createRecordComplete",
+  flowSchemaRegister: "register",
 };
 
 const SHORT_FUNCTION_NAME = {
@@ -382,11 +396,16 @@ const SOURCE_GENERATE_IAM_ROLE = {
   PerActionEndpoint: "PerActionEndpoint",
   ExternalTopicRole: "ExternalTopic",
   EventBridge: "EventBridge",
+  CreateRecordComplete: "CreateRecordComplete",
+  RegisterRole: "Register",
 };
 
 const ADD_ON_DATA_STRUCTURE_TYPE = {
   versionedData: "versionedData",
-  attributeTree: "attributeTree"
+  attributeTree: "attributeTree",
+  propertyNode: "propertyNode",
+  translation: "translation",
+
 };
 
 const ATTRIBUTE_TAG = {
@@ -396,6 +415,11 @@ const ATTRIBUTE_TAG = {
   attributeTagPropertyLabel: "PropertyLabel",
 };
 
+const PROPERTYNODE_TAG = {
+  property: "Property",
+  propertyLabel: "PropertyLabel",
+};
+
 const FIELD_NAME_TPYE = {
   identifiers: "identifiers",
   nonIdentifiers: "nonIdentifiers",
@@ -439,10 +463,10 @@ function fieldNameSetting(fieldNameType) {
     },
     [FIELD_NAME_TPYE.randomOnCreateFieldName]: {
       type: "string",
-      requiredOnCreate: true,
+      requiredOnCreate: false,
       optionalOnCreate: false,
       canUpdate: false,
-      randomOnCreate: false,
+      randomOnCreate: true,
       validation: {
         pattern: stringValidation
       }
@@ -525,6 +549,13 @@ async function getStorageResourceFromObjectSchemas(_izContext, allObjSchemas) {
   return { resourceGraphServiceTag: [...resourceGraphServiceTag], resourceDynamoTableName: [...resourceDynamoTableName] }
 }
 
+const FLOW_SCHEMA_EVENT_TYPE = {
+  s3: "s3",
+  ownTopic: "ownTopic",
+  extTopic: "extTopic",
+  eventBridge: "eventBridge",
+}
+
 module.exports = {
   ACTIONS,
   DEFAULT_HANDLER_PER_ACTION,
@@ -554,8 +585,10 @@ module.exports = {
   FIELD_NAME_TPYE,
   ADD_ON_DATA_STRUCTURE_TYPE,
   ATTRIBUTE_TAG,
+  PROPERTYNODE_TAG,
   PREFIX_RELATIONSHIP,
   checkDynamoTypeRelationship,
   createDynamoDbComponentByLinks,
-  getStorageResourceFromObjectSchemas
+  getStorageResourceFromObjectSchemas,
+  FLOW_SCHEMA_EVENT_TYPE
 }

package/src/TemplateManager/src/attributeTree/relationshipSchema/data.js

@@ -56,7 +56,7 @@ function createSourceParams(_izContext, objectSchema, srcPath) {
   const serviceTag = config.main_config.iz_serviceTag;
 
   const fieldNamesBasicRelationship = {
-
+    iz_serviceTag
   }
   attributeRelationships.push(
     {

package/src/reStructure/GenerateCode.js

@@ -107,6 +107,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       );
 
       if (status === false) {
+        console.log('templatePath in generateCode', templatePath)
         throw Error(errors)
       }
 

package/src/reStructure/SchemaConfig.js

@@ -21,6 +21,7 @@ module.exports = {
   TemplateAndData: {
     // ** mock schema config **
     mainAttributeTree: './TemplateData/attributeTreeSchema/generateTemplateData.js',
+    propertyNode: './TemplateData/propertyNodeSchema/generateTemplateData.js',
     test: './TemplateData/testTemplate/data.js',
   },
   Plugin: {

package/src/reStructure/TemplateData/EndpointPerService/handler/api/template.ejs

@@ -20,7 +20,7 @@ const izara = require("@izara_project/izara-middleware");
 const middleware = izara.middlewareHandler;
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 const {
-  validatorSchemaMiddlewareByAction
+  validateSchemaMiddleware
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs');
 
 const { <%- action %>Main } =require('./<%- firstLetterUpperCase(action) %>_Main.js')
@@ -29,7 +29,7 @@ const { <%- action %>Main } =require('./<%- firstLetterUpperCase(action) %>_Main
 //</globalVarible>)
 
 //validate event params in middleware before into main function
-validatorSchemaMiddlewareByAction(
+validateSchemaMiddleware(
   middleware,
   "<%- action %>"
   //(<validateSchemaSetting>

package/src/reStructure/TemplateData/EndpointPerService/handler/inv/template.ejs

@@ -21,7 +21,7 @@ const middleware = require("@izara_project/izara-middleware/src/MiddlewareCore/M
 
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 const {
-  validatorSchemaMiddlewareByAction
+  validateSchemaMiddleware
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs');
 
 const { <%- action %>Main } =require('./<%- firstLetterUpperCase(action) %>_Main.js')
@@ -31,7 +31,7 @@ const { <%- action %>Main } =require('./<%- firstLetterUpperCase(action) %>_Main
 
 
 //validate event params in middleware before into main function
-validatorSchemaMiddlewareByAction(
+validateSchemaMiddleware(
   middleware,
   "<%- action %>"
   //(<validateSchemaSetting>

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

@@ -205,6 +205,9 @@ module.exports.createMain = async (
             }
           })
         );
+        if (serviceTag) {
+          filteredRequiredOnCreatedLinks.push(requiredLink);
+        }
       })
     )
     _izContext.logger.debug("filteredRequiredOnCreatedLinks", filteredRequiredOnCreatedLinks);

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

@@ -22,17 +22,18 @@ console.log("generate main attri ");
 const { join } = require('path');
 
 
-const { data: mainAttributeData } = require('./mainAttributeTreeSchema/data');
+// const { data: mainAttributeData } = require('./mainAttributeTree/data');
 
-const serviceSchemaCore = require("@izara_project/izara-core-library-service-schemas");
-const getObjectSchema = serviceSchemaCore.getObjectSchema;
+// const serviceSchemaCore = require("@izara_project/izara-core-library-service-schemas");
+// const getObjectSchema = serviceSchemaCore.getObjectSchema;
 
 const serviceSchemaShared = require('@izara_project/izara-shared-service-schemas');
 const { validateObjType } = serviceSchemaShared.validateObjType
 
 
 const modules = {
-  mainAttributeTreeSchema: require('./mainAttributeTreeSchema/data')
+  mainAttributeTreeSchema: require('./mainAttributeTree/data'),
+  relaAttributeTreeSchema: require('./relationshipSchema/data')
 }
 /**
  * Generates code with templates for different actions
@@ -40,63 +41,46 @@ const modules = {
  * @param {string} objSchemaPath - Path to the schema
  * @returns {Array} Array of generated code parameters
  */
-async function generateCodeWithTemplate(_izContext, objSchemaPath, settings) {
+async function generateCodeWithTemplate(
+  _izContext,
+  objSchemaPath,
+  settings
+) {
   try {
     let allCreateSource = [];
     const srcPath = join(objSchemaPath, '../');
 
-    // {
-    //   generateName: "mainAttributeTree",
-    //   objType: {
-    //     serviceTag: "GenerateCodeTemplate",
-    //     objectType: "person"
-    //   },
-    //   attributeTag: "productAttribute"
-    // }
-
     if (!settings || !settings.generateName || !settings.objType || !settings.attributeTag) {
       validateObjType(settings.objType);
       throw new Error("Invalid settings object. Must contain objType and attributeTag properties.");
     }
-    // const allObjectSchema = await getObjectSchema.getObjSchemaS3WithoutHierarchy(_izContext, objSchemaPath)
-    //   .then(data => data.records);
+    if (settings.generateName === "mainAttributeTree") {
+      let objSchemaAttributeTree = await modules.mainAttributeTreeSchema(
+        _izContext,
+        settings,
+        srcPath
+      );
+      allCreateSource.push(...objSchemaAttributeTree);
+      console.log("objSchemaAttributeTree finish");
 
-    // const objectSchema = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, settings.objType)
-    // console.log("allObjectSchema: ", allObjectSchema);
-    // console.log("settings: ", settings);
-    /*
-      use settings to get main objType
-      then check if addOnDataStructure is exist
-      if exist, check if type is attributeTree and match with attributeTreeTag
-      if match, start generate schema of attributeTree
-    */
 
-    /*
-    {
-      objectSchema
+      let relaSchemaAttributeTree = await modules.relaAttributeTreeSchema(
+        _izContext,
+        settings,
+        srcPath
+      );
+      allCreateSource.push(relaSchemaAttributeTree);
+      console.log("relaSchemaAttributeTree finish");
 
 
-    }
-    */
-    if (settings.generateName === "mainAttributeTree") {
-      let objSchemaAttributeTree = await modules.mainAttributeTreeSchema(_izContext, settings, srcPath);
-      console.log("objSchemaAttributeTree: ", objSchemaAttributeTree);
-      allCreateSource.push(...objSchemaAttributeTree);
-
     } else {
       throw Error(`Generate attribute tree schema Invalid generateName:${settings.generateName} `);
     }
 
-
-    // will receive objSchemaPath and prepare params for each data function
-    // then data function will return params for createSource
-
-    // (template, data, { savePath, hookPath, saveFileName, fileExtension, initialData, isAppend = false, checkCreateSourcePass = false })
-
-
-    return allCreateSource;
+    _izContext.logger.debug("allCreateSource is", allCreateSource);
+    return [...allCreateSource];
   } catch (error) {
-    _izContext.logger.error('Error generating code with template perActionComplete:', error);
+    _izContext.logger.error('Error generating code with template attribute tree schema:', error);
     return [];
   }
 }

package/src/reStructure/TemplateData/attributeTreeSchema/{mainAttributeTreeSchema → mainAttributeTree}/attributeLinkTemplate.ejs

@@ -4,13 +4,9 @@ let { pattern } = izara.validatorSchema.stringNotEmpty(); // should not be empty
 module.exports = [
   {
     objectType: "<%- objectType %>",
-    overWriteHandlers: { // optional, if not set will create default handlers, if empty will not create handler and main function
-      //(<overWriteHandlers<%- objectType %>>)
-      //(</overWriteHandlers<%- objectType %>>)
-    },
-    overwriteGeneratedMainFunction: [
-    //(<overwriteGeneratedMainFunction<%- objectType %>>)
-    //(</overwriteGeneratedMainFunction<%- objectType %>>)
+    addOnDataStructure: [ // optional, add for additional setting to objectType
+      //(<addOnDataStructure<%- objectType %>>)
+      //(</addOnDataStructure<%- objectType %>>)
     ],
     canDelete: true,
     storageResources: <%- storageResources %>,

package/src/reStructure/TemplateData/attributeTreeSchema/mainAttributeTree/data.js

@@ -0,0 +1,134 @@
+/*
+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';
+
+console.log("=== attribute tree schemas ===");
+
+const path = require('path');
+const fs = require('fs');
+
+const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema')
+
+const {
+  SOURCE_PATH,
+  ADD_ON_DATA_STRUCTURE_TYPE,
+  ATTRIBUTE_TAG,
+  fieldNameSetting,
+  FIELD_NAME_TPYE,
+  SAVE_FILE_NAME
+} = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Consts');
+
+
+const modules = {
+  validateAddOnDataStructure: require('../../../libs/ValidateAddOnDataStructure')
+}
+const templatePath = path.join(__dirname, "./attributeLinkTemplate.ejs");
+
+async function data(_izContext, settings, srcPath) {
+
+  let [returnValue, errorFounds] = await modules.validateAddOnDataStructure(_izContext, settings);
+
+  if (returnValue.hasOwnProperty("addOnAttributeTree") && errorFounds.length > 0) {
+    errorFounds.push(`Not have data addOnAttributeTree and have error:${errorFounds}`)
+  };
+
+  if (errorFounds.length > 0) {
+    throw Error(errorFounds)
+  };
+
+  const addOnAttributeTree = returnValue.addOnAttributeTree;
+  const storageResources = returnValue.objectSchema.storageResources; // storageResource from main objectType
+  const storageResourceTag = Object.keys(storageResources); // storage ResourceTag from main objectType
+  const compositeKeyDeliminator = returnValue.objectSchema.compositeKeyDeliminator;
+
+  let attributeTreeObjSchemas = [];
+  let createSources = [];
+
+  attributeTreeObjSchemas.push(
+    { // {subject}
+      objectType: addOnAttributeTree.attributeTreeTag,
+      fieldNames: {
+        [addOnAttributeTree.attributeTreeTag + "Id"]: fieldNameSetting(FIELD_NAME_TPYE.randomOnCreateFieldName),
+      },
+      identifiers: [
+        {
+          type: "identifier",
+          fieldName: addOnAttributeTree.attributeTreeTag + "Id"
+        }
+      ]
+    },
+    { // {subject}Link
+      objectType: addOnAttributeTree.attributeTreeTag + ATTRIBUTE_TAG.attributeTagLink,
+      fieldNames: {
+        [addOnAttributeTree.attributeTreeTag + ATTRIBUTE_TAG.attributeTagLink + "Id"]: fieldNameSetting(FIELD_NAME_TPYE.randomOnCreateFieldName)
+      },
+      identifiers: [
+        {
+          type: "identifier",
+          fieldName: addOnAttributeTree.attributeTreeTag + ATTRIBUTE_TAG.attributeTagLink + "Id"
+        }
+      ]
+    },
+    { //{subject}Label
+      objectType: addOnAttributeTree.attributeTreeTag + ATTRIBUTE_TAG.attributeTagLabel,
+      fieldNames: {
+        [addOnAttributeTree.attributeTreeTag + ATTRIBUTE_TAG.attributeTagLabel + "Id"]: fieldNameSetting(FIELD_NAME_TPYE.randomOnCreateFieldName)
+      },
+      identifiers: [
+        {
+          type: "identifier",
+          fieldName: `${addOnAttributeTree.attributeTreeTag + ATTRIBUTE_TAG.attributeTagLabel}Id`
+        }
+      ]
+    },
+
+  )
+  for (let attributeTreeObjSchema of attributeTreeObjSchemas) {
+    Object.assign(attributeTreeObjSchema, {
+      storageResources: storageResources, // add storageResources
+      compositeKeyDeliminator: compositeKeyDeliminator
+    })
+    for (let attributeTreeFieldName of Object.values(attributeTreeObjSchema.fieldNames)) {
+      Object.assign(attributeTreeFieldName, { storageResourceTags: storageResourceTag }) // add storageResourceTags for each fieldName
+    }
+  };
+  _izContext.logger.debug("check is attributeTreeObjSchemas", attributeTreeObjSchemas)
+  for (const attributeTreeObjSchema of attributeTreeObjSchemas) {
+    createSources.push({
+      templatePath: templatePath,
+      templateData: {
+        fieldNames: JSON.stringify(attributeTreeObjSchema.fieldNames, null, 2),
+        identifiers: JSON.stringify(attributeTreeObjSchema.identifiers, null, 2),
+        objectType: attributeTreeObjSchema.objectType,
+        storageResources: JSON.stringify(attributeTreeObjSchema.storageResources, null, 2),
+        compositeKeyDeliminator: attributeTreeObjSchema.compositeKeyDeliminator
+      },
+      setting: {
+        savePath: path.join(srcPath, SOURCE_PATH.generatedAttributeTree, attributeTreeObjSchema.objectType + "/"),
+        hookPath: path.join(srcPath, "schemaHook", "attributeTree", attributeTreeObjSchema.objectType, "/"),
+        saveFileName: SAVE_FILE_NAME.objectSchema,
+        fileExtension: ".js",
+        isAppend: false
+      }
+    })
+  };
+
+  return createSources;
+}
+
+module.exports = data