OZG-5139 map created resource

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

@@ -43,4 +43,6 @@ public class OzgCloudCommand {
 	private Map<String, String> body;
 
 	private String errorMessage;
+
+	private String createdResource;
 }

api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/CommandMapperTest.java

@@ -23,4 +23,15 @@ class CommandMapperTest {
 		}
 	}
 
+	@Nested
+	class TestMapFromGrpc {
+
+		@Test
+		void shouldMap() {
+			var result = mapper.fromGrpc(GrpcCommandTestFactory.create());
+
+			assertThat(result).usingRecursiveComparison().ignoringFields("relationVersion").isEqualTo(OzgCloudCommandTestFactory.create());
+		}
+	}
+
 }

api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcCommandTestFactory.java

 package de.ozgcloud.apilib.common.command.grpc;
 
+import de.ozgcloud.vorgang.common.GrpcObject;
+import de.ozgcloud.vorgang.common.GrpcProperty;
 import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
 
 public class GrpcCommandTestFactory {
 
+	public static final GrpcObject BODY_OBJECT = GrpcObject.newBuilder()
+		.addProperty(GrpcProperty.newBuilder()
+			.setName(OzgCloudCommandTestFactory.BODY_FIELD_NAME).addValue(OzgCloudCommandTestFactory.BODY_FIELD_VALUE))
+		.build();
+
 	public static GrpcCommand create() {
 		return createBuilder().build();
 	}
 
 	public static GrpcCommand.Builder createBuilder() {
-		return GrpcCommand.newBuilder();
+		return GrpcCommand.newBuilder()
+			.setId(OzgCloudCommandTestFactory.ID.toString())
+			.setVorgangId(OzgCloudCommandTestFactory.VORGANG_ID.toString())
+			.setCreatedAt(OzgCloudCommandTestFactory.CREATED_AT_STR)
+			.setFinishedAt(OzgCloudCommandTestFactory.FINISHED_AT_STR)
+			.setCreatedBy(OzgCloudCommandTestFactory.CREATED_BY.toString())
+			.setCreatedByName(OzgCloudCommandTestFactory.CREATED_BY_NAME)
+			.setStatus(OzgCloudCommandTestFactory.STATUS.toString())
+			.setErrorMessage(OzgCloudCommandTestFactory.ERROR_MESSAGE)
+			.setRelationId(OzgCloudCommandTestFactory.RELATION_ID.toString())
+			.setBodyObj(BODY_OBJECT)
+			.setOrderString(OzgCloudCommandTestFactory.ORDER)
+			.setCreatedResource(OzgCloudCommandTestFactory.CREATED_RESOURCE);
 	}
 }

api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/OzgCloudCommandTestFactory.java

@@ -8,6 +8,7 @@ import de.ozgcloud.apilib.common.command.OzgCloudCommand;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandId;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandStatus;
 import de.ozgcloud.apilib.file.OzgCloudFileTestFactory;
+import de.ozgcloud.apilib.user.OzgCloudUserId;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
 import de.ozgcloud.common.datatype.StringBasedValue;
@@ -23,14 +24,18 @@ public class OzgCloudCommandTestFactory {
 	public static final String ORDER = "CREATE_NOTE";
 	public static final OzgCloudCommandStatus STATUS = OzgCloudCommandStatus.FINISHED;
 
-	private static final String CREATED_AT_STR = "2023-08-18T13:54:10Z";
-	private static final ZonedDateTime CREATED_AT = ZonedDateTime.parse(CREATED_AT_STR);
-	private static final String FINISHED_AT_STR = "2023-08-18T13:55:10Z";
-	private static final ZonedDateTime FINISHED_AT = ZonedDateTime.parse(FINISHED_AT_STR);
+	public static final String CREATED_AT_STR = "2023-08-18T13:54:10Z";
+	public static final ZonedDateTime CREATED_AT = ZonedDateTime.parse(CREATED_AT_STR);
+	public static final String FINISHED_AT_STR = "2023-08-18T13:55:10Z";
+	public static final ZonedDateTime FINISHED_AT = ZonedDateTime.parse(FINISHED_AT_STR);
 
 	public static final String BODY_FIELD_NAME = "FIELD";
-	public static final Long BODY_FIELD_VALUE = 42L;
+	public static final String BODY_FIELD_VALUE = "42";
 	private static final Map<String, Object> BODY = Map.of(BODY_FIELD_NAME, BODY_FIELD_VALUE);
+	public static final String CREATED_RESOURCE = UUID.randomUUID().toString();
+	public static final OzgCloudUserId CREATED_BY = OzgCloudUserId.from(UUID.randomUUID().toString());
+	public static final String CREATED_BY_NAME = "Dorothea Dow";
+	public static final String ERROR_MESSAGE = "An error occurred";
 
 	public static OzgCloudCommand create() {
 		return createBuilder().build();
@@ -46,6 +51,9 @@ public class OzgCloudCommandTestFactory {
 				.status(STATUS)
 				.createdAt(CREATED_AT)
 				.finishedAt(FINISHED_AT)
-				.bodyObject(BODY);
+				.bodyObject(BODY)
+				.createdResource(CREATED_RESOURCE)
+				.createdBy(CREATED_BY)
+				.errorMessage(ERROR_MESSAGE);
 	}
 }