@izara_project/izara-market-library-service-schemas 1.0.3 → 1.0.5

package/src/TemplateManager/src/{FunctionYaml → PerActionEndpoint/FunctionYaml}/HdrSqs/template.ejs

@@ -13,11 +13,11 @@
         <%_ Object.keys(resourcePermission.action).forEach(resourcePerAction => { _%>
         <%_ resourcePermission.action[resourcePerAction].forEach(permission => { _%>
         - <%- resourcePerAction %>:<%- permission %>
-        <%_}) _%>
+        <%_ }) _%>
         <%_ }) _%>
       Resource:
         <%_ resourcePermission.resource.forEach(resource => { _%>
-        - <%- resource %>
+        - "<%- resource %>"
         <%_ }) _%>
     <%_}) _%>
     #<#<%- functionName %><%- handlerType %>IamRole#>

package/src/TemplateManager/src/PerActionEndpoint/Handler/HdrApi/data.js

@@ -63,6 +63,7 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
   let objectType = objectSchema.objectType;
   let actionHandler = action;
   let functionName = objectType + firstLetterUpperCase(action);
+  const handler = HANDLER.hdrApi
   return {
     templatePath: templatePath,
     templateData: {
@@ -75,26 +76,11 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.lambdaPerAction),
-      saveFileName: `${upperCase(objectSchema.objectType)}${upperCase(action)}_HdrApi`,
+      saveFileName: `${upperCase(objectSchema.objectType)}${upperCase(action)}_${upperCase(handler)}`,
       fileExtension: '.js',
       isAppend: false
     }
   }
 }
 
-
-// [
-// {
-//   templatePath: '/home/toughnut/BasProgram/empty-service-template/app/node_modules/@izara_project/izara-market-library-service-schemas/src/TemplateManager/src/MainResourcesYaml/TemplateAndData/DynamoDbMain/Template/DynamoDb.ejs',
-//   templateData: { tableName: 'ObjectTypeSingle', attributes: [Array] },
-//   setting: {
-//     savePath: '/generatedCode/source/',
-//     saveFileName: 'ObjectTypeGet',
-//     fileExtension: '.js',
-//     isAppend: false
-//   }
-// }
-// ]
-
-
 module.exports = data;

package/src/TemplateManager/src/PerActionEndpoint/Handler/HdrDsq/data.js

@@ -65,7 +65,8 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
   let objectType = objectSchema.objectType;
   let actionHandler = action;
   let functionName = objectType + upperCase(action);
-  let queueName = objectType + firstLetterUpperCase(action) + "HdrSqs";
+  const handler = HANDLER.hdrDsq
+  let queueName = objectType + firstLetterUpperCase(action) + upperCase(handler);
   let identifiers = [];
   for (const identifier of Object.values(objectSchema.identifiers)) {
     identifiers.push(identifier.fieldName)
@@ -84,26 +85,11 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.lambdaPerAction),
-      saveFileName: `${upperCase(objectSchema.objectType)}${upperCase(action)}_HdrDsq`,
+      saveFileName: `${upperCase(objectSchema.objectType)}${upperCase(action)}_${upperCase(handler)}`,
       fileExtension: '.js',
       isAppend: false
     }
   }
 }
 
-
-// [
-// {
-//   templatePath: '/home/toughnut/BasProgram/empty-service-template/app/node_modules/@izara_project/izara-market-library-service-schemas/src/TemplateManager/src/MainResourcesYaml/TemplateAndData/DynamoDbMain/Template/DynamoDb.ejs',
-//   templateData: { tableName: 'ObjectTypeSingle', attributes: [Array] },
-//   setting: {
-//     savePath: '/generatedCode/source/',
-//     saveFileName: 'ObjectTypeGet',
-//     fileExtension: '.js',
-//     isAppend: false
-//   }
-// }
-// ]
-
-
 module.exports = data;

package/src/TemplateManager/src/PerActionEndpoint/Handler/HdrInv/data.js

@@ -55,7 +55,7 @@ function data(_izContext, objectSchema, srcPath) {
       }
     }
   }
-  console.log("createSourceArrayInHdrInv", createSourceArray)
+  // console.log("createSourceArrayInHdrInv", createSourceArray)
   return createSourceArray;
 }
 
@@ -64,6 +64,7 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
   let objectType = objectSchema.objectType;
   let actionHandler = action;
   let functionName = objectType + upperCase(action);
+  const handler = HANDLER.hdrInv
 
   return {
     templatePath: templatePath,
@@ -77,7 +78,7 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.lambdaPerAction),
-      saveFileName: `${upperCase(objectSchema.objectType)}${upperCase(action)}_HdrInv`,
+      saveFileName: `${upperCase(objectSchema.objectType)}${upperCase(action)}_${upperCase(handler)}`,
       fileExtension: '.js',
       isAppend: false
     }
@@ -85,18 +86,4 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
 }
 
 
-// [
-// {
-//   templatePath: '/home/toughnut/BasProgram/empty-service-template/app/node_modules/@izara_project/izara-market-library-service-schemas/src/TemplateManager/src/MainResourcesYaml/TemplateAndData/DynamoDbMain/Template/DynamoDb.ejs',
-//   templateData: { tableName: 'ObjectTypeSingle', attributes: [Array] },
-//   setting: {
-//     savePath: '/generatedCode/source/',
-//     saveFileName: 'ObjectTypeGet',
-//     fileExtension: '.js',
-//     isAppend: false
-//   }
-// }
-// ]
-
-
 module.exports = data;

package/src/TemplateManager/src/PerActionEndpoint/Handler/HdrSqs/data.js

@@ -54,7 +54,7 @@ function data(_izContext, objectSchema, srcPath) {
       }
     }
   }
-  console.log("createSourceArray in sqsData :", createSourceArray)
+  // console.log("createSourceArray in sqsData :", createSourceArray)
   return createSourceArray;
 }
 
@@ -63,7 +63,8 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
   let objectType = objectSchema.objectType;
   let actionHandler = action;
   let functionName = objectType + firstLetterUpperCase(action);
-  let queueName = objectType + firstLetterUpperCase(action) + "HdrSqs"
+  const handler = HANDLER.hdrSqs;
+  let queueName = functionName + handler;
   return {
     templatePath: templatePath,
     templateData: {
@@ -77,7 +78,7 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.lambdaPerAction),
-      saveFileName: `${upperCase(objectSchema.objectType)}${upperCase(action)}_HdrSqs`,
+      saveFileName: `${upperCase(objectSchema.objectType)}${upperCase(action)}_${upperCase(handler)}`,
       fileExtension: '.js',
       isAppend: false
     }
@@ -85,18 +86,4 @@ function createParamForCreateSource(objectSchema, action, srcPath) {
 }
 
 
-// [
-// {
-//   templatePath: '/home/toughnut/BasProgram/empty-service-template/app/node_modules/@izara_project/izara-market-library-service-schemas/src/TemplateManager/src/MainResourcesYaml/TemplateAndData/DynamoDbMain/Template/DynamoDb.ejs',
-//   templateData: { tableName: 'ObjectTypeSingle', attributes: [Array] },
-//   setting: {
-//     savePath: '/generatedCode/source/',
-//     saveFileName: 'ObjectTypeGet',
-//     fileExtension: '.js',
-//     isAppend: false
-//   }
-// }
-// ]
-
-
 module.exports = data;

package/src/TemplateManager/src/PerActionEndpoint/MainFunction/Get/data.js

@@ -52,7 +52,6 @@ async function createParamForCreateSource(_izContext, objectSchema, action, srcP
   let actionHandler = action;
   let functionName = objectType + upperCase(action);
   let getDataDetail = await createGetDataDetails(_izContext, objectSchema);
-  console.log({ getDataDetail })
   return {
     templatePath: templatePath,
     templateData: {
@@ -71,18 +70,4 @@ async function createParamForCreateSource(_izContext, objectSchema, action, srcP
 }
 
 
-// [
-// {
-//   templatePath: '/home/toughnut/BasProgram/empty-service-template/app/node_modules/@izara_project/izara-market-library-service-schemas/src/TemplateManager/src/MainResourcesYaml/TemplateAndData/DynamoDbMain/Template/DynamoDb.ejs',
-//   templateData: { tableName: 'ObjectTypeSingle', attributes: [Array] },
-//   setting: {
-//     savePath: '/generatedCode/source/',
-//     saveFileName: 'ObjectTypeGet',
-//     fileExtension: '.js',
-//     isAppend: false
-//   }
-// }
-// ]
-
-
 module.exports = data;

package/src/TemplateManager/src/PerActionEndpoint/MainFunction/Get/template.ejs

@@ -62,7 +62,7 @@ Copyright (C) 2020 Sven Mason <http: //izara.io>
     requestParams,
     callingFlowConfig = {},
     //(<additionalParams>)
-      //(</additionalParams>)
+    //(</additionalParams>)
     ) => {
 
 
@@ -113,37 +113,34 @@ Copyright (C) 2020 Sven Mason <http: //izara.io>
 
 
       //(<beforeGetGraph>)
-        //(</beforeGetGraph>)
-
-      let dataFromGraph = await graphSharedLib.getNode(
-      _izContext,
-      graphServiceName,
-      {
-      nodeLabel: OBJECT_TYPE,
-      nodeProperties: {
-      ...requestParams.identifiers
-      },
-      },
-      versionedDataLabels
-      );
-
-      _izContext.logger.debug("dataFromGraph: ", dataFromGraph);
-
-      if (Object.keys(dataFromGraph).length) {
-      getRecordStatus.getAtLeastOneRecord = true;
-      } else {
-      getRecordStatus.notFoundSomeRecord = true;
-      }
+      //(</beforeGetGraph>)
+
+        let dataFromGraph = await graphSharedLib.getNodeV2(
+          _izContext,
+          graphServiceName,
+          {
+            objectType: OBJECT_TYPE,
+            serviceTag: SERVICE_TAG
+          },
+          requestParams.identifiers,
+          versionedDataLabels
+        )
+
+        _izContext.logger.debug("dataFromGraphV2: ", dataFromGraph);
+
+        if (Object.keys(dataFromGraph).length) {
+          getRecordStatus.getAtLeastOneRecord = true;
+        } else {
+          getRecordStatus.notFoundSomeRecord = true
+        }
 
-      //(<afterGetGraph>)
+        //(<afterGetGraph>)
         //(</afterGetGraph>)
 
-
-      // collect return data depend on getDataDetail
-      Object.assign(
-      getResults,
-      collectGetData(_izContext, dataFromGraph, getDataDetail)
-      );
+        Object.assign(
+          getResults,
+          collectGetData(_izContext, dataFromGraph, getDataDetail)
+        )
 
 
       } else {
@@ -163,7 +160,7 @@ Copyright (C) 2020 Sven Mason <http: //izara.io>
 
       let dataFromDynamoDb = await dynamodbSharedLib.getItem(
       _izContext,
-      dynamodbSharedLib.tableName(getDataDetail.tableName),
+      await dynamodbSharedLib.tableName(_izContext, getDataDetail.tableName),
       identifiersForGetData
       );
 
@@ -196,6 +193,7 @@ Copyright (C) 2020 Sven Mason <http: //izara.io>
       }
 
       if (Object.keys(getResults).length) {
+      _izContext.logger.debug("getResults", getResults)
       return getResults;
       } else {
       return null

package/src/TemplateManager/src/PerActionEndpoint/MainFunction/Get/testParam.json

@@ -0,0 +1,5 @@
+{
+  "identifiers":{
+    "personId":"basTest"
+  }
+}

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

@@ -0,0 +1,95 @@
+/*
+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 STORAGE_TYPES = {
+  dynamoDB: "dynamoDB",
+  graph: "graph"
+}
+const templatePath = path.join(__dirname, './template.ejs')
+const { SOURCE_PATH, SAVE_FILE_NAME } = require('../../libs/Consts');
+
+/**
+ * create param of crateSouce for FindData And processLogical
+ *
+ * @param {Object} _izContext
+ * @param {String} srcPath
+ * @returns {Object[]}
+ */
+const createAwaitingMultipleStepDynamoDbData = (_izContext, srcPath) => {
+
+  let resultsForCreateSource = [];
+
+  const awaitingStepDynamoDbDataList = [
+    {
+      "tableName": "AwaitingMultipleSteps",
+      "attributes": [
+        {
+          "keyType": "partitionKey",
+          "AttributeName": "awaitingStepId",
+          "AttributeType": "S"
+        },
+        {
+          "keyType": "sortKey",
+          "AttributeName": "pendingStepId",
+          "AttributeType": "S"
+        }
+      ]
+    },
+    {
+      "tableName": "AwaitingMultipleStepByPending",
+      "attributes": [
+        {
+          "keyType": "partitionKey",
+          "AttributeName": "pendingStepId",
+          "AttributeType": "S"
+        },
+        {
+          "keyType": "sortKey",
+          "AttributeName": "awaitingStepId",
+          "AttributeType": "S"
+        }
+      ]
+    }
+  ];
+
+  for (let defaultlDynamoData of awaitingStepDynamoDbDataList) {
+    resultsForCreateSource.push({
+      templatePath: templatePath,
+      templateData: defaultlDynamoData,
+      setting: {
+        initialData: 'Resources:\n',
+        savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
+        saveFileName: SAVE_FILE_NAME.dynamoDbYaml,
+        fileExtension: '.yml',
+        isAppend: true
+      }
+    });
+  }
+  return resultsForCreateSource;
+}
+
+module.exports = createAwaitingMultipleStepDynamoDbData

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

@@ -31,7 +31,7 @@ const STORAGE_TYPES = {
   graph: "graph"
 }
 
-const { SOURCE_PATH } = require('../../libs/Consts')
+const { SOURCE_PATH, SAVE_FILE_NAME } = require('../../libs/Consts')
 const templatePath = path.join(__dirname, './template.ejs')
 
 // ---------- End Per Lambda Handler IamRole Data ----------
@@ -48,13 +48,13 @@ const templatePath = path.join(__dirname, './template.ejs')
  * @returns {Object[]}              - data of multiple dynamoDb template
  */
 
-function dataForMainDynamoDbYamlFromObjectSchema(_izContext, objectSchema) {
+function dataForMainDynamoDbYamlFromObjectSchema(_izContext, objectSchema, srcPath) {
   let dynamoDbYamlTempleteData = [];
 
   let identifierDetail = {};
 
   for (let identifier of objectSchema.identifiers) { //check identifiers from objectSchema
-    console.log("identifier");
+    // console.log("identifier");
     if (identifier.type === "partitionKey" || identifier.type === 'sortKey') {
       identifierDetail[identifier.type] = {};
 
@@ -85,7 +85,6 @@ function dataForMainDynamoDbYamlFromObjectSchema(_izContext, objectSchema) {
     }
   }
 
-  console.log("identifierDetail :", identifierDetail)
   if (!identifierDetail.hasOwnProperty("partitionKey")) {
     return []
   }
@@ -117,57 +116,36 @@ function dataForMainDynamoDbYamlFromObjectSchema(_izContext, objectSchema) {
       }
 
       dynamoDbYamlTempleteData.push(templateData)
-      console.log("templateData")
+      // console.log("templateData")
     }
   }
   return dynamoDbYamlTempleteData
 }
 
-
-// data for MainDynamo from RelSchema
-// function dataForMainDynamoDbYamlFromRelSchema(_izContext, relSchema) {
-//   let relTag = Object.keys(relSchema)[0];
-//   let relData = relSchema[relTag];
-
-//   for (let parents of relData.parents) {
-//     let parentObjectType = parent.objType.objectType;
-
-
-//   }
-
-//   return
-// }
-
-
-module.exports.createSourceDataDynamoDB = (_izContext, objectSchema, srcPath) => {
+const createSourceDataDynamoDB = (_izContext, objectSchema, srcPath) => {
 
   let resultsForCreateSource = [];
 
 
   const dynamoDbMainYamlDataList = dataForMainDynamoDbYamlFromObjectSchema(_izContext, objectSchema, srcPath)
-  console.log("dynamoDbMainYamlDataList: ", dynamoDbMainYamlDataList);
 
   for (let dynamoDbMainYamlData of dynamoDbMainYamlDataList) {
-    // create iam role of handler here
     resultsForCreateSource.push({
       templatePath: templatePath,
       templateData: dynamoDbMainYamlData,
       setting: {
         initialData: 'Resources:\n',
         savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
-        saveFileName: 'dynamoDB-table',
+        saveFileName: SAVE_FILE_NAME.dynamoDbYaml,
         fileExtension: '.yml',
         isAppend: true
       }
     });
   }
 
-  console.log("resultsForCreateSource: ", resultsForCreateSource);
 
   return resultsForCreateSource;
 }
 
-// module.exports.createSourceDataRelSchema = (_izContext, relSchema, saveFilePath) => {
 
-//   return []
-// }
+module.exports = createSourceDataDynamoDB

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

@@ -30,7 +30,7 @@ const STORAGE_TYPES = {
   graph: "graph"
 }
 const templatePath = path.join(__dirname, './template.ejs')
-const { SOURCE_PATH } = require('../../libs/Consts');
+const { SOURCE_PATH, SAVE_FILE_NAME } = require('../../libs/Consts');
 
 /**
  * create param of crateSouce for FindData And processLogical
@@ -39,7 +39,7 @@ const { SOURCE_PATH } = require('../../libs/Consts');
  * @param {String} srcPath
  * @returns {Object[]}
  */
-module.exports.createDefaultSourceDataDynamoDB = (_izContext, srcPath) => {
+const createDefaultSourceDataDynamoDB = (_izContext, srcPath) => {
 
   let resultsForCreateSource = [];
 
@@ -81,22 +81,19 @@ module.exports.createDefaultSourceDataDynamoDB = (_izContext, srcPath) => {
     }
   ];
 
-  console.log("defaultlDynamoDataList: ", (defaultDynamoDataList));
-
   for (let defaultlDynamoData of defaultDynamoDataList) {
     resultsForCreateSource.push({
       templatePath: templatePath,
       templateData: defaultlDynamoData,
       setting: {
+        initialData: 'Resources:\n',
         savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
-        saveFileName: 'dynamoDB-table',
+        saveFileName: SAVE_FILE_NAME.dynamoDbYaml,
         fileExtension: '.yml',
         isAppend: true
       }
     });
   }
-
-  console.log("resultForCreateDefaultDynamoDb: ", (resultsForCreateSource));
-
   return resultsForCreateSource;
 }
+module.exports = createDefaultSourceDataDynamoDB

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

@@ -32,7 +32,7 @@ const STORAGE_TYPES = {
 }
 
 const templatePath = path.join(__dirname, './snsTemplate.ejs');
-const { SOURCE_PATH } = require('../../libs/Consts')
+const { SOURCE_PATH, SAVE_FILE_NAME } = require('../../libs/Consts')
 
 
 /**
@@ -59,22 +59,19 @@ function createDataForDefaultSnsInSqs(_izContext, srcPath) {
     }
   ]
 
-  console.log("defaultSnsInSqsDataList", defaultSnsInSqsDataList);
-
   for (let defaultSnsInSqsData of defaultSnsInSqsDataList) {
     resultsForCreateDefaultSnsInSqs.push({
       templatePath,
       templateData: defaultSnsInSqsData,
       setting: {
-        // initialData: "",
+        initialData: "Resources:\n",
         savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
-        saveFileName: "sns-in-sqs",
+        saveFileName: SAVE_FILE_NAME.snsInSqsYaml,
         fileExtension: ".yml",
         isAppend: true
       }
     })
   }
-  console.log("resultsForCreateDefaultSnsInSqs", resultsForCreateDefaultSnsInSqs);
   return resultsForCreateDefaultSnsInSqs;
 }
 

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

@@ -26,7 +26,7 @@ const path = require("path")
 // } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
 
 
-const { ACTIONS, HANDLER, SOURCE_PATH, DEFAULT_HANDLER_PER_ACTION } = require('../../libs/Consts');
+const { ACTIONS, HANDLER, SOURCE_PATH, DEFAULT_HANDLER_PER_ACTION, SAVE_FILE_NAME } = require('../../libs/Consts');
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require('../../../../MainLibs/src/Utils')
 const snsTemplatePath = path.join(__dirname, './snsTemplate.ejs')
 const sqsTemplatePath = path.join(__dirname, './sqsTemplate.ejs')
@@ -60,7 +60,6 @@ function dataForCreateSnsAndSqsQueueFromObjectSchema(_izContext, objectSchema, s
       }
     }
   }
-  console.log("snsAndSqsQueueArray", (snsAndSqsDataArray))
   return snsAndSqsDataArray
 }
 
@@ -78,12 +77,12 @@ function createQueueNameForSnsAndSqsQueue(_izContext, objectSchema, action, hand
 }
 
 
-module.exports.createSourceSnsAndSqs = (_izContext, objectSchema, srcPath) => {
+const createSourceSnsAndSqs = (_izContext, objectSchema, srcPath) => {
   let resultsForCreateSnsAndSqsSource = [];
   let setting = {
-    initialData:'Resources:\n',
+    initialData: 'Resources:\n',
     savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
-    saveFileName: 'sns-in-sqs',
+    saveFileName: SAVE_FILE_NAME.snsInSqsYaml,
     fileExtension: '.yml',
     isAppend: true
   }
@@ -103,6 +102,7 @@ module.exports.createSourceSnsAndSqs = (_izContext, objectSchema, srcPath) => {
       })
     }
   }
-  console.log("resultsForCreateSnsAndSqsSource", resultsForCreateSnsAndSqsSource);
   return resultsForCreateSnsAndSqsSource
 }
+
+module.exports = createSourceSnsAndSqs

package/src/TemplateManager/src/ResourceYaml/sns-in-sqs/sqsTemplate.ejs

@@ -1,3 +1,4 @@
+#------- queue ---------
   <%- queueName %>:
     Type: "AWS::SQS::Queue"
     Properties: