Merge pull request 'OZG-5093 CREATE_BESCHEID ausführen' (#7) from...

Merge pull request 'OZG-5093 CREATE_BESCHEID ausführen' (#7) from OZG-5093-CREATE_BESCHEID-ausfuehren into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-lib/api-lib/pulls/7


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/grpc/CommandMapper.java

 package de.ozgcloud.apilib.common.command.grpc;
 
+import java.time.ZonedDateTime;
+
+import org.apache.commons.lang3.StringUtils;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Named;
@@ -48,8 +51,14 @@ public interface CommandMapper {
 	@Mapping(target = "relationVersion", ignore = true)
 	@Mapping(target = "relationId", qualifiedByName = "mapRelationId")
 	@Mapping(target = "body", ignore = true)
+	@Mapping(target = "createdAt", expression = "java(mapToZonedDateTime(command.getCreatedAt()))")
+	@Mapping(target = "finishedAt", expression = "java(mapToZonedDateTime(command.getFinishedAt()))")
 	OzgCloudCommand fromGrpc(GrpcCommand command);
 
+	default ZonedDateTime mapToZonedDateTime(String value) {
+		return StringUtils.isEmpty(value) ? null : ZonedDateTime.parse(value);
+	}
+
 	@Named("mapRelationId")
 	default StringBasedValue mapRelationId(String relationId) {
 		return GenericId.from(relationId);