feat(core): enhancements in thing

Author: tsakostas

polygenesis-generators/polygenesis-generator-java/src/main/resources/ftl/polygenesis-implementation-java-apiimpl/macro-fill-argument-value-object.ftl

@@ -20,17 +20,16 @@
 <#macro fillArgumentValueObject property persistenceVariable requestDto multiTenant converterVariable>
 <#compress>
  <#if property.data.getAsDataObject().models?size == 1 >
- <#if property.data.getAsDataObject().models[0].primitiveType == 'STRING'>
- new ${ textConverter.toUpperCamel(property.data.objectName.text) }(${ requestDto.dataObject.variableName.text }.get${ textConverter.toUpperCamel(property.data.variableName.text) }())
- <#elseif property.data.getAsDataObject().models[0].primitiveType == 'DECIMAL'>
+ <#if property.data.getAsDataObject().models[0].primitiveType == 'STRING'
+ || property.data.getAsDataObject().models[0].primitiveType == 'DECIMAL'>
  new ${ textConverter.toUpperCamel(property.data.objectName.text) }(${ requestDto.dataObject.variableName.text }.get${ textConverter.toUpperCamel(property.data.variableName.text) }())
  <#elseif property.data.getAsDataObject().models[0].primitiveType == 'UUID'>
  new ${ textConverter.toUpperCamel(property.data.objectName.text) }(UUID.fromString(${ requestDto.dataObject.variableName.text }.get${ textConverter.toUpperCamel(property.data.variableName.text) }()))
  <#else>
-  null // TODO: ${property.data.getAsDataObject().models[0].primitiveType} is not supported yet
+ null // TODO: ${property.data.getAsDataObject().models[0].primitiveType} is not supported yet
  </#if>
  <#else>
-  null // TODO: value object '${ property.data.getAsDataObject().objectName.text }' has more than one fields
+ ${converterVariable}.convertTo${ textConverter.toUpperCamel(property.data.objectName.text) }Vo(${ requestDto.dataObject.variableName.text }.get${ textConverter.toUpperCamel(property.data.variableName.text) }())
  </#if>
 </#compress>
 </#macro>

polygenesis-generators/polygenesis-generator-java/src/main/resources/ftl/polygenesis-implementation-java-apiimpl/macro-fill-arguments.ftl

@@ -33,11 +33,13 @@
  <#case 'AGGREGATE_ROOT_ID'>
  <#if multiTenant>
 <#-- ${ persistenceVariable }.nextId(UUID.fromString(${ requestDto.dataObject.variableName.text }.getTenantId()))<#sep>,</#sep>-->
- ${ persistenceVariable }.nextId()<#sep>,</#sep>
+ ${ requestDto.dataObject.variableName.text }.get${ textConverter.toUpperCamel(property.data.variableName.text) }() == null ? ${ persistenceVariable }.nextId() : new ${ textConverter.toUpperCamel(property.data.variableName.text) }(UUID.fromString(${ requestDto.dataObject.variableName.text }.get${ textConverter.toUpperCamel(property.data.variableName.text) }()))<#sep>,</#sep>
  <#else>
  ${ requestDto.dataObject.variableName.text }.get${ textConverter.toUpperCamel(property.data.variableName.text) }() == null ? ${ persistenceVariable }.nextId() : new ${ textConverter.toUpperCamel(property.data.variableName.text) }(UUID.fromString(${ requestDto.dataObject.variableName.text }.get${ textConverter.toUpperCamel(property.data.variableName.text) }()))<#sep>,</#sep>
  </#if>
  <#break>
+ <#case 'AGGREGATE_ENTITY_ID'>
+ <#break>
  <#case 'PROJECTION_ID'>
  <#if multiTenant>
  <#-- ${ persistenceVariable }.nextId(UUID.fromString(${ requestDto.dataObject.variableName.text }.getTenantId()))<#sep>,</#sep>-->