Skip to content
Snippets Groups Projects
Commit 0ebe19d3 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-297 add attachments to wiedervorlage

parent 6606e44c
No related branches found
No related tags found
No related merge requests found
......@@ -9,11 +9,16 @@ option java_outer_classname = "WiedervorlageModelProto";
message GrpcWiedervorlage {
string id = 1;
int64 version = 2;
string createdAt = 5;
string createdBy = 8;
string createdByName = 9;
bool done = 3;
string frist = 4;
string createdAt = 5;
string betreff = 6;
string beschreibung = 7;
string createdBy = 8;
string createdByName = 9;
repeated string attachments = 10;
}
\ No newline at end of file
......@@ -2,12 +2,15 @@ package de.itvsh.ozg.pluto.command;
import java.time.LocalDate;
import java.time.ZonedDateTime;
import java.util.List;
import org.springframework.data.annotation.CreatedBy;
import de.itvsh.ozg.pluto.files.FileId;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.Singular;
import lombok.ToString;
@Getter
......@@ -19,12 +22,17 @@ public class Wiedervorlage {
private String id;
private String vorgangId;
private long vorgangVersion;
private ZonedDateTime createdAt;
@CreatedBy
private String createdBy;
private String createdByName;
private String betreff;
private String beschreibung;
private LocalDate frist;
private boolean done;
@Singular
private List<FileId> attachments;
}
......@@ -4,28 +4,47 @@ import java.util.List;
import org.mapstruct.CollectionMappingStrategy;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.NullValuePropertyMappingStrategy;
import org.mapstruct.ReportingPolicy;
import de.itvsh.ozg.pluto.command.Wiedervorlage;
import de.itvsh.ozg.pluto.files.FileIdMapper;
import de.itvsh.ozg.pluto.wiedervorlage.GrpcFindWiedervorlagenByVorgangResponse;
import de.itvsh.ozg.pluto.wiedervorlage.GrpcGetWiedervorlageResponse;
import de.itvsh.ozg.pluto.wiedervorlage.GrpcWiedervorlage;
@Mapper(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE, //
@Mapper(uses = FileIdMapper.class, //
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE, //
unmappedTargetPolicy = ReportingPolicy.WARN, //
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, //
collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED)
interface GrpcWiedervorlageMapper {
@Mapping(target = "mergeFrom", ignore = true)
@Mapping(target = "clearField", ignore = true)
@Mapping(target = "clearOneof", ignore = true)
@Mapping(target = "mergeUnknownFields", ignore = true)
@Mapping(target = "beschreibungBytes", ignore = true)
@Mapping(target = "betreffBytes", ignore = true)
@Mapping(target = "createdAtBytes", ignore = true)
@Mapping(target = "createdByBytes", ignore = true)
@Mapping(target = "createdByNameBytes", ignore = true)
@Mapping(target = "fristBytes", ignore = true)
@Mapping(target = "idBytes", ignore = true)
@Mapping(target = "unknownFields", ignore = true)
@Mapping(target = "version", ignore = true)
@Mapping(target = "allFields", ignore = true)
@Mapping(target = "attachmentsList", source = "attachments")
GrpcWiedervorlage map(Wiedervorlage wiedervorlage);
default GrpcGetWiedervorlageResponse toGrpc(Wiedervorlage wiedervorlage) {
return GrpcGetWiedervorlageResponse.newBuilder().setWiedervorlage(map(wiedervorlage)).build();
}
default GrpcFindWiedervorlagenByVorgangResponse toGrpc(List<Wiedervorlage> wiedervorlages) {
return GrpcFindWiedervorlagenByVorgangResponse.newBuilder().addAllWiedervorlagen(map(wiedervorlages)).build();
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment