eva4j 1.0.17 → 1.0.18

package/templates/aggregate/DomainEventHandler.java.ejs

@@ -3,67 +3,161 @@ package <%= packageName %>.<%= moduleName %>.application.usecases;
 import <%= packageName %>.shared.domain.annotations.ApplicationComponent;
 import org.springframework.transaction.event.TransactionPhase;
 import org.springframework.transaction.event.TransactionalEventListener;
-<% domainEvents.forEach(event => { %>
+<% domainEvents.forEach(event => { -%>
 import <%= packageName %>.<%= moduleName %>.domain.models.events.<%= event.name %>;
-<% }); %>
-<% if (broker) { %>
-<% domainEvents.forEach(event => { %>
+<% }); -%>
+<% if (broker) { -%>
+<% domainEvents.forEach(event => { -%>
 import <%= packageName %>.<%= moduleName %>.application.events.<%= event.integrationEventClassName %>;
-<% }); %>
+<% }); -%>
 import <%= packageName %>.<%= moduleName %>.application.ports.MessageBroker;
-<% } %>
+<% } -%>
+<%
+  // Collect unique workflow flowPascal names from events with notifies (Temporal bridge)
+  // flowPascal = workflow name with "Workflow" suffix stripped (e.g. PlaceOrderWorkflow → PlaceOrder)
+  // The generated service class is {flowPascal}WorkFlowService (e.g. PlaceOrderWorkFlowService)
+  const _flowPascalSet = new Set();
+  const _inputClassSet = new Set();
+  let _needsLocalDateTimeImport = false;
+  if (typeof temporal !== 'undefined' && temporal) {
+    domainEvents.forEach(event => {
+      const _evFieldNames = new Set((event.fields || []).map(f => f.name));
+      const _aggrIdWf = aggregateName.charAt(0).toLowerCase() + aggregateName.slice(1) + 'Id';
+      (event.notifies || []).forEach(n => {
+        if (n.workflow && n.flowPascal) _flowPascalSet.add(n.flowPascal);
+        if (n.inputFields && n.inputFields.length > 0 && n.flowPascal) {
+          _inputClassSet.add(n.flowPascal + 'Input');
+          // Check if any unresolvable field uses LocalDateTime.now()
+          n.inputFields.forEach(f => {
+            if (f.name !== _aggrIdWf && !_evFieldNames.has(f.name)
+                && f.name.endsWith('At') && f.javaType === 'LocalDateTime') {
+              _needsLocalDateTimeImport = true;
+            }
+          });
+        }
+      });
+    });
+  }
+  const _flowPascals = Array.from(_flowPascalSet);
+  const _hasTemporalBridge = _flowPascals.length > 0;
+-%>
+<% if (_hasTemporalBridge) { -%>
+<% if (_needsLocalDateTimeImport) { -%>
+import java.time.LocalDateTime;
+<% } -%>
+<% _flowPascals.forEach(fp => { -%>
+import <%= packageName %>.<%= moduleName %>.application.usecases.<%= fp %>WorkFlowService;
+<% }); -%>
+<% _inputClassSet.forEach(cls => { -%>
+import <%= packageName %>.<%= moduleName %>.application.usecases.<%= cls %>;
+<% }); -%>
+<% } -%>
 
 /**
  * <%= aggregateName %>DomainEventHandler — Domain Event Bridge
  *
- * Connects the internal Spring event bus (ApplicationEventPublisher) with the
- * external messaging port (MessageBroker).
+ * Connects the internal Spring event bus (ApplicationEventPublisher) with<% if (broker && _hasTemporalBridge) { %>
+ * the external messaging port (MessageBroker) and Temporal workflow orchestration.<% } else if (broker) { %>
+ * the external messaging port (MessageBroker).<% } else if (_hasTemporalBridge) { %>
+ * the Temporal workflow orchestration layer.<% } else { %>
+ * external side effects.<% } %>
  *
  * Architecture:
  *   AggregateRepositoryImpl.save()
  *     → eventPublisher.publishEvent(domainEvent)        [internal Spring bus]
  *       → @TransactionalEventListener(AFTER_COMMIT)     [this class]
+<% if (broker) { -%>
  *         → messageBroker.publish*(integrationEvent)    [port — broker-agnostic]
+<% } -%>
+<% if (_hasTemporalBridge) { -%>
+ *         → workFlowService.startAsync(workflowId)     [Temporal workflow launch]
+<% } -%>
  *
  * AFTER_COMMIT guarantees that external events are published only when the
  * database transaction committed successfully, preventing ghost events from
  * rolled-back operations.
  *
  * Domain Events  (domain/models/events/)  — internal signals scoped to this bounded context.
+<% if (broker) { -%>
  * Integration Events (application/events/) — broker-facing projections; changing broker
  *   technology (Kafka → RabbitMQ → SNS) only requires changing the MessageBroker adapter.
  *   Domain Events — and therefore this class — never need modification.
+<% } -%>
  */
 @ApplicationComponent
 public class <%= aggregateName %>DomainEventHandler {
-<% if (broker) { %>
-
-    private final MessageBroker messageBroker;
-
-    public <%= aggregateName %>DomainEventHandler(MessageBroker messageBroker) {
-        this.messageBroker = messageBroker;
+<%
+  // Determine constructor dependencies
+  const _deps = [];
+  if (broker)              _deps.push({ type: 'MessageBroker', name: 'messageBroker' });
+  _flowPascals.forEach(fp => {
+    const svcType = fp + 'WorkFlowService';
+    const svcName = fp.charAt(0).toLowerCase() + fp.slice(1) + 'WorkFlowService';
+    _deps.push({ type: svcType, name: svcName });
+  });
+-%>
+<% if (_deps.length > 0) { %>
+<% _deps.forEach(dep => { -%>
+    private final <%= dep.type %> <%= dep.name %>;
+<% }); %>
+    public <%= aggregateName %>DomainEventHandler(<%= _deps.map(d => d.type + ' ' + d.name).join(', ') %>) {
+<% _deps.forEach(dep => { -%>
+        this.<%= dep.name %> = <%= dep.name %>;
+<% }); -%>
     }
-<% } %>
-<% domainEvents.forEach(event => { %>
+<% } -%>
+<% domainEvents.forEach(event => {
+    const _eventNotifies = (typeof temporal !== 'undefined' && temporal)
+      ? (event.notifies || []).filter(n => n.workflow)
+      : [];
+    const _hasBrokerAction = !!broker;
+    const _hasWorkflowAction = _eventNotifies.length > 0;
+-%>
 
     /**
-     * Handles {@link <%= event.name %>} after the wrapping transaction commits.<% if (!broker) { %>
+     * Handles {@link <%= event.name %>} after the wrapping transaction commits.<% if (!_hasBrokerAction && !_hasWorkflowAction) { %>
      * <p>
      * TODO: Implement the side effect for this event (e.g., send notification,
      *       update a read model, trigger a saga step, etc.).<% } %>
      */
     @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
     public void on<%= event.name %>(<%= event.name %> event) {
-    <% if (broker) { %>
-        <%
+<% if (_hasBrokerAction) {
           const _aggrIdField = aggregateName.charAt(0).toLowerCase() + aggregateName.slice(1) + 'Id';
-        %>
+-%>
         messageBroker.publish<%= event.integrationEventClassName %>(new <%= event.integrationEventClassName %>(<% if (event.fields && event.fields.length > 0) { event.fields.forEach(function(field, idx) { %><%= field.name === _aggrIdField ? 'event.getAggregateId()' : 'event.get' + field.name.charAt(0).toUpperCase() + field.name.slice(1) + '()' %><%= idx < event.fields.length - 1 ? ', ' : '' %><% }); } %>));
-    <% } else { %>
+<% } -%>
+<% if (_hasWorkflowAction) { _eventNotifies.forEach(n => {
+          const _svcName = n.flowPascal.charAt(0).toLowerCase() + n.flowPascal.slice(1) + 'WorkFlowService';
+          const _aggrIdFieldWf = aggregateName.charAt(0).toLowerCase() + aggregateName.slice(1) + 'Id';
+          const _eventFieldNames = new Set((event.fields || []).map(f => f.name));
+          const _hasTypedInput = n.inputFields && n.inputFields.length > 0;
+-%>
+<% if (_hasTypedInput) { -%>
+        <%= _svcName %>.startAsync(
+            event.getAggregateId(),
+            new <%= n.flowPascal %>Input(<% n.inputFields.forEach(function(inputF, idx) {
+              let _arg;
+              if (inputF.name === _aggrIdFieldWf) {
+                _arg = 'event.getAggregateId()';
+              } else if (_eventFieldNames.has(inputF.name)) {
+                _arg = 'event.get' + inputF.name.charAt(0).toUpperCase() + inputF.name.slice(1) + '()';
+              } else if (inputF.name.endsWith('At') && inputF.javaType === 'LocalDateTime') {
+                _arg = 'LocalDateTime.now()';
+              } else {
+                _arg = 'null /* TODO: provide ' + inputF.name + ' */';
+              }
+%><%= idx > 0 ? ', ' : '' %><%= _arg %><% }); %>)
+        );
+<% } else { -%>
+        <%= _svcName %>.startAsync(event.getAggregateId());
+<% } -%>
+<% }); } -%>
+<% if (!_hasBrokerAction && !_hasWorkflowAction) { -%>
         // TODO: handle <%= event.name %> — add your side-effect logic here
         //   e.g.:  notificationService.notify(event);
         //          readModelUpdater.on(event);
-    <% } %>
+<% } -%>
     }
 <% }); %>
 }

package/templates/aggregate/JpaAggregateRoot.java.ejs

@@ -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/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 {}