@izara_project/izara-core-generate-service-code 1.0.28 → 1.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "description": "Code for locally generating per service files",
   "author": "Sven Mason <thebarbariansven@gmail.com>",
   "license": "AGPL-3.0-or-later",

package/src/generateCode/generateSchema/relationshipPerActionComponent/changeRelationship/action/mainFunction/template.ejs

@@ -15,8 +15,6 @@ 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/>.
 */
 
-
-
 import { objectHash as hash } from '@izara_project/izara-shared-core';
 
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
@@ -124,10 +122,36 @@ export default async function <%- functionName %> (
     //(<afterValidateChangeRel>)
     //(</afterValidateChangeRel>)
 
-    const relationshipSchema = await getRelationshipSchemaWithCache(_izContext, newRelType);
-    _izContext.logger.debug("relationshipSchema: ", relationshipSchema);
+    // check old relType canChangeToRelType
+    const oldRelationshipSchema = await getRelationshipSchemaWithCache(_izContext, oldRelTypeAndDirection.relType);
+    _izContext.logger.debug("oldRelationshipSchema ", oldRelationshipSchema);
+
+    const newRelationshipSchema = await getRelationshipSchemaWithCache(_izContext, newRelType);
+    _izContext.logger.debug("newRelationshipSchema: ", newRelationshipSchema);
+    if (!oldRelationshipSchema.hasOwnProperty('canChangeToRelTypes')) {
+      errorsFound.push(`${oldRelTypeAndDirection.relType} not have property to change to another relType`);
+    } else {
+      if (!newRelationshipSchema) {
+        errorsFound.push(`${newRelationshipSchema} not exists can't changeToRelType`);
+      } else {
+        oldRelationshipSchema.canChangeToRelTypes.find(canChangeToRelType => {
+          if (canChangeToRelType.relType.serviceTag === newRelType.serviceTag &&
+            canChangeToRelType.relType.relationshipTag === newRelType.relationshipTag) {
+            // check changeBy
+            if (canChangeToRelType.changeBy === "user") {
+              // if changeBy is user will check for importBatch callingFlow
+              if (callingFlowConfig) {
+                if (callingFlowConfig.callingFlow !== "ImportDataTestExternalUpdateRelationshipHdrSqs") {
+                  errorsFound.push(`CanChangeToRelType changeBy is user but it's not user process with importData`);
+                }
+              }
+            }
+          }
+        });
+      };
+    };
 
-    const links = await findLinksByObjTypes(_izContext, [firstObject.objType, secondObject.objType], relationshipSchema.links)
+    const links = await findLinksByObjTypes(_izContext, [firstObject.objType, secondObject.objType], newRelationshipSchema.links)
     _izContext.logger.debug("links", links)
     if (!links.length) {
       errorsFound.push(`not found link between ${JSON.stringify({ firstObject: firstObject.objType })} ${JSON.stringify({ secondObject: secondObject.objType })}`)
@@ -147,8 +171,8 @@ export default async function <%- functionName %> (
       const matchToFrom = fromServiceTag === secondServiceTag && fromObjectType === secondObjectType &&
         toServiceTag === firstServiceTag && toObjType === firstObjectType;
 
-      if ((oldRelTypeAndDirection.relationshipDirection === "from" && matchFromTo) ||
-        (oldRelTypeAndDirection.relationshipDirection === "to" && matchToFrom)) {
+      if ((newRelationshipSchema.relationshipDirection === "from" && matchFromTo) ||
+        (newRelationshipSchema.relationshipDirection === "to" && matchToFrom)) {
         checkCorrectLink = true
         break;
       }
@@ -160,10 +184,10 @@ export default async function <%- functionName %> (
 
     let targetStorageResources = [];
 
-    if (relationshipSchema) {
+    if (newRelationshipSchema) {
       // find targetStorageResources and validate each storageResources
       await Promise.all(
-        relationshipSchema.links.map(async ({ from, to, storageResourceTags }) => {
+        newRelationshipSchema.links.map(async ({ from, to, storageResourceTags }) => {
           const { serviceTag: fromServiceTag, objectType: fromObjectType } = from.objType
           const { serviceTag: toServiceTag, objectType: toObjectType } = to.objType
 
@@ -184,7 +208,7 @@ export default async function <%- functionName %> (
 
             // check founded storageResource of link and collect used storageResources
             await Promise.all(storageResourceTags.map(async storageResourceTag => {
-              const usedStorageResource = relationshipSchema.storageResources[storageResourceTag];
+              const usedStorageResource = newRelationshipSchema.storageResources[storageResourceTag];
 
               if (usedStorageResource.storageType === consts.STORAGE_TYPES.graph) {
                 const graphServiceTag = await getGraphServiceTagWithCache(_izContext, usedStorageResource.graphServerTag);
@@ -213,8 +237,8 @@ export default async function <%- functionName %> (
 
 
       // validate properties exists with schema
-      for (const propKey in oldRelTypeAndDirection.relationshipProperties) {
-        if (!relationshipSchema.fieldNames.hasOwnProperty(propKey)) {
+      for (const propKey in oldRelTypeAndDirection.fieldNames) {
+        if (!newRelationshipSchema.fieldNames.hasOwnProperty(propKey)) {
           errorsFound.push(`property: ${propKey} not exists in relationshipSchema`);
         }
       }

package/src/generateCode/generateSchema/relationshipPerActionComponent/moveRelationship/action/mainFunction/template.ejs

@@ -128,6 +128,16 @@ export default async function <%- functionName %> (
     const relationshipSchema = await getRelationshipSchemaWithCache(_izContext, relType);
     _izContext.logger.debug("relationshipSchema: ", relationshipSchema);
 
+    if (!relationshipSchema.hasOwnProperty("moveBy") || relationshipSchema.moveBy === "none") {
+      errorsFound.push(`relationship: ${relType.relationshipTag} can't move`);
+    } else if (relationshipSchema.moveBy === "user") {
+      if (callingFlowConfig) {
+        if (callingFlowConfig.callingFlow !== "ImportDataTestExternalUpdateRelationshipHdrSqs") {
+          errorsFound.push(`moveBy is user but it's not user process with importData`);
+        }
+      }
+    }
+
     const links = await findLinksByObjTypes(_izContext, [firstObject.objType, secondObject.objType], relationshipSchema.links)
     _izContext.logger.debug("links", links)
     if (!links.length) {

package/src/generateCode/generateSchema/relationshipPerActionComponent/update/action/mainFunction/template.ejs

@@ -193,18 +193,18 @@ export default async function updateRelationship(
         _izContext.logger.debug("propValue: ", propValue);
 
         if (relationshipSchema.fieldNames[propKey]) {
-          if (relationshipSchema.fieldNames[propKey].canUpdate !== true) {
-            errorsFound.push(`property:${propKey} cannot update`);
+          if (relationshipSchema.fieldNames[propKey].updateBy === "user") {
+            if (callingFlowConfig) {
+              if (callingFlowConfig.callingFlow !== "ImportDataTestExternalUpdateRelationshipHdrSqs") {
+                errorsFound.push(`property:${propKey} can update  user but it's not user process with importData`)
+              }
+            }
           }
         } else {
           errorsFound.push(`property:${propKey} not exists in relationshipSchema`);
         }
       }
 
-    } else {
-      errorsFound.push(`relationshipSchema not exists`);
-    }
-
 
     // if found errors will stop processing
     if (errorsFound.length) {