Fixed issue with service method naming. Also a small fix to a setup file.

bobgarner · bobgarner · commit aac371951d23 · 2024-02-29T05:20:27.000-08:00
diff --git a/service/ServiceFunctions.eml b/service/ServiceFunctions.eml
@@ -26,11 +26,11 @@ $[/send]
         $[let usernameAttribute = (userEntity|domain:Security).attributeTagged("login:username")]
         ${userEntity|domain:Model|name} user = userDetailsService.findBy${usernameAttribute|domain:Model|name|capitalize}(securityService.findLoggedInUsername());
         $[foreach relationship in (entity|domain:Security).relationships]
-            $[if relationship.hasTag("user:created")]
-        object.set${relationship|domain:Model|name|capitalize}Id(user.getId());
-            $[/if]
-            $[if relationship.hasTag("user:modified")]
-        object.set${relationship|domain:Model|name|capitalize}Id(user.getId());
+            $[if relationship.hasTag("user:created") || relationship.hasTag("user:modified")]
+            $[let userFieldName = relationship|domain:Model|name|capitalize]
+                $[if userFieldName != ""]
+        object.set${userFieldName}Id(user.getId());
+                $[/if]
             $[/if]
         $[/foreach]
     $[/if]
diff --git a/service/authors/ServiceMappingAuthor.eml b/service/authors/ServiceMappingAuthor.eml
@@ -75,7 +75,7 @@ $[/ send ]
                             $[ capture byArgument ]modelObject.get${relationshipToReleaseEntity|domain:Model|name|capitalize}Id(), modelObject.get${entity.primaryKeyAttribute|domain:Model|name|capitalize}(), $[/ capture ]
                         $[/ if ]
                     $[ else ]
-                        $[ capture bySomething ]By${entity|domain:Model|name|capitalize}$[/ capture ]
+                        $[ capture bySomething ]By${relationship.relationship.reverseRelationship|domain:Model|name|capitalize}$[/ capture ]
                         $[ capture byArgument ]modelObject.get${entity.primaryKeyAttribute|domain:Model|name|capitalize}(), $[/ capture ]
                     $[/ if ]
 $[ send imports ]
diff --git a/setups/domains/SecurityDomain.edl.eml b/setups/domains/SecurityDomain.edl.eml
@@ -42,10 +42,5 @@ domain Security (${appName}) {
         T "access:write:role:editor"
         T "access:read:role:editor"
         T "access:read:role:default"
-        relationships {
-            createdUser {
-                T "user:created"
-            }
-        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,5 @@ domain Security (${appName}) {`
`42`	`42`	`T "access:write:role:editor"`
`43`	`43`	`T "access:read:role:editor"`
`44`	`44`	`T "access:read:role:default"`
`45`		`- relationships {`
`46`		`- createdUser {`
`47`		`- T "user:created"`
`48`		`- }`
`49`		`- }`
`50`	`45`	`}`
`51`	`46`	`}`