@izara_project/izara-market-library-service-schemas 1.0.67 → 1.0.69

package/src/reStructure/TemplateData/relationshipPerAction/update/action/handler/templateByHandler/sqsTemplate.ejs

@@ -32,81 +32,64 @@ middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 // validate event params in middleware before into function
 let validatorSchema = {
   type: "object",
-  required: [
-  'firstObject',
-  'secondObject',
-  'oldReltypeAndDirection',
-  'newRelType',
-  ],
+  required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection","relId"],
   properties: {
     firstObject: {
-      type: 'object',
-      required: ['objType', 'identifiers'],
+      type: "object",
+      required: ["objType","identifiers"],
       properties: {
         objType: {
-          type: 'object',
-          required: ['objectType', 'serviceTag'],
+          type: "object",
+          required: ["serviceTag","objectType"],
           properties: {
-            serviceTag: izara.validatorSchema.stringNotEmpty(),
-            objectType: izara.validatorSchema.stringNotEmpty(),
+            serviceTag: validatorSchema.stringNotEmpty(),
+            objectType: validatorSchema.stringNotEmpty(),
           }
         },
         identifiers: {
           type: "object",
           minProperties: 1
-        },
+        }
       }
     },
     secondObject: {
-      type: 'object',
-      required: ['objType', 'identifiers'],
-      properties: {
-        objType: {
-          type: 'object',
-          required: ['objectType', 'serviceTag'],
-          properties: {
-            serviceTag: izara.validatorSchema.stringNotEmpty(),
-            objectType: izara.validatorSchema.stringNotEmpty(),
-          }
-        },
-        identifiers: {
-          type: "object",
-          minProperties: 1
-        },
+    type: "object",
+    required: ["objType","identifiers"],
+    properties: {
+      objType: {
+        type: "object",
+        required: ["serviceTag","objectType"],
+        properties: {
+          serviceTag: validatorSchema.stringNotEmpty(),
+          objectType: validatorSchema.stringNotEmpty(),
+        }
+      },
+      identifiers: {
+        type: "object",
+        minProperties: 1
       }
-    },
-    oldReltypeAndDirection: {
-      type: 'object',
-      required: ['relType', 'relationshipDirection'],
+    }
+  },
+    relType: {
+      type: "object",
+      required: ["relationshipTag", "serviceTag"],
       properties: {
-        relType: {
-          type: 'object',
-          required: ['serviceTag', 'relationshipTag'],
-          properties: {
-            serviceTag: izara.validatorSchema.stringNotEmpty(),
-            relationshipTag: izara.validatorSchema.stringNotEmpty(),
-          }
-        },
-        relationshipProperties: {
-          type: 'object',
-        },
-        relationshipDirection: {
+        relationshipTag: validatorSchema.stringNotEmpty(),
+        serviceTag: {
           type: 'string',
-          enum: ['from', 'to']
-
-        },
+          pattern: "^[a-zA-Z0-9_-]+$",
+          enum: [process.env.iz_serviceTag]
+        }
       }
     },
-    newRelType: {
-      type: 'object',
-      required: ['serviceTag', 'relationshipTag'],
-      properties: {
-        serviceTag: izara.validatorSchema.stringNotEmpty(),
-        relationshipTag: izara.validatorSchema.stringNotEmpty(),
-      }
+    relId: validatorSchema.stringNotEmpty(),
+    relationshipProperties: {
+      type: "object",
+      minProperties: 1
     },
-    settings: {
-      type: 'object'
+    relationshipDirection: {
+      type: "string",
+      enum: ['from','to']
     }
   }
 };

package/src/reStructure/TemplateData/relationshipPerAction/update/complete/functionYaml/data.js

@@ -80,10 +80,7 @@ function createParamForCreateSource(srcPath) {
     ),
     createIamRole(
       {
-        [RESOURCE_CLASSES.sns]:
-          [
-            SNS_RESOURCE.publish, SNS_RESOURCE.subscribe
-          ]
+        [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe],
       },
       [
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),

package/src/reStructure/TemplateData/resourceYaml/filterGenerateResource/data.js

@@ -62,7 +62,7 @@ async function filterCreateResourceYaml(_izContext, createSourceParams, objSchem
     }))
 
 
-    console.log("tableNamesToFilter", tableNamesToFilter)
+    // console.log("tableNamesToFilter", tableNamesToFilter)
     let filteredCreateSourceParams = createSourceParams.filter(
       (result) => !tableNamesToFilter.has(result.templateData.tableName)
     )

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

@@ -99,7 +99,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     // console.log("createSourceParams before filter", createSourceParams)
     const filteredCreateSourceParams = await filterCreateResourceYaml(_izContext, createSourceParams, objSchemaPath);
 
-    console.log("filteredCreateSourceParams", filteredCreateSourceParams);
+    // console.log("filteredCreateSourceParams", filteredCreateSourceParams);
 
     return filteredCreateSourceParams;
   } catch (error) {