JNG-5333 Add update / delete allow flag trnasformation added

BlackBeltTechnology · Jan 31, 2024 · a6c7cfb · a6c7cfb
1 parent fd4fe09
commit a6c7cfb
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 20 deletions.
diff --git a/judo-tatami-jsl-jsl2psm/src/main/epsilon/operations/jsl/action/action.eol b/judo-tatami-jsl-jsl2psm/src/main/epsilon/operations/jsl/action/action.eol
@@ -6,19 +6,16 @@ operation JSL!TransferActionDeclaration getId(): String {
 
 @cached
 operation JSL!TransferActionDeclaration isUpdateAllowed() : Boolean {
-    if (self.output.isDefined()){    	
-        // TODO: JNG-5333 Calculate
-        // return self.`return`.isUpdateAllowed();
+    if (self.`return`.isDefined()){
+        return self.modifiers.exists(m | m.isTypeOf(JSL!UpdateModifier) and m.`true`);
     }
     return false;
 }
 
 @cached
 operation JSL!TransferActionDeclaration isDeleteAllowed() : Boolean {
-    if (self.output.isDefined()){
-        // TODO: JNG-5333 Calculate
-        // return self.`return`.isDeleteAllowed();
-        return false;
+    if (self.`return`.isDefined()){
+        return self.modifiers.exists (m | m.isTypeOf(JSL!DeleteModifier) and m.`true`);
     }
     return false;
 }

diff --git a/judo-tatami-jsl-jsl2psm/src/main/epsilon/transformations/psm/modules/action/action.etl b/judo-tatami-jsl-jsl2psm/src/main/epsilon/transformations/psm/modules/action/action.etl
@@ -238,10 +238,6 @@ rule CreateBoundOperationForMappedTransferObjectType
       t.setId("(jsl/" + s.getId() + ")/CreateBoundOperationForMappedTransferObjectType");
       t.binding = s.equivalent("CreateBoundOperationForEntityType");
 
-      // TODO: JNG-5333 Modifiers for action's return
-      // t.updateOnResult = s.isUpdateAllowed();
-      // t.deleteOnResult = s.isDeleteAllowed();
-
       s.eContainer.equivalent("CreateMappedTransferObjectType").operations.add(t);
       log.debug("Created CreateBoundOperationForMappedTransferObjectType: " + t.name);
 }

diff --git a/.../test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/operation/JslAction2PsmOperationTest.java b/.../test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/operation/JslAction2PsmOperationTest.java
@@ -236,7 +236,8 @@ void testActions() throws Exception {
         		.excpectInput(false)
         		.expectMappedInput(false)
         		.excpectOutput(true)
-        		.expectMappedOutput(false));
+        		.expectMappedOutput(false)
+        		);
 
         assertOperation(param()
         		.transferName("MappedTransfer")
@@ -254,7 +255,9 @@ void testActions() throws Exception {
         		.excpectInput(false)
         		.expectMappedInput(false)
         		.excpectOutput(true)
-        		.expectMappedOutput(true));
+        		.expectMappedOutput(true)
+        		.deleteOnResult(true)
+        		.updateOnResult(true));
 
         assertOperation(param()
         		.transferName("MappedTransfer")
@@ -290,8 +293,10 @@ void testActions() throws Exception {
         		.excpectInput(true)
         		.expectMappedInput(false)
         		.excpectOutput(true)
-        		.expectMappedOutput(true));
-
+        		.expectMappedOutput(true)
+        		.deleteOnResult(true)
+        		.updateOnResult(true));
+
         assertOperation(param()
         		.transferName("MappedTransfer")
         		.operationName("staticMappedOutputActionWithUnmappedInput")
@@ -326,7 +331,10 @@ void testActions() throws Exception {
         		.excpectInput(true)
         		.expectMappedInput(true)
         		.excpectOutput(true)
-        		.expectMappedOutput(true));
+        		.expectMappedOutput(true)
+        		.deleteOnResult(true)
+        		.updateOnResult(true));
+
 
         assertOperation(param()
         		.transferName("MappedTransfer")
@@ -359,6 +367,10 @@ void testActions() throws Exception {
         assertThat(assertUnmappedTransferObject("UnmappedFaultTransfer").getOperations().size(), equalTo(1));
         assertOperationFaults("UnmappedFaultTransfer", "staticFaults");
 
+
+    	assertThat(assertTransferObjectOperation("UnmappedInputParameter", "default").getBehaviour().getBehaviourType(),  
+    			equalTo(TransferOperationBehaviourType.GET_TEMPLATE));
+
     }
 
     @Builder
@@ -370,6 +382,8 @@ private static class AssertOperationParameters {
 		boolean expectMappedInput; 
 		boolean excpectOutput;
 		boolean expectMappedOutput;
+		boolean deleteOnResult;
+		boolean updateOnResult;
     }
 
     private AssertOperationParameters.AssertOperationParametersBuilder param() {
@@ -403,7 +417,10 @@ private void assertOperation(AssertOperationParameters.AssertOperationParameters
             } else {
             	assertThat(operation.getOutput().getType(), equalTo(assertUnmappedTransferObject("UnmappedOutputParameter")));        	
             }
-            assertThat(operation.getOutput().getCardinality().getLower(), equalTo(1));        	
+            assertThat(operation.getOutput().getCardinality().getLower(), equalTo(1)); 
+
+            assertThat(operation.isDeleteOnResult(), equalTo(p.deleteOnResult));
+            assertThat(operation.isUpdateOnResult(), equalTo(p.updateOnResult));
         } else {
             assertThat(operation.getOutput(), is(nullValue()));        	
         }

diff --git a/judo-tatami-jsl-jsl2psm/src/test/resources/operation/ActionsTestModel.jsl b/judo-tatami-jsl-jsl2psm/src/test/resources/operation/ActionsTestModel.jsl
@@ -34,19 +34,19 @@ transfer MappedTransfer maps Entity as e {
 	action UnmappedOutputParameter unmappedOutputAction();
 	action static UnmappedOutputParameter staticUnmappedOutputAction();
 
-	action  MappedOutputParameter mappedOutputAction();
+	action MappedOutputParameter mappedOutputAction() update: true delete: true;
 	action static MappedOutputParameter staticMappedOutputAction();
 
 	action UnmappedOutputParameter unmappedOutputActionWithUnmappedInput(UnmappedInputParameter param);
 	action static UnmappedOutputParameter staticUnmappedOutputActionWithUnmappedInput(UnmappedInputParameter param);
 
-	action MappedOutputParameter mappedOutputActionWithUnmappedInput(UnmappedInputParameter param);
+	action MappedOutputParameter mappedOutputActionWithUnmappedInput(UnmappedInputParameter param) update: true delete: true;;
 	action static MappedOutputParameter staticMappedOutputActionWithUnmappedInput(UnmappedInputParameter param);
 
 	action UnmappedOutputParameter unmappedOutputActionWithMappedInput(MappedInputParameter param choices:InputParameterEntity.all());
 	action static UnmappedOutputParameter staticUnmappedOutputActionWithMappedInput(MappedInputParameter param choices:InputParameterEntity.all());
 
-	action MappedOutputParameter mappedOutputActionWithMappedInput(MappedInputParameter param choices:InputParameterEntity.all());
+	action MappedOutputParameter mappedOutputActionWithMappedInput(MappedInputParameter param choices:InputParameterEntity.all()) update: true delete: true;;
 	action static MappedOutputParameter staticMappedOutputActionWithMappedInput(MappedInputParameter param choices:InputParameterEntity.all());
 }
 
@@ -77,6 +77,8 @@ transfer UnmappedInputParameter {
 
 
 transfer MappedOutputParameter maps OutputParameterEntity as o {
+	event instead update update();
+	event instead delete delete();
 }
 
 transfer MappedInputParameter maps InputParameterEntity as i {