eva4j 1.0.16 → 1.0.18

package/templates/aggregate/JpaAggregateRoot.java.ejs

@@ -68,9 +68,9 @@ if (audit && audit.trackUser) {
     private <%- field.javaTypeJpa %> <%= field.name %> = new ArrayList<>();
   <% } else { %>
     <% if (index === 0) { %>@Id
-    <% if (field.javaType === 'String') { %>@GeneratedValue(strategy = GenerationType.UUID)
+    <% if (!hasCreateLifecycle) { %><% if (field.javaType === 'String') { %>@GeneratedValue(strategy = GenerationType.UUID)
     <% } else if (field.javaType === 'Long' || field.javaType === 'Integer') { %>@GeneratedValue(strategy = GenerationType.IDENTITY)
-    <% } %><% } %><% if (field.annotations.length > 0) { %><% field.annotations.forEach(annotation => { %><%= annotation %>
+    <% } %><% } %><% } %><% if (field.annotations.length > 0) { %><% field.annotations.forEach(annotation => { %><%= annotation %>
     <% }); %><% } %><% if (field.isEmbedded || field.isValueObject) { %><% 
     // Find the Value Object definition to get its fields
     const vo = valueObjects && valueObjects.find(v => v.name === field.javaType);
@@ -87,7 +87,7 @@ if (audit && audit.trackUser) {
 <% }); %>
 <% relationships.forEach(rel => { %>
   <% if (rel.type === 'OneToMany') { %>
-    @OneToMany(mappedBy = "<%= rel.mappedBy %>", cascade = {<% rel.cascade.forEach((c, idx) => { %>CascadeType.<%= c %><%= idx < rel.cascade.length - 1 ? ', ' : '' %><% }); %>}, fetch = FetchType.<%= rel.fetch %>)
+    @OneToMany(mappedBy = "<%= rel.mappedBy %>", cascade = {<% rel.cascade.forEach((c, idx) => { %>CascadeType.<%= c %><%= idx < rel.cascade.length - 1 ? ', ' : '' %><% }); %>}, orphanRemoval = true, fetch = FetchType.<%= rel.fetch %>)
     @Builder.Default
     private <%- rel.javaTypeJpa %> <%= rel.fieldName %> = new ArrayList<>();
   <% } else if (rel.type === 'ManyToOne') { %>
@@ -96,7 +96,7 @@ if (audit && audit.trackUser) {
     private <%- rel.javaTypeJpa %> <%= rel.fieldName %>;
   <% } else if (rel.type === 'OneToOne') { %>
     <% if (rel.mappedBy) { %>
-    @OneToOne(mappedBy = "<%= rel.mappedBy %>", cascade = {<% rel.cascade.forEach((c, idx) => { %>CascadeType.<%= c %><%= idx < rel.cascade.length - 1 ? ', ' : '' %><% }); %>}, fetch = FetchType.<%= rel.fetch %>)
+    @OneToOne(mappedBy = "<%= rel.mappedBy %>", cascade = {<% rel.cascade.forEach((c, idx) => { %>CascadeType.<%= c %><%= idx < rel.cascade.length - 1 ? ', ' : '' %><% }); %>}, orphanRemoval = true, fetch = FetchType.<%= rel.fetch %>)
     <% } else { %>
     @OneToOne(cascade = {<% rel.cascade.forEach((c, idx) => { %>CascadeType.<%= c %><%= idx < rel.cascade.length - 1 ? ', ' : '' %><% }); %>}, fetch = FetchType.<%= rel.fetch %>)
     @JoinColumn(name = "<%= rel.joinColumn %>")

package/templates/aggregate/JpaEntity.java.ejs

@@ -91,7 +91,7 @@ if (audit && audit.trackUser) {
 <% }); %>
 <% relationships.forEach(rel => { %>
   <% if (rel.type === 'OneToMany') { %>
-    @OneToMany(mappedBy = "<%= rel.mappedBy %>", cascade = {<% rel.cascade.forEach((c, idx) => { %>CascadeType.<%= c %><%= idx < rel.cascade.length - 1 ? ', ' : '' %><% }); %>}, fetch = FetchType.<%= rel.fetch %>)
+    @OneToMany(mappedBy = "<%= rel.mappedBy %>", cascade = {<% rel.cascade.forEach((c, idx) => { %>CascadeType.<%= c %><%= idx < rel.cascade.length - 1 ? ', ' : '' %><% }); %>}, orphanRemoval = true, fetch = FetchType.<%= rel.fetch %>)
     @Builder.Default
     private <%- rel.javaTypeJpa %> <%= rel.fieldName %> = new ArrayList<>();
   <% } else if (rel.type === 'ManyToOne') { %>
@@ -100,7 +100,7 @@ if (audit && audit.trackUser) {
     private <%- rel.javaTypeJpa %> <%= rel.fieldName %>;
   <% } else if (rel.type === 'OneToOne') { %>
     <% if (rel.mappedBy) { %>
-    @OneToOne(mappedBy = "<%= rel.mappedBy %>", cascade = {<% rel.cascade.forEach((c, idx) => { %>CascadeType.<%= c %><%= idx < rel.cascade.length - 1 ? ', ' : '' %><% }); %>}, fetch = FetchType.<%= rel.fetch %>)
+    @OneToOne(mappedBy = "<%= rel.mappedBy %>", cascade = {<% rel.cascade.forEach((c, idx) => { %>CascadeType.<%= c %><%= idx < rel.cascade.length - 1 ? ', ' : '' %><% }); %>}, orphanRemoval = true, fetch = FetchType.<%= rel.fetch %>)
     <% } else { %>
     @OneToOne(cascade = {<% rel.cascade.forEach((c, idx) => { %>CascadeType.<%= c %><%= idx < rel.cascade.length - 1 ? ', ' : '' %><% }); %>}, fetch = FetchType.<%= rel.fetch %>)
     @JoinColumn(name = "<%= rel.joinColumn %>")

package/templates/base/docker/rabbitmq-services.yaml.ejs

@@ -0,0 +1,12 @@
+  rabbitmq:
+    image: rabbitmq:<%= rabbitmqVersion %>
+    container_name: <%= artifactId %>-rabbitmq
+    ports:
+      - "5672:5672"       # AMQP protocol
+      - "15672:15672"     # Management UI
+    environment:
+      RABBITMQ_DEFAULT_USER: guest
+      RABBITMQ_DEFAULT_PASS: guest
+      RABBITMQ_DEFAULT_VHOST: /
+    networks:
+      - <%= artifactId %>-network

package/templates/base/resources/parameters/develop/kafka.yaml.ejs

@@ -24,3 +24,8 @@ spring:
       retry:
         max-attempts: 2
         backoff-delay: 1500
+
+kafka:
+  topic-defaults:
+    partitions: 3
+    replicas: 1

package/templates/base/resources/parameters/develop/rabbitmq.yaml.ejs

@@ -0,0 +1,15 @@
+spring:
+  rabbitmq:
+    host: localhost
+    port: 5672
+    username: guest
+    password: guest
+    virtual-host: /
+    listener:
+      simple:
+        acknowledge-mode: manual
+        concurrency: 3
+        retry:
+          enabled: true
+          max-attempts: 3
+          initial-interval: 1500

package/templates/base/resources/parameters/develop/temporal.yaml.ejs

@@ -1,9 +1,6 @@
 temporal:
   service-url: localhost:7233
   namespace: default
-  flow-queue: WORKFLOW_QUEUE
   number-flow-worker: 10
-  heavy-queue: HEAVY_TASK_QUEUE
   number-heavy-worker: 10
-  light-queue: LIGHT_TASK_QUEUE
   number-light-worker: 10

package/templates/base/resources/parameters/local/kafka.yaml.ejs

@@ -24,3 +24,8 @@ spring:
       retry:
         max-attempts: 2
         backoff-delay: 1500
+
+kafka:
+  topic-defaults:
+    partitions: 3
+    replicas: 1

package/templates/base/resources/parameters/local/rabbitmq.yaml.ejs

@@ -0,0 +1,15 @@
+spring:
+  rabbitmq:
+    host: localhost
+    port: 5672
+    username: guest
+    password: guest
+    virtual-host: /
+    listener:
+      simple:
+        acknowledge-mode: manual
+        concurrency: 3
+        retry:
+          enabled: true
+          max-attempts: 3
+          initial-interval: 1500

package/templates/base/resources/parameters/local/temporal.yaml.ejs

@@ -1,9 +1,6 @@
 temporal:
   service-url: localhost:7233
   namespace: default
-  flow-queue: WORKFLOW_QUEUE
   number-flow-worker: 10
-  heavy-queue: HEAVY_TASK_QUEUE
   number-heavy-worker: 10
-  light-queue: LIGHT_TASK_QUEUE
   number-light-worker: 10

package/templates/base/resources/parameters/production/kafka.yaml.ejs

@@ -1,26 +1,57 @@
 spring:
   kafka:
-    bootstrap-servers:
-      - localhost:9092 # Lista de brokers Kafka
+    bootstrap-servers: ${KAFKA_BOOTSTRAP_SERVERS}
     producer:
       properties:
         spring.json.add.type.headers: false
+        enable.idempotence: true
+        max.in.flight.requests.per.connection: 5
+        delivery.timeout.ms: 120000
+        request.timeout.ms: 30000
+        linger.ms: 5
+        batch.size: 32768
+        compression.type: snappy
       key-serializer: org.apache.kafka.common.serialization.StringSerializer
       value-serializer: org.springframework.kafka.support.serializer.JsonSerializer
-      retries: 3
+      acks: all
+      retries: 10
     consumer:
-      group-id: <%= projectName %>-api-group
+      group-id: ${spring.application.name}-group
       auto-offset-reset: earliest
       enable-auto-commit: false
       key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
       value-deserializer: org.springframework.kafka.support.serializer.JsonDeserializer
       properties:
-        spring.json.trusted.packages: "*"
+        spring.json.trusted.packages: "<%= packageName %>.**"
         spring.json.use.type.headers: false
         spring.json.value.default.type: <%= packageName %>.shared.infrastructure.eventEnvelope.EventEnvelope
+        max.poll.records: 50
+        max.poll.interval.ms: 300000
+        session.timeout.ms: 30000
+        heartbeat.interval.ms: 10000
+      fetch-min-size: 1
+      fetch-max-wait: 500
     listener:
       ack-mode: manual
-      concurrency: 3
+      concurrency: 5
       retry:
-        max-attempts: 2
-        backoff-delay: 1500
+        max-attempts: 5
+        backoff-delay: 2000
+        backoff-multiplier: 2.0
+        backoff-max-delay: 30000
+    # SSL/SASL — descomentar si el cluster lo requiere
+    # security:
+    #   protocol: SASL_SSL
+    # properties:
+    #   sasl.mechanism: PLAIN
+    #   sasl.jaas.config: >-
+    #     org.apache.kafka.common.security.plain.PlainLoginModule required
+    #     username="${KAFKA_USERNAME}"
+    #     password="${KAFKA_PASSWORD}";
+    #   ssl.truststore.location: ${KAFKA_TRUSTSTORE_LOCATION}
+    #   ssl.truststore.password: ${KAFKA_TRUSTSTORE_PASSWORD}
+
+kafka:
+  topic-defaults:
+    partitions: 3
+    replicas: 3

package/templates/base/resources/parameters/production/rabbitmq.yaml.ejs

@@ -0,0 +1,32 @@
+spring:
+  rabbitmq:
+    host: ${RABBITMQ_HOST}
+    port: ${RABBITMQ_PORT:5672}
+    username: ${RABBITMQ_USERNAME}
+    password: ${RABBITMQ_PASSWORD}
+    virtual-host: ${RABBITMQ_VHOST:/}
+    connection-timeout: 5000
+    requested-heartbeat: 60
+    channel-rpc-timeout: 10000
+    publisher-confirm-type: correlated
+    publisher-returns: true
+    ssl:
+      enabled: ${RABBITMQ_SSL_ENABLED:false}
+    cache:
+      channel:
+        size: 25
+    template:
+      mandatory: true
+    listener:
+      simple:
+        acknowledge-mode: manual
+        concurrency: 5
+        max-concurrency: 20
+        prefetch: 10
+        retry:
+          enabled: true
+          max-attempts: 5
+          initial-interval: 2000
+          multiplier: 2.0
+          max-interval: 30000
+          stateless: true

package/templates/base/resources/parameters/production/temporal.yaml.ejs

@@ -1,9 +1,6 @@
 temporal:
   service-url: localhost:7233
   namespace: default
-  flow-queue: WORKFLOW_QUEUE
   number-flow-worker: 10
-  heavy-queue: HEAVY_TASK_QUEUE
   number-heavy-worker: 10
-  light-queue: LIGHT_TASK_QUEUE
   number-light-worker: 10

package/templates/base/resources/parameters/test/kafka.yaml.ejs

@@ -1,15 +1,15 @@
 spring:
   kafka:
     bootstrap-servers:
-      - localhost:9092 # Lista de brokers Kafka
+      - localhost:9092
     producer:
       properties:
         spring.json.add.type.headers: false
       key-serializer: org.apache.kafka.common.serialization.StringSerializer
       value-serializer: org.springframework.kafka.support.serializer.JsonSerializer
-      retries: 3
+      retries: 1
     consumer:
-      group-id: <%= projectName %>-api-group
+      group-id: <%= projectName %>-test-group
       auto-offset-reset: earliest
       enable-auto-commit: false
       key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
@@ -18,9 +18,15 @@ spring:
         spring.json.trusted.packages: "*"
         spring.json.use.type.headers: false
         spring.json.value.default.type: <%= packageName %>.shared.infrastructure.eventEnvelope.EventEnvelope
+        max.poll.records: 10
     listener:
       ack-mode: manual
-      concurrency: 3
+      concurrency: 1
       retry:
-        max-attempts: 2
-        backoff-delay: 1500
+        max-attempts: 1
+        backoff-delay: 100
+
+kafka:
+  topic-defaults:
+    partitions: 1
+    replicas: 1

package/templates/base/resources/parameters/test/rabbitmq.yaml.ejs

@@ -0,0 +1,15 @@
+spring:
+  rabbitmq:
+    host: localhost
+    port: 5672
+    username: guest
+    password: guest
+    virtual-host: /
+    listener:
+      simple:
+        acknowledge-mode: manual
+        concurrency: 3
+        retry:
+          enabled: true
+          max-attempts: 3
+          initial-interval: 1500

package/templates/base/resources/parameters/test/temporal.yaml.ejs

@@ -1,9 +1,6 @@
 temporal:
   service-url: localhost:7233
   namespace: default
-  flow-queue: WORKFLOW_QUEUE
   number-flow-worker: 10
-  heavy-queue: HEAVY_TASK_QUEUE
   number-heavy-worker: 10
-  light-queue: LIGHT_TASK_QUEUE
   number-light-worker: 10

package/templates/base/root/AGENTS.md.ejs

@@ -722,7 +722,7 @@ public class OrderJpa {
     
     private LocalDateTime orderDate;
     
-    @OneToMany(mappedBy = "order", cascade = {...}, fetch = FetchType.LAZY)
+    @OneToMany(mappedBy = "order", cascade = {...}, orphanRemoval = true, fetch = FetchType.LAZY)
     private List<OrderItemJpa> items;
 }
 ```

package/templates/crud/DeleteCommandHandler.java.ejs

@@ -2,9 +2,20 @@ package <%= packageName %>.<%= moduleName %>.application.usecases;
 
 import <%= packageName %>.<%= moduleName %>.application.commands.Delete<%= aggregateName %>Command;
 import <%= packageName %>.<%= moduleName %>.domain.repositories.<%= aggregateName %>Repository;
-<% if (hasSoftDelete) { %>
+<% const _deleteLifecycleEvents = (lifecycleEventsMap || {}).delete || []; %>
+<% const _softDeleteLifecycleEvents2 = (lifecycleEventsMap || {}).softDelete || []; %>
+<% if (hasSoftDelete || _deleteLifecycleEvents.length > 0) { %>
 import <%= packageName %>.<%= moduleName %>.domain.models.entities.<%= aggregateName %>;
 <% } %>
+<% if (_deleteLifecycleEvents.length > 0) { %>
+import <%= packageName %>.shared.domain.DomainEvent;
+<% _deleteLifecycleEvents.forEach(function(evt) { %>
+import <%= packageName %>.<%= moduleName %>.domain.models.events.<%= evt.name %>;
+<% }); %>
+<% if (_deleteLifecycleEvents.some(function(evt) { return evt.needsLocalDateTime; })) { %>
+import java.time.LocalDateTime;
+<% } %>
+<% } %>
 import <%= packageName %>.shared.domain.annotations.ApplicationComponent;
 import <%= packageName %>.shared.domain.annotations.LogExceptions;
 import <%= packageName %>.shared.domain.customExceptions.NotFoundException;
@@ -33,6 +44,13 @@ public class Delete<%= aggregateName %>CommandHandler implements CommandHandler<
                 .orElseThrow(() -> new NotFoundException("<%= aggregateName %> not found with id: " + command.id()));
         entity.softDelete();
         repository.save(entity);
+<% } else if (_deleteLifecycleEvents.length > 0) { %>
+        <%= aggregateName %> entity = repository.findById(command.id())
+                .orElseThrow(() -> new NotFoundException("<%= aggregateName %> not found with id: " + command.id()));
+<% _deleteLifecycleEvents.forEach(function(evt) { %>
+        entity.raise(new <%= evt.name %>(<%= evt.resolvedArgs.join(', ') %>));
+<% }); %>
+        repository.delete(entity);
 <% } else { %>
         if (!repository.existsById(command.id())) {
             throw new NotFoundException("<%= aggregateName %> not found with id: " + command.id());

package/templates/crud/EndpointsController.java.ejs

@@ -147,7 +147,7 @@ public class <%= controllerName %> {
         useCaseMediator.dispatch(new <%= op.useCase %>Command(id<% if (op.classification && op.classification.entityFields && op.classification.entityFields.length > 0) { %>, <% op.classification.entityFields.forEach(function(f, idx) { %>command.<%= f.name %>()<% if (idx < op.classification.entityFields.length - 1) { %>, <% } %><% }); %><% } %>));
     }
 <%  } else if (op.classifiedType === 'subEntityRemove') { %>
-    public void <%= op.methodName %>(@PathVariable <%- op.idType %> id, @PathVariable String itemId) {
+    public void <%= op.methodName %>(@PathVariable <%- op.idType %> id, @PathVariable <%- op.classification.itemIdType %> itemId) {
         log.info("Handling <%= op.useCase %> for <%= aggregateName %> id: {}, itemId: {}", id, itemId);
         useCaseMediator.dispatch(new <%= op.useCase %>Command(id, itemId));
     }

package/templates/crud/ScaffoldCommand.java.ejs

@@ -7,6 +7,9 @@ import <%= packageName %>.shared.domain.interfaces.Command;
  * TODO: Add the fields required by this use case and remove the placeholder.
  */
 public record <%= useCaseName %>Command(
-        // TODO: Replace with actual command fields
-        String id
+<% if (hasPathVar) { -%>
+        <%- idType %> <%= pathVarName %>
+<% } else { -%>
+        // TODO: Add command fields if needed
+<% } -%>
 ) implements Command {}

package/templates/crud/ScaffoldCommandHandler.java.ejs

@@ -30,11 +30,13 @@ public class <%= useCaseName %>CommandHandler implements CommandHandler<<%= useC
     @LogExceptions
     public void handle(<%= useCaseName %>Command command) {
         // TODO: Implement business logic
+<% if (hasPathVar) { -%>
         // Example:
-        // <%= aggregateName %> entity = repository.findById(command.id())
+        // <%= aggregateName %> entity = repository.findById(command.<%= pathVarName %>())
         //         .orElseThrow(() -> new EntityNotFoundException("<%= aggregateName %> not found"));
         // entity.someBusinessMethod();
         // repository.save(entity);
+<% } -%>
 
         throw new UnsupportedOperationException("<%= useCaseName %> not yet implemented");
     }

package/templates/crud/ScaffoldQuery.java.ejs

@@ -8,6 +8,9 @@ import <%= packageName %>.shared.domain.interfaces.Query;
  * TODO: Add the parameters required by this query and adapt the return type if needed.
  */
 public record <%= useCaseName %>Query(
-        // TODO: Replace with actual query parameters
-        String id
+<% if (hasPathVar) { -%>
+        <%- idType %> <%= pathVarName %>
+<% } else { -%>
+        // TODO: Add query parameters if needed
+<% } -%>
 ) implements Query<<%= aggregateName %>ResponseDto> {}

package/templates/crud/ScaffoldQueryHandler.java.ejs

@@ -29,10 +29,12 @@ public class <%= useCaseName %>QueryHandler implements QueryHandler<<%= useCaseN
     @LogExceptions
     public <%= aggregateName %>ResponseDto handle(<%= useCaseName %>Query query) {
         // TODO: Implement query logic
+<% if (hasPathVar) { -%>
         // Example:
-        // return repository.findById(query.id())
+        // return repository.findById(query.<%= pathVarName %>())
         //         .map(mapper::toDto)
         //         .orElseThrow(() -> new EntityNotFoundException("<%= aggregateName %> not found"));
+<% } -%>
 
         throw new UnsupportedOperationException("<%= useCaseName %> not yet implemented");
     }

package/templates/crud/SubEntityRemoveCommand.java.ejs

@@ -6,4 +6,4 @@ import <%= packageName %>.shared.domain.interfaces.Command;
  * <%= useCaseName %>Command
  * Removes the <%= entityName %> identified by itemId from the <%= aggregateName %> aggregate.
  */
-public record <%= useCaseName %>Command(<%- idType %> id, String itemId) implements Command {}
+public record <%= useCaseName %>Command(<%- idType %> id, <%- itemIdType %> itemId) implements Command {}

package/templates/crud/UpdateCommandHandler.java.ejs

@@ -6,6 +6,7 @@ import <%= packageName %>.<%= moduleName %>.domain.repositories.<%= aggregateNam
 <% if ((commandFields || []).some(f => f.originalVoType)) { %>
 import <%= packageName %>.<%= moduleName %>.application.mappers.<%= aggregateName %>ApplicationMapper;
 <% } %>
+<% const _updateLifecycleEvents = (lifecycleEventsMap || {}).update || []; %>
 import <%= packageName %>.shared.domain.annotations.ApplicationComponent;
 import <%= packageName %>.shared.domain.annotations.LogExceptions;
 import <%= packageName %>.shared.domain.customExceptions.NotFoundException;
@@ -15,8 +16,13 @@ import org.springframework.transaction.annotation.Transactional;
 /**
  * Update<%= aggregateName %>CommandHandler — PATCH
  *
+<% if (_updateLifecycleEvents.length > 0) { %>
+ * Delegates field updates to the aggregate root's update() method,
+ * which raises domain events internally.
+<% } else { %>
  * Reconstructs the <%= aggregateName %> aggregate using the full constructor,
  * merging each command field with the existing entity value.
+<% } %>
  * Non-null command fields override the current value; null fields are preserved
  * from the loaded entity. No setters are required on the domain entity.
  */
@@ -52,12 +58,56 @@ public class Update<%= aggregateName %>CommandHandler implements CommandHandler<
     const cmdFieldMap = {};
     (commandFields || []).forEach(f => { cmdFieldMap[f.name] = f; });
 
+    function capitalize(s) { return s.charAt(0).toUpperCase() + s.slice(1); }
+
+    // Updatable fields: same filter as creationFields (exclude id, audit, deletedAt, readOnly, autoInit)
+    const updatableFields = (rootEntity.fields || []).filter(f =>
+      f.name !== 'id' && f.name !== 'createdAt' && f.name !== 'updatedAt' &&
+      f.name !== 'createdBy' && f.name !== 'updatedBy' && f.name !== 'deletedAt' && !f.readOnly && !f.autoInit
+    );
+%>
+<% if (_updateLifecycleEvents.length > 0) { %>
+        // Merge: use command value when non-null, otherwise preserve existing value.
+        // The aggregate root's update() method raises domain events internally.
+        existing.update(
+<% updatableFields.forEach((field, idx) => { %>
+<%   const cmdField = cmdFieldMap[field.name]; %>
+<%   const getter = `existing.get${capitalize(field.name)}()`; %>
+<%   const comma = idx < updatableFields.length - 1 ? ',' : ''; %>
+<%   if (cmdField && cmdField.originalVoType) { %>
+                command.<%= field.name %>() != null
+                        ? mapper.to<%= cmdField.originalVoType %>(command.<%= field.name %>())
+                        : <%= getter %><%= comma %>
+<%   } else if (cmdField) { %>
+                command.<%= field.name %>() != null ? command.<%= field.name %>() : <%= getter %><%= comma %>
+<%   } else { %>
+                <%= getter %><%= comma %> // preserved: <%= field.name %>
+<%   } %>
+<% }); %>
+        );
+<% if ((oneToManyRelationships || []).length > 0) { %>
+
+        // TODO: Collection relationships require an explicit replacement strategy.
+        //       Choose the right approach for your domain and uncomment:
+        //
+        //  Option A — Clear-and-replace (simple, loses existing entity ids):
+        //    existing.get<collection>().clear();
+        //    command.<collection>().forEach(dto -> entity.add<Item>(...));
+        //
+        //  Option B — Merge by id (preserves audit trail, more complex):
+        //    reconcile existing items against command items by id
+<% (oneToManyRelationships || []).forEach(rel => { %>
+        // if (command.<%= rel.fieldName %>() != null) { /* replace <%= rel.fieldName %> */ }
+<% }); %>
+<% } %>
+
+        repository.save(existing);
+<% } else { %>
+<%
     // oneToOneRelationships are non-collection non-inverse rels → appear in the full constructor
     const ctorRels = oneToOneRelationships || [];
     const totalArgs = (rootEntity.fields || []).length + ctorRels.length;
     let argIdx = 0;
-
-    function capitalize(s) { return s.charAt(0).toUpperCase() + s.slice(1); }
 %>
         // Merge: use command value when non-null, otherwise preserve existing value.
         // The full constructor is called so no setters are needed on the domain entity.
@@ -98,5 +148,6 @@ public class Update<%= aggregateName %>CommandHandler implements CommandHandler<
 <% } %>
 
         repository.save(updated);
+<% } %>
     }
 }