@izara_project/izara-core-generate-service-code 1.0.71 → 1.0.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.71",
+  "version": "1.0.73",
   "description": "Code for locally generating per service files",
   "homepage": "https://bitbucket.org/izara-core-support-services/izara-core-support-services-generate-service-code#readme",
   "repository": {
@@ -26,12 +26,13 @@
     "@izara_project/izara-shared-core": "^1.0.13",
     "ejs": "^6.0.1",
     "js-beautify": "^2.0.3",
+    "ws": "^8.21.2",
     "yaml": "^2.9.0"
   },
   "devDependencies": {
     "@izara_project/izara-core-library-logger": "^1.0.11",
-    "@izara_project/izara-core-library-service-schemas": "1.0.158",
-    "@izara_project/izara-shared-service-schemas": "^1.0.67",
+    "@izara_project/izara-core-library-service-schemas": "1.0.161",
+    "@izara_project/izara-shared-service-schemas": "^1.0.70",
     "jest": "^30.4.2",
     "prettier": "^3.9.6",
     "prettier-plugin-ejs": "^1.0.3"

package/src/compile/loadSchemas.js

@@ -5,6 +5,7 @@ import {
   getObjectSchema,
   utils
 } from '@izara_project/izara-core-library-service-schemas';
+import { s3 } from '@izara_project/izara-core-library-s3';
 import Logger from '@izara_project/izara-core-library-logger';
 
 export async function loadLocalSchemaDirectory(project, directoryName) {
@@ -129,7 +130,9 @@ export async function resolveExtendedObjectSchemas(
         for (const [key, resource] of Object.entries(mergedStorageResources)) {
           if (
             resource &&
-            resource.storageType === 'dynamoDB' &&
+            (resource.storageType === 'dynamo' ||
+              resource.storageType === 'dynamoDB' ||
+              !resource.storageType) &&
             !childStorageResourceKeys.has(key)
           ) {
             externalDynamoResources.push({
@@ -196,3 +199,68 @@ export async function resolveExtendedObjectSchemas(
   }
   return resolvedSchemas;
 }
+
+export async function resolveGraphServiceTags(
+  schemas,
+  bucketName = process.env.iz_serviceSchemaBucketName
+) {
+  if (!Array.isArray(schemas) || schemas.length === 0) {
+    return [];
+  }
+
+  const graphServerTags = new Set();
+  for (const schema of schemas) {
+    if (!schema || typeof schema !== 'object') continue;
+    let targetObjs = [];
+    if (schema.storageResources) {
+      targetObjs = [schema];
+    } else {
+      targetObjs = Object.values(schema).filter(
+        (val) => val && typeof val === 'object' && val.storageResources
+      );
+    }
+
+    for (const targetObj of targetObjs) {
+      const resources = targetObj.storageResources;
+      if (resources && typeof resources === 'object') {
+        for (const res of Object.values(resources)) {
+          if (res?.storageType === 'graph' && res.graphServerTag) {
+            graphServerTags.add(res.graphServerTag);
+          }
+        }
+      }
+    }
+  }
+
+  if (graphServerTags.size === 0) {
+    return [];
+  }
+
+  let graphServerTagsMap = {};
+  if (bucketName) {
+    try {
+      const _izContext = { logger: Logger };
+      const s3Data = await s3.getObjectS3(_izContext, {
+        Bucket: bucketName,
+        Key: 'serviceConfig/GraphServerTags.json'
+      });
+      if (s3Data && typeof s3Data === 'object') {
+        graphServerTagsMap = s3Data;
+      }
+    } catch (error) {
+      Logger.debug?.(
+        `[DEBUG] [resolveGraphServiceTags] Could not fetch GraphServerTags.json from bucket=${bucketName}`,
+        error
+      );
+    }
+  }
+
+  const resolvedTags = new Set();
+  for (const tag of graphServerTags) {
+    const serviceTag = graphServerTagsMap[tag] || tag || 'GraphHandler';
+    resolvedTags.add(serviceTag);
+  }
+
+  return Array.from(resolvedTags);
+}
+

package/src/emit/coreFunction/emitCoreFunctionArtifacts.js

@@ -4,33 +4,101 @@ import { readFile } from 'node:fs/promises';
 const TEMPLATE_URL = new URL('./templates/', import.meta.url);
 const APP_ROOT = 'app/sls_yaml/generatedCode/source';
 const SRC_ROOT = 'app/src/generatedCode/CoreFunctions';
+const INITIAL_SETUP_ROOT = 'app/initial_setup/generatedCode/source';
+const INITIAL_SETUP_DATA_ROOT = 'app/initial_setup/generatedCode/data';
+
+function _extractDynamoTableNames(objects = []) {
+  const dynamoTableNames = new Set();
+  for (const obj of objects || []) {
+    if (obj && obj.storageResources) {
+      for (const res of Object.values(obj.storageResources)) {
+        if (
+          res &&
+          res.tableName &&
+          (res.storageType === 'dynamo' ||
+            res.storageType === 'dynamoDB' ||
+            !res.storageType)
+        ) {
+          dynamoTableNames.add(res.tableName);
+        }
+      }
+    }
+  }
+  return dynamoTableNames;
+}
+
+export function coreFunctionManagedPaths(
+  objects = [],
+  objectGraphServiceTags = [],
+  relationshipGraphServiceTags = []
+) {
+  const dynamoTableNames = _extractDynamoTableNames(objects);
+  const graphTags = new Set([
+    ...(objectGraphServiceTags || []),
+    ...(relationshipGraphServiceTags || [])
+  ]);
+
+  const paths = [
+    `${APP_ROOT}/core-function.yml`,
+    `${APP_ROOT}/core-resource.yml`,
+    `${SRC_ROOT}/UploadSchema_HdrInv.js`,
+    `${SRC_ROOT}/UploadSchema_Main.js`,
+    `${SRC_ROOT}/GenerateSeedDataDynamo_HdrInv.js`,
+    `${SRC_ROOT}/GenerateSeedDataDynamo_Main.js`,
+    `${SRC_ROOT}/RemoveSeedDataDynamo_HdrInv.js`,
+    `${SRC_ROOT}/RemoveSeedDataDynamo_Main.js`,
+    `${SRC_ROOT}/GenerateSeedDataGraphData_HdrInv.js`,
+    `${SRC_ROOT}/GenerateSeedDataGraphData_Main.js`,
+    `${SRC_ROOT}/GenerateSeedDataGraphSchema_HdrInv.js`,
+    `${SRC_ROOT}/GenerateSeedDataGraphSchema_Main.js`,
+    `${SRC_ROOT}/InitialSetup_HdrInv.js`,
+    `${SRC_ROOT}/InitialSetup_Main.js`,
+    `${SRC_ROOT}/InitialSetupConfig.js`,
+    `${INITIAL_SETUP_ROOT}/InitialSetupConfig.js`,
+    `${INITIAL_SETUP_ROOT}/runner.js`,
+    `${INITIAL_SETUP_ROOT}/commands/initialSetup.js`,
+    `${INITIAL_SETUP_ROOT}/commands/seedDynamo.js`,
+    `${INITIAL_SETUP_ROOT}/commands/seedRemove.js`,
+    `${INITIAL_SETUP_ROOT}/commands/seedGraph.js`,
+    `${INITIAL_SETUP_ROOT}/commands/uploadSchema.js`,
+    `${INITIAL_SETUP_DATA_ROOT}/dynamo/test/Config.json`
+  ];
+
+  for (const tableName of dynamoTableNames) {
+    paths.push(`${INITIAL_SETUP_DATA_ROOT}/dynamo/test/${tableName}.json`);
+  }
+
+  for (const tag of graphTags) {
+    paths.push(`${INITIAL_SETUP_DATA_ROOT}/graph/${tag}/nodeConfig/.gitkeep`);
+    paths.push(`${INITIAL_SETUP_DATA_ROOT}/graph/${tag}/relationshipConfig/.gitkeep`);
+  }
+
+  return paths;
+}
+
+export async function emitCoreFunctionArtifacts({ project, objects = [], relationships = [], flows = [], objectGraphServiceTags = [], relationshipGraphServiceTags = [] }) {
+  const crud = objects.length > 0;
+  const hasRelationships = relationships.length > 0;
+  const s3Flows = (flows || [])
+    .filter((flow) => Array.isArray(flow?.event) && flow.event.includes('s3'))
+    .map((flow) => {
+      let roleName = '';
+      if (typeof flow.flowTag === 'string' && flow.flowTag) {
+        roleName = flow.flowTag[0].toUpperCase() + flow.flowTag.slice(1);
+      }
+      return { roleName };
+    });
 
-export const coreFunctionManagedPaths = [
-  `${APP_ROOT}/core-function.yml`,
-  `${APP_ROOT}/core-resource.yml`,
-  `${SRC_ROOT}/UploadSchema_HdrInv.js`,
-  `${SRC_ROOT}/UploadSchema_Main.js`,
-  `${SRC_ROOT}/GenerateSeedDataDynamo_HdrInv.js`,
-  `${SRC_ROOT}/GenerateSeedDataDynamo_Main.js`,
-  `${SRC_ROOT}/RemoveSeedDataDynamo_HdrInv.js`,
-  `${SRC_ROOT}/RemoveSeedDataDynamo_Main.js`,
-  `${SRC_ROOT}/GenerateSeedDataGraphData_HdrInv.js`,
-  `${SRC_ROOT}/GenerateSeedDataGraphData_Main.js`,
-  `${SRC_ROOT}/GenerateSeedDataGraphSchema_HdrInv.js`,
-  `${SRC_ROOT}/GenerateSeedDataGraphSchema_Main.js`,
-  `${SRC_ROOT}/InitialSetup_HdrInv.js`,
-  `${SRC_ROOT}/InitialSetup_Main.js`,
-  `${SRC_ROOT}/generated/GeneratedTableConfigs.js`,
-  `${SRC_ROOT}/generated/GeneratedGraphNodeSchemas.js`,
-  `${SRC_ROOT}/generated/GeneratedGraphRelSchemas.js`,
-  `${SRC_ROOT}/InitialSetupConfig.js`
-];
-
-export async function emitCoreFunctionArtifacts({ project, objects = [], relationships = [] }) {
   const state = { 
     project, 
     objects, 
     relationships,
+    flows,
+    objectGraphServiceTags,
+    relationshipGraphServiceTags,
+    crud,
+    hasRelationships,
+    s3Flows,
     hasGenerateGraph: objects.length > 0 || relationships.length > 0
   };
 
@@ -47,12 +115,15 @@ export async function emitCoreFunctionArtifacts({ project, objects = [], relatio
     generateSeedDataGraphDataMain,
     generateSeedDataGraphSchemaHdrInv,
     generateSeedDataGraphSchemaMain,
-    generatedTableConfigs,
-    generatedGraphNodeSchemas,
-    generatedGraphRelSchemas,
-    initialSetupConfig,
     initialSetupHdrInv,
-    initialSetupMain
+    initialSetupMain,
+    initialSetupConfig,
+    initialSetupRunner,
+    commandInitialSetup,
+    commandSeedDynamo,
+    commandSeedRemove,
+    commandSeedGraph,
+    commandUploadSchema
   ] = await Promise.all([
     render('CoreFunction_Yaml.ejs', state),
     render('CoreResource_Yaml.ejs', state),
@@ -66,15 +137,18 @@ export async function emitCoreFunctionArtifacts({ project, objects = [], relatio
     render('GenerateSeedDataGraphData_Main.ejs', state),
     render('GenerateSeedDataGraphSchema_HdrInv.ejs', state),
     render('GenerateSeedDataGraphSchema_Main.ejs', state),
-    render('GeneratedTableConfigs.ejs', state),
-    render('GeneratedGraphNodeSchemas.ejs', state),
-    render('GeneratedGraphRelSchemas.ejs', state),
-    render('InitialSetupConfig.ejs', state),
     render('InitialSetup_HdrInv.ejs', state),
-    render('InitialSetup_Main.ejs', state)
+    render('InitialSetup_Main.ejs', state),
+    render('InitialSetupConfig.ejs', state),
+    render('InitialSetupRunner.ejs', state),
+    render('InitialSetupRunner_initialSetup.ejs', state),
+    render('InitialSetupRunner_seedDynamo.ejs', state),
+    render('InitialSetupRunner_seedRemove.ejs', state),
+    render('InitialSetupRunner_seedGraph.ejs', state),
+    render('InitialSetupRunner_uploadSchema.ejs', state)
   ]);
 
-  return [
+  const baseArtifacts = [
     {
       path: `${APP_ROOT}/core-function.yml`,
       content: normalizeYaml(coreFunctionYaml)
@@ -124,31 +198,84 @@ export async function emitCoreFunctionArtifacts({ project, objects = [], relatio
       content: generateSeedDataGraphSchemaMain
     },
     {
-      path: `${SRC_ROOT}/generated/GeneratedTableConfigs.js`,
-      content: generatedTableConfigs
+      path: `${SRC_ROOT}/InitialSetup_HdrInv.js`,
+      content: initialSetupHdrInv
     },
     {
-      path: `${SRC_ROOT}/generated/GeneratedGraphNodeSchemas.js`,
-      content: generatedGraphNodeSchemas
+      path: `${SRC_ROOT}/InitialSetup_Main.js`,
+      content: initialSetupMain
     },
     {
-      path: `${SRC_ROOT}/generated/GeneratedGraphRelSchemas.js`,
-      content: generatedGraphRelSchemas
+      path: `${SRC_ROOT}/InitialSetupConfig.js`,
+      content: initialSetupConfig,
+      writeWhenFileExist: false
     },
     {
-      path: `${SRC_ROOT}/InitialSetupConfig.js`,
+      path: `${INITIAL_SETUP_ROOT}/InitialSetupConfig.js`,
       content: initialSetupConfig,
       writeWhenFileExist: false // Don't overwrite the file that dev modifies
     },
     {
-      path: `${SRC_ROOT}/InitialSetup_HdrInv.js`,
-      content: initialSetupHdrInv
+      path: `${INITIAL_SETUP_ROOT}/runner.js`,
+      content: initialSetupRunner
     },
     {
-      path: `${SRC_ROOT}/InitialSetup_Main.js`,
-      content: initialSetupMain
+      path: `${INITIAL_SETUP_ROOT}/commands/initialSetup.js`,
+      content: commandInitialSetup
+    },
+    {
+      path: `${INITIAL_SETUP_ROOT}/commands/seedDynamo.js`,
+      content: commandSeedDynamo
+    },
+    {
+      path: `${INITIAL_SETUP_ROOT}/commands/seedRemove.js`,
+      content: commandSeedRemove
+    },
+    {
+      path: `${INITIAL_SETUP_ROOT}/commands/seedGraph.js`,
+      content: commandSeedGraph
+    },
+    {
+      path: `${INITIAL_SETUP_ROOT}/commands/uploadSchema.js`,
+      content: commandUploadSchema
     }
   ];
+
+  const defaultConfigContent = '[\n]\n';
+
+  baseArtifacts.push({
+    path: `${INITIAL_SETUP_DATA_ROOT}/dynamo/test/Config.json`,
+    content: defaultConfigContent,
+    writeWhenFileExist: false
+  });
+
+  const dynamoTableNames = _extractDynamoTableNames(objects);
+  for (const tableName of dynamoTableNames) {
+    baseArtifacts.push({
+      path: `${INITIAL_SETUP_DATA_ROOT}/dynamo/test/${tableName}.json`,
+      content: '[\n]\n',
+      writeWhenFileExist: false
+    });
+  }
+
+  const graphTags = new Set([
+    ...(objectGraphServiceTags || []),
+    ...(relationshipGraphServiceTags || [])
+  ]);
+  for (const tag of graphTags) {
+    baseArtifacts.push({
+      path: `${INITIAL_SETUP_DATA_ROOT}/graph/${tag}/nodeConfig/.gitkeep`,
+      content: '',
+      writeWhenFileExist: false
+    });
+    baseArtifacts.push({
+      path: `${INITIAL_SETUP_DATA_ROOT}/graph/${tag}/relationshipConfig/.gitkeep`,
+      content: '',
+      writeWhenFileExist: false
+    });
+  }
+
+  return baseArtifacts;
 }
 
 function normalizeYaml(content) {

package/src/emit/coreFunction/templates/GenerateSeedDataDynamo_HdrInv.ejs

@@ -8,7 +8,10 @@ const main = middleware.wrap(async (event, context, callback) => {
   try {
     return await generateMain.generateSeedDataDynamo(event);
   } catch (err) {
-    event._izContext.logger.error('Error, GenerateSeedDataDynamo_HdrInv: ', err);
+    event._izContext.logger.error(
+      'Error, GenerateSeedDataDynamo_HdrInv: ',
+      err
+    );
     throw err;
   }
 });

package/src/emit/coreFunction/templates/GenerateSeedDataGraphData_HdrInv.ejs

@@ -8,7 +8,10 @@ const main = middleware.wrap(async (event, context, callback) => {
   try {
     return await generateMain.generateSeedDataGraphData(event);
   } catch (err) {
-    event._izContext.logger.error('Error, GenerateSeedDataGraphData_HdrInv: ', err);
+    event._izContext.logger.error(
+      'Error, GenerateSeedDataGraphData_HdrInv: ',
+      err
+    );
     throw err;
   }
 });

package/src/emit/coreFunction/templates/GenerateSeedDataGraphSchema_HdrInv.ejs

@@ -8,7 +8,10 @@ const main = middleware.wrap(async (event, context, callback) => {
   try {
     return await generateMain.generateSeedDataGraphSchema(event);
   } catch (err) {
-    event._izContext.logger.error('Error, GenerateSeedDataGraphSchema_HdrInv: ', err);
+    event._izContext.logger.error(
+      'Error, GenerateSeedDataGraphSchema_HdrInv: ',
+      err
+    );
     throw err;
   }
 });

package/src/emit/coreFunction/templates/GenerateSeedDataGraphSchema_Main.ejs

@@ -25,7 +25,11 @@ const generateSeedDataGraphSchema = async (event) => {
     console.log('====== Start refresh Seed Data: graph schema ======');
 
     // for production env
-    await initialSetupSharedLib.generateSchema(_izContext, nodeSchemas(), 'node'); // node schema
+    await initialSetupSharedLib.generateSchema(
+      _izContext,
+      nodeSchemas(),
+      'node'
+    ); // node schema
     await initialSetupSharedLib.generateSchema(
       _izContext,
       relationshipSchemas(),
@@ -43,7 +47,11 @@ const generateSeedDataGraphSchema = async (event) => {
     ); // relationship version data schema
 
     // for test env
-    await initialSetupSharedLib.generateSchema(_izContext, config.graphNodeSchemas(), 'node'); // node schema
+    await initialSetupSharedLib.generateSchema(
+      _izContext,
+      config.graphNodeSchemas(),
+      'node'
+    ); // node schema
     await initialSetupSharedLib.generateSchema(
       _izContext,
       config.graphRelationshipSchemas(),

package/src/emit/coreFunction/templates/GeneratedGraphNodeSchemas.ejs

@@ -5,43 +5,43 @@
 export function generatedGraphNodeSchemas() {
   const schemas = {};
 
-<% objects.forEach(obj => { -%>
-<% if (obj.storageResources && obj.storageResources.graph) { -%>
+  <% objects.forEach(obj => { -%>
+  <% if (obj.storageResources && obj.storageResources.graph) { -%>
   const serverTag_<%= obj.objectType %> = '<%= obj.storageResources.graph.graphServerTag %>';
   if (!schemas[serverTag_<%= obj.objectType %>]) {
     schemas[serverTag_<%= obj.objectType %>] = {};
   }
-  
+
   schemas[serverTag_<%= obj.objectType %>].<%= obj.objectType %> = {
     identifier: true,
     immutable: false,
     restrictProperties: false,
     restrictRelationships: false,
     properties: {
-<% if (obj.identifiers && obj.identifiers.length > 0) { -%>
-<% obj.identifiers.forEach(id => { -%>
+      <% if (obj.identifiers && obj.identifiers.length > 0) { -%>
+      <% obj.identifiers.forEach(id => { -%>
       <%= id.fieldName %>: {
         identifier: true,
         immutable: true
       },
-<% }); -%>
-<% } -%>
-<% if (obj.fieldNames) { -%>
-<% Object.keys(obj.fieldNames).forEach(fieldName => { -%>
-<% const isId = obj.identifiers && obj.identifiers.some(i => i.fieldName === fieldName); -%>
-<% if (!isId) { -%>
+      <% }); -%>
+      <% } -%>
+      <% if (obj.fieldNames) { -%>
+      <% Object.keys(obj.fieldNames).forEach(fieldName => { -%>
+      <% const isId = obj.identifiers && obj.identifiers.some(i => i.fieldName === fieldName); -%>
+      <% if (!isId) { -%>
       <%= fieldName %>: {
         identifier: false,
         immutable: <%= obj.fieldNames[fieldName].canUpdate === false ? 'true' : 'false' %>
-      },
-<% } -%>
-<% }); -%>
-<% } -%>
+      }
+      <% } -%>
+      <% }); -%>
+      <% } -%>
     }
   };
 
-<% } -%>
-<% }); -%>
+  <% } -%>
+  <% }); -%>
 
   return schemas;
 }

package/src/emit/coreFunction/templates/GeneratedGraphRelSchemas.ejs

@@ -5,10 +5,10 @@
 export function generatedGraphRelationshipSchemas() {
   const schemas = {};
 
-<% relationships.forEach(relObj => { -%>
-<% const relName = Object.keys(relObj)[0]; -%>
-<% const relData = relObj[relName]; -%>
-<% if (relData && relData.storageResources && relData.storageResources.graph) { -%>
+  <% relationships.forEach(relObj => { -%>
+  <% const relName = Object.keys(relObj)[0]; -%>
+  <% const relData = relObj[relName]; -%>
+  <% if (relData && relData.storageResources && relData.storageResources.graph) { -%>
   const serverTag_<%= relName %> = '<%= relData.storageResources.graph.graphServerTag %>';
   if (!schemas[serverTag_<%= relName %>]) {
     schemas[serverTag_<%= relName %>] = {};
@@ -20,8 +20,8 @@ export function generatedGraphRelationshipSchemas() {
     properties: {}
   };
 
-<% } -%>
-<% }); -%>
+  <% } -%>
+  <% }); -%>
 
   return schemas;
 }

package/src/emit/coreFunction/templates/GeneratedTableConfigs.ejs

@@ -4,12 +4,12 @@
 
 // Prod table configs (ตารางที่ Service นี้เป็นเจ้าของ)
 export const prodTableConfigs = {
-  Config: {}
-<% objects.forEach(obj => { -%>
-<% if (obj.storageResources && obj.storageResources.dynamo) { -%>
-  , <%= obj.storageResources.dynamo.tableName %>: {}
-<% } -%>
-<% }); -%>
+  Config: {},
+  <% objects.forEach(obj => { -%>
+  <% if (obj.storageResources && obj.storageResources.dynamo) { -%>
+  <%= obj.storageResources.dynamo.tableName %>: {}
+  <% } -%>
+  <% }); -%>
 };
 
 // Test table configs (flag สำหรับ refresh seed data)
@@ -23,12 +23,12 @@ export const testTableConfigs = {
   },
   GraphHandlerRelationshipSchema: {
     clearDataWhenRefresh: true
-  }
-<% objects.forEach(obj => { -%>
-<% if (obj.storageResources && obj.storageResources.dynamo) { -%>
-  , <%= obj.storageResources.dynamo.tableName %>: {
+  },
+  <% objects.forEach(obj => { -%>
+  <% if (obj.storageResources && obj.storageResources.dynamo) { -%>
+  <%= obj.storageResources.dynamo.tableName %>: {
     clearDataWhenRefresh: true
   }
-<% } -%>
-<% }); -%>
+  <% } -%>
+  <% }); -%>
 };