Skip to content
Snippets Groups Projects
Commit 2df7b2cc authored by OZGCloud's avatar OZGCloud
Browse files

OZG-1523 OZG-2524 createdByName aus Kommentar entfernt

parent adde3526
Branches
No related tags found
No related merge requests found
...@@ -38,8 +38,6 @@ public class Kommentar implements CommandBody { ...@@ -38,8 +38,6 @@ public class Kommentar implements CommandBody {
@LinkedResource(controllerClass = UserProfileController.class) @LinkedResource(controllerClass = UserProfileController.class)
private String createdBy; private String createdBy;
@JsonProperty(access = Access.READ_ONLY) @JsonProperty(access = Access.READ_ONLY)
private String createdByName;
@JsonProperty(access = Access.READ_ONLY)
private ZonedDateTime createdAt; private ZonedDateTime createdAt;
@NotNull(message = FIELD_IS_EMPTY) @NotNull(message = FIELD_IS_EMPTY)
......
...@@ -10,9 +10,7 @@ import org.mapstruct.NullValueCheckStrategy; ...@@ -10,9 +10,7 @@ import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.ReportingPolicy; import org.mapstruct.ReportingPolicy;
import org.mapstruct.ValueMapping; import org.mapstruct.ValueMapping;
import de.itvsh.goofy.common.IgnoreGrpcFields;
import de.itvsh.ozg.pluto.grpc.command.GrpcCommand; import de.itvsh.ozg.pluto.grpc.command.GrpcCommand;
import de.itvsh.ozg.pluto.kommentar.GrpcKommentar;
@Mapper(unmappedTargetPolicy = ReportingPolicy.ERROR, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) @Mapper(unmappedTargetPolicy = ReportingPolicy.ERROR, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface KommentarMapper { public interface KommentarMapper {
...@@ -23,13 +21,6 @@ public interface KommentarMapper { ...@@ -23,13 +21,6 @@ public interface KommentarMapper {
static final String CREATED_AT = "createdAt"; static final String CREATED_AT = "createdAt";
static final String VORGANG_ID = "vorgangId"; static final String VORGANG_ID = "vorgangId";
@Mapping(target = "textBytes", ignore = true)
@IgnoreGrpcFields
GrpcKommentar toGrpcKommentar(Kommentar kommentar);
@Mapping(target = "vorgangId", ignore = true)
Kommentar toKommentar(GrpcKommentar grpcKommentar);
@Mapping(target = "kommentar", ignore = true) @Mapping(target = "kommentar", ignore = true)
@ValueMapping(source = "UNRECOGNIZED", target = MappingConstants.NULL) @ValueMapping(source = "UNRECOGNIZED", target = MappingConstants.NULL)
@ValueMapping(source = "UNDEFINED", target = MappingConstants.NULL) @ValueMapping(source = "UNDEFINED", target = MappingConstants.NULL)
......
package de.itvsh.goofy.kommentar;
import de.itvsh.ozg.pluto.kommentar.GrpcKommentar;
@Deprecated
public class GrpcKommentarTestFactory {
final static String ID = KommentarTestFactory.ID;
final static String CREATED_BY = KommentarTestFactory.CREATED_BY;
final static String CREATED_BY_NAME = KommentarTestFactory.CREATED_BY_NAME;
final static String CREATED_AT_STR = KommentarTestFactory.CREATED_AT_STR;
final static String TEXT = KommentarTestFactory.TEXT;
public static GrpcKommentar create() {
return createBuilder().build();
}
public static GrpcKommentar.Builder createBuilder() {
return GrpcKommentar.newBuilder()
.setId(ID)
.setCreatedBy(CREATED_BY)
.setCreatedByName(CREATED_BY_NAME)
.setCreatedAt(CREATED_AT_STR)
.setText(TEXT);
}
}
...@@ -2,7 +2,6 @@ package de.itvsh.goofy.kommentar; ...@@ -2,7 +2,6 @@ package de.itvsh.goofy.kommentar;
import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Assertions.*;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
...@@ -53,45 +52,4 @@ class KommentarMapperTest { ...@@ -53,45 +52,4 @@ class KommentarMapperTest {
private Kommentar map() { private Kommentar map() {
return mapper.fromItemMap(KommentarTestFactory.createAsMap()); return mapper.fromItemMap(KommentarTestFactory.createAsMap());
} }
@Nested
@Deprecated
@Disabled
class TestFromGrpc {
@Test
void shouldMap() {
var kommentar = mapper.toKommentar(GrpcKommentarTestFactory.create());
assertThat(kommentar).isNotNull().usingRecursiveComparison().isEqualTo(KommentarTestFactory.create());
}
@Test
void shouldHandleNull() {
var grpcKommentar = mapper.toKommentar(null);
assertThat(grpcKommentar).isNull();
}
}
@Nested
@Deprecated
@Disabled
class TestToGrpc {
@Test
void shouldMap() {
var grpcKommentar = mapper.toGrpcKommentar(KommentarTestFactory.createBuilder().id(null).build());
assertThat(grpcKommentar).isNotNull().usingRecursiveComparison().ignoringFields("id_", "memoizedHashCode")
.isEqualTo(GrpcKommentarTestFactory.create());
}
@Test
void shouldHandleNull() {
var grpcKommentar = mapper.toGrpcKommentar(null);
assertThat(grpcKommentar).isNull();
}
}
} }
...@@ -17,7 +17,6 @@ public class KommentarTestFactory { ...@@ -17,7 +17,6 @@ public class KommentarTestFactory {
public static final String ID = UUID.randomUUID().toString(); public static final String ID = UUID.randomUUID().toString();
public static final String CREATED_BY = UserProfileTestFactory.ID.toString(); public static final String CREATED_BY = UserProfileTestFactory.ID.toString();
public static final String CREATED_BY_NAME = lorem.getName();
public static final String CREATED_AT_STR = "2021-01-10T10:30:00Z"; public static final String CREATED_AT_STR = "2021-01-10T10:30:00Z";
public static final ZonedDateTime CREATED_AT = ZonedDateTime.parse(CREATED_AT_STR); public static final ZonedDateTime CREATED_AT = ZonedDateTime.parse(CREATED_AT_STR);
...@@ -34,7 +33,6 @@ public class KommentarTestFactory { ...@@ -34,7 +33,6 @@ public class KommentarTestFactory {
.id(ID) .id(ID)
.text(TEXT) .text(TEXT)
.createdBy(CREATED_BY) .createdBy(CREATED_BY)
.createdByName(CREATED_BY_NAME)
.createdAt(CREATED_AT) .createdAt(CREATED_AT)
.vorgangId(VORGANG_ID); .vorgangId(VORGANG_ID);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment