@izara_project/izara-market-library-service-schemas 1.0.12 → 1.0.13

package/package.json

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

package/src/TemplateManager/src/GenerateCode.js

@@ -160,22 +160,6 @@ const createDeleteRelationshipCompleteHandler = require('./RelationshipPerAction
 const createDeleteRelationshipCompleteSnsAndSqs = require('./RelationshipPerAction/DeleteRelationship/DeleteRelationshipComplete/sns-in-sqs/data');
 const createDeleteRelationshipCompleteSnsOut = require('./RelationshipPerAction/DeleteRelationship/DeleteRelationshipComplete/sns-out/data');
 
-// TranslateIdRequest
-const createTranslateIdsCacheMainTable = require('./TranslateIdReq/TranslateIds/resourceYaml/dynamoDb/data');
-const createTranslateIdsRequestMainFunction = require('./TranslateIdReq/TranslateIds/mainFunction/data');
-const createTranslateIdsHandlerDsq = require('./TranslateIdReq/TranslateIds/handler/HdrDsq/data');
-const createTranslateIdsHandlerSqs = require('./TranslateIdReq/TranslateIds/handler/HdrSqs/data');
-const createTranslateIdFunctionYamlHdrDsq = require('./TranslateIdReq/TranslateIds/functionYaml/HdrDsq/data');
-const createTranslateIdFunctionYamlHdrSqs = require('./TranslateIdReq/TranslateIds/functionYaml/HdrSqs/data');
-const createSnsAndSqsTranslateId = require('./TranslateIdReq/TranslateIds/resourceYaml/sns-sqs/data');
-
-
-// processTranslateIds
-const createProcessTranslateIdsCompleteSnsOut = require('./TranslateIdReq/ProcessingTranslateIds/sns-out/data');
-const createTranslateIdsProcessSnsQueue = require('./TranslateIdReq/ProcessingTranslateIds/sqs-sns/data');
-const createTranslateIdsProcessFunctionYaml = require('./TranslateIdReq/ProcessingTranslateIds/functionYaml/data');
-const createTranslateIdsProcessHandler = require('./TranslateIdReq/ProcessingTranslateIds/handler/dataHdrDsq');
-const createTranslateIdsProcessMainFunction = require('./TranslateIdReq/ProcessingTranslateIds/mainFunction/data')
 // findData
 const createFindDataFunctionYaml = require('./FindData/FindDataYaml/data');
 const createFindDataHandler = require('./FindData/Handler/data');
@@ -196,6 +180,11 @@ const createProcessLogicalPaginateFunctionYamlHdrSqs = require('./ProcessLogical
 //get functionNameConfig
 const functionNameConfigFile = require('./externalService/FunctionNameConfig/data')
 
+//lib of generateCode
+const { checkValidTableYaml } = require('./libs/GenerateCodeUtils');
+
+const { NoRetryError } = require('@izara_project/izara-core-library-core');
+
 /**
  *
  * get template and send to
@@ -225,7 +214,6 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       lamdaPerCombindActionPath: join(saveFilePath, `/generatedCode/lamdaPerCombindAction/source/`), // test
       lambdaPerObjectTypePath: join(saveFilePath, `/generatedCode/lambdaPerObjectType/source/`),  // test
       updateRelationship: join(saveFilePath, `../src/generatedCode/RelationshipPerAction/source/`),
-      translateId: join(saveFilePath, `../src/generatedCode/TranslateId/source/`)
     };
 
 
@@ -248,6 +236,9 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
 
     let createSourceParams = [];
 
+    // use to check dynamoDB table yaml, to prevent duplicate tableName
+    let createdTableYaml = {};
+
     for (const relTag in allObjectRelationships) {
       // const relTagData = allObjectRelationships[relTag];
 
@@ -288,12 +279,19 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       const createFunctionYaml = [...createFunctionYamlHdrApi, ...createFunctionYamlHdrDsq, ...createFunctionYamlHdrInv, ...createFunctionYamlHdrSqs];
 
       // generate Resource ..via dynamoDb sns-in-sqs sns-put
-      const createResourceDynamo = createSourceDataDynamoDB(_izContext, objectSchema, saveFilePath);
+      let [createResourceDynamo, newCreatedTableYaml] = checkValidTableYaml(
+        _izContext,
+        createSourceDataDynamoDB(_izContext, objectSchema, saveFilePath),
+        createdTableYaml
+      );
+
+      createdTableYaml = newCreatedTableYaml;
+      _izContext.logger.debug("createResourceDynamo: ", createResourceDynamo);
+
       const createResourceSnsInSqs = createSourceSnsAndSqs(_izContext, objectSchema, saveFilePath);
       const createResourceSnsOut = createDataForCreateSourceSnsOut(_izContext, objectSchema, saveFilePath);
 
       // translateIdsMainFunction
-      const translateIdsMainFunction = await createTranslateIdsRequestMainFunction(_izContext, objectSchema, saveFilePath);
 
       // wrap main Resource
       const createMainResource = [...createResourceDynamo, ...createResourceSnsInSqs, ...createResourceSnsOut];
@@ -301,11 +299,10 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
 
       createSourceParams = createSourceParams.concat([
         // ...createSourceMainResourcesObjectSchema,
-        ...createSourceHandler,                                                                                   // create handler function
-        ...createMainFunction,                                                                                 // create main function
-        ...createFunctionYaml,                                                                                    // create function.yaml
-        ...createMainResource,                                                                                     // create resource yaml
-        ...translateIdsMainFunction,
+        ...createSourceHandler,       // create handler function
+        ...createMainFunction,        // create main function
+        ...createFunctionYaml,        // create function.yaml
+        ...createMainResource,        // create resource yaml
       ]);
 
       // console.log("createSourceParams after concat: ", createSourceParams);
@@ -446,24 +443,6 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
 
     const deleteRelationshipCompleteData = [...deleteRelationshipCompleteFunctionYaml, ...deleteRelationshipCompleteMainFunction, ...deleteRelationshipCompleteHandler, ...deleteRelationshipCompleteSnsAndSqs, ...deleteRelationshipCompleteSnsOut]
 
-    const translateIdsCacheIdsMainTable = createTranslateIdsCacheMainTable(_izContext, saveFilePath);
-    const translateIdsHandlerFunctionDsq = createTranslateIdsHandlerDsq(_izContext, saveFilePath);
-    const translateIdsHandlerFunctionSqs = createTranslateIdsHandlerSqs(_izContext, saveFilePath);
-    const translateIdsFunctionYamlDsq = createTranslateIdFunctionYamlHdrDsq(_izContext, saveFilePath);
-    const translateIdsFunctionYamlSqs = createTranslateIdFunctionYamlHdrSqs(_izContext, saveFilePath);
-    const translateIdsSnsAndSqsResourceQueue = createSnsAndSqsTranslateId(_izContext, saveFilePath);
-
-    const createTranslateIdsResourece = [...translateIdsCacheIdsMainTable, ...translateIdsHandlerFunctionDsq, ...translateIdsHandlerFunctionSqs,
-    ...translateIdsFunctionYamlDsq, ...translateIdsFunctionYamlSqs, ...translateIdsSnsAndSqsResourceQueue
-    ]
-
-    const translateIdsProcessingSnsOut = createProcessTranslateIdsCompleteSnsOut(_izContext, saveFilePath);
-    const translateIdsProcessingQueue = createTranslateIdsProcessSnsQueue(_izContext, saveFilePath);
-    const translateIdsProcessingFunctionYaml = createTranslateIdsProcessFunctionYaml(_izContext, saveFilePath);
-    const translateIdsProcessingHandler = createTranslateIdsProcessHandler(_izContext, saveFilePath);
-    const translateIdsProcessingMainFunction = createTranslateIdsProcessMainFunction(_izContext, saveFilePath);
-    const createTranslateIdsProcessing = [...translateIdsProcessingQueue, ...translateIdsProcessingFunctionYaml, ...translateIdsProcessingHandler, ...translateIdsProcessingMainFunction, ...translateIdsProcessingSnsOut]
-
     const findDataHandlerSqs = createFindDataHandler(_izContext, saveFilePath);
     const findDataMainFunction = await createFindDataMainFunction(_izContext, saveFilePath);
 
@@ -494,8 +473,6 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       createSourceParams.push(
         ...updateRelationshipSchemaDatas,
         ...createRelationshipSchemaDatas,
-        ...createTranslateIdsResourece,
-        ...createTranslateIdsProcessing,
         ...deleteRelationshipData,
         ...deleteRelationshipCompleteData
       )

package/src/TemplateManager/src/libs/GenerateCodeUtils.js

@@ -0,0 +1,57 @@
+/*
+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 hash = require('object-hash');
+
+
+function checkValidTableYaml(_izContext, currentTableSetting, existsTableSetting) {
+  /*
+    return table yml setting that already filter duplicate tableName that have same table setting
+    throw error when found duplicate table name but not have same table setting
+  */
+
+  let filteredDynamoDbYamlSetting = [];
+
+  for (let i = 0, length = currentTableSetting.length; i < length; i++) {
+    let dynamoDbYamlSetting = currentTableSetting[i];
+    if (existsTableSetting.hasOwnProperty(dynamoDbYamlSetting.templateData.tableName)) {
+
+      // exists table
+      if (hash(existsTableSetting[dynamoDbYamlSetting.templateData.tableName]) === hash(dynamoDbYamlSetting.templateData.attributes.sort())) {
+        continue;
+      } else {
+        throw Error(`tableName:${dynamoDbYamlSetting.templateData.tableName} have duplicate setting but not have same setting`)
+      }
+
+    } else {
+      filteredDynamoDbYamlSetting.push(dynamoDbYamlSetting);
+
+      // not exists table
+      Object.assign(
+        existsTableSetting,
+        {
+          [dynamoDbYamlSetting.templateData.tableName]: dynamoDbYamlSetting.templateData.attributes.sort()
+        }
+      );
+    }
+  }
+  return [filteredDynamoDbYamlSetting, existsTableSetting];
+}
+
+module.exports = { checkValidTableYaml };