adds support for rich 'aggregate' modeling (working)

ZenWave360 · Mar 30, 2024 · cdeb2ad · cdeb2ad
1 parent b87d3fb
commit cdeb2ad
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 11 deletions.
diff --git a/...plugins/SpringCloudStream3Generator/producer/mocks/EventsProducerInMemoryContext.java.hbs b/...plugins/SpringCloudStream3Generator/producer/mocks/EventsProducerInMemoryContext.java.hbs
@@ -6,8 +6,8 @@ public class EventsProducerInMemoryContext {
 {{#each services as |service|}}
     private {{service.apiClassName}}Captor {{asInstanceName service.apiClassName}}Captor = new {{service.apiClassName}}Captor();
 
-    public <T extends I{{service.apiClassName}}> T {{asInstanceName service.apiClassName}}() {
-        return (T) {{asInstanceName service.apiClassName}}Captor;
+    public {{service.apiClassName}}Captor {{asInstanceName service.apiClassName}}() {
+        return {{asInstanceName service.apiClassName}}Captor;
     }
 {{/each}}
 }
diff --git a/.../BackendApplicationDefaultGenerator/src/main/java/core/domain/common/DomainEvent.java.hbs b/.../BackendApplicationDefaultGenerator/src/main/java/core/domain/common/DomainEvent.java.hbs
@@ -20,9 +20,7 @@ public {{abstractClass event}} class {{event.className}} {{addExtends event}} im
     private static final long serialVersionUID = 1L;
 
 {{#each event.fields as |field|}}
-    {{#each field.validations as |validation|~}}
-        // @{{validation.name}}("{{validation.value}}")
-    {{~/each}}
+    {{{fieldValidationAnnotations field}}}
     private {{{fieldType field}}} {{field.name}};
 {{/each}}
 

diff --git a/...nerator/src/main/java/core/implementation/partials/jpa/aggregates-commands-methodBody.hbs b/...nerator/src/main/java/core/implementation/partials/jpa/aggregates-commands-methodBody.hbs
@@ -1 +1,39 @@
-// aggregates commands
+    {{{logMethodCall method}}}
+{{~#if (eq (size aggregateCommandsForMethod.aggregatesCommandsForMethod) 1)}}
+    {{~assign 'aggregateCommand' aggregateCommandsForMethod.aggregatesCommandsForMethod.0}}
+    {{~#if method.paramId}}
+    var {{asInstanceName aggregateCommand.aggregate.className}} = {{aggregateCommand.entity.instanceName}}Repository.find{{aggregateCommand.aggregate.className}}ById({{method.paramId}}).orElseThrow();
+    {{~else}}
+    var {{asInstanceName aggregateCommand.aggregate.className}} = new {{aggregateCommand.aggregate.className}}();
+    {{~/if}}
+    {{asInstanceName aggregateCommand.aggregate.className}}.{{aggregateCommand.command.name}}({{#if method.parameter}}input{{/if}});
+    persistAndEmitEvents({{asInstanceName aggregateCommand.aggregate.className}});
+    {{~#if method.returnType}}
+        {{~#if (eq aggregateCommand.aggregate.className method.returnType)}}
+    return {{asInstanceName aggregateCommand.aggregate.className}};
+        {{~else if (eq aggregateCommand.aggregate.aggregateRoot method.returnType)}}
+    return {{asInstanceName aggregateCommand.aggregate.className}}.getRootEntity();
+        {{~else}}
+    return {{asInstanceName service.name}}Mapper.as{{returnType}}({{asInstanceName aggregateCommand.aggregate.className}}.getRootEntity());
+        {{~/if}}
+    {{~/if}}
+{{~else}}
+{{~#each aggregateCommandsForMethod.aggregatesCommandsForMethod as |aggregateCommand| }}
+    {{~#if method.paramId}}
+    var {{asInstanceName aggregate.className}} = {{entity.instanceName}}Repository.find{{aggregate.className}}ById({{method.paramId}}).orElseThrow();
+    {{~else}}
+    var {{asInstanceName aggregate.className}} = new {{aggregate.className}}();
+    {{~/if}}
+    {{asInstanceName aggregate.className}}.{{command.name}}({{#if method.parameter}}input{{/if}});
+    persistAndEmitEvents({{asInstanceName aggregate.className}});
+{{~/each}}
+{{~#if method.returnType}}
+    {{~#if (eq aggregate.className method.returnType)}}
+    return {{asInstanceName aggregate.className}};
+    {{~else if (eq aggregate.aggregateRoot method.returnType)}}
+    return {{asInstanceName aggregate.className}}.getRootEntity();
+    {{~else}}
+    return null;
+    {{~/if}}
+{{~/if}}
+{{~/if}}
diff --git a/...ltGenerator/src/main/java/core/implementation/partials/jpa/aggregates-void-methodBody.hbs b/...ltGenerator/src/main/java/core/implementation/partials/jpa/aggregates-void-methodBody.hbs
@@ -1 +1,6 @@
+    {{{logMethodCall method}}}
 // void
+{{~#if method.returnType}}
+    return null;
+{{~/if}}
+
diff --git a/...aultGenerator/src/main/java/core/implementation/partials/jpa/entities-crud-methodBody.hbs b/...aultGenerator/src/main/java/core/implementation/partials/jpa/entities-crud-methodBody.hbs
@@ -1,4 +1,4 @@
-{{assign 'entity' aggregateCommandsForMethod.entity }}
+{{~assign 'entity' aggregateCommandsForMethod.entity }}
 {{~#if (isCrudMethod 'create' method=method entity=entity )}}
     log.debug("[CRUD] Request to save {{entity.className}}: {}", input);
     var {{entity.instanceName}} = {{asInstanceName service.name}}Mapper.update(new {{entity.className}}(), {{{mapperInputCallSignature method.parameter}}});

diff --git a/...ApplicationDefaultGenerator/src/main/java/core/implementation/partials/jpa/methodBody.hbs b/...ApplicationDefaultGenerator/src/main/java/core/implementation/partials/jpa/methodBody.hbs
@@ -1,2 +1,2 @@
-{{assign 'aggregateCommandsForMethod' (findAggregateCommandsForMethod method)}}
+{{~assign 'aggregateCommandsForMethod' (findAggregateCommandsForMethod method)}}
 {{~> (partial aggregateCommandsForMethod.templateFile)}}
diff --git a/...tor/src/main/java/core/implementation/partials/mongodb/aggregates-commands-methodBody.hbs b/...tor/src/main/java/core/implementation/partials/mongodb/aggregates-commands-methodBody.hbs
@@ -1,4 +1,5 @@
-{{#if (eq (size aggregateCommandsForMethod.aggregatesCommandsForMethod) 1)}}
+    {{{logMethodCall method}}}
+{{~#if (eq (size aggregateCommandsForMethod.aggregatesCommandsForMethod) 1)}}
     {{~assign 'aggregateCommand' aggregateCommandsForMethod.aggregatesCommandsForMethod.0}}
     {{~#if method.paramId}}
     var {{asInstanceName aggregateCommand.aggregate.className}} = {{aggregateCommand.entity.instanceName}}Repository.find{{aggregateCommand.aggregate.className}}ById({{method.paramId}}).orElseThrow();

diff --git a/...icationDefaultGenerator/src/main/java/core/implementation/partials/mongodb/methodBody.hbs b/...icationDefaultGenerator/src/main/java/core/implementation/partials/mongodb/methodBody.hbs
@@ -1,2 +1,2 @@
-{{assign 'aggregateCommandsForMethod' (findAggregateCommandsForMethod method)}}
+{{~assign 'aggregateCommandsForMethod' (findAggregateCommandsForMethod method)}}
 {{~> (partial aggregateCommandsForMethod.templateFile)}}
diff --git a/...s/BackendApplicationDefaultGenerator/src/test/java/config/ServicesInMemoryConfig.java.hbs b/...s/BackendApplicationDefaultGenerator/src/test/java/config/ServicesInMemoryConfig.java.hbs
@@ -68,6 +68,10 @@ public class ServicesInMemoryConfig extends RepositoriesInMemoryConfig {
 	}
 
 {{~#if (includeEmitEventsImplementation service)}}
+    public EventsProducerInMemoryContext getEventsProducerInMemoryContext() {
+        return eventsProducerInMemoryContext;
+    }
+
     private List<Object> publishedEvents = new ArrayList<>();
 
     public List<Object> getPublishedEvents() {

diff --git a/...s/BackendApplicationDefaultGenerator/src/test/java/config/TestDataLoader-mongodb.java.hbs b/...s/BackendApplicationDefaultGenerator/src/test/java/config/TestDataLoader-mongodb.java.hbs
@@ -28,6 +28,7 @@ public class TestDataLoader {
 
     public TestDataLoader(List<? extends Class<?>> mongoManagedTypes) {
         this.mongoManagedTypes = mongoManagedTypes;
+        mappingConverter = mappingConverter();
     }
 
     public <T> List<T> loadCollectionTestDataAsObjects(Class<T> collectionClass) {
@@ -67,7 +68,7 @@ public class TestDataLoader {
         return mappingConverter.read(type, org.bson.Document.parse(json));
     }
 
-    MappingMongoConverter mappingConverter = mappingConverter();
+    MappingMongoConverter mappingConverter;
 
     MappingMongoConverter mappingConverter() {
         MappingMongoConverter mappingConverter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mongoMappingContext());