diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/CollaborationCommandBody.java b/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/CollaborationCommandBody.java new file mode 100644 index 0000000000000000000000000000000000000000..d6e68b1a0fa90122853a966ac35c6205e40322e0 --- /dev/null +++ b/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/CollaborationCommandBody.java @@ -0,0 +1,24 @@ +package de.ozgcloud.alfa.collaboration; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +import de.ozgcloud.alfa.common.LinkedResourceDeserializer; +import de.ozgcloud.alfa.common.command.CommandBody; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class CollaborationCommandBody implements CommandBody { + + private String titel; + private String beschreibung; + private long collaborationLevel; + + @JsonDeserialize(using = LinkedResourceDeserializer.class) + private String zustaendigeStelle; +} diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/FachstelleCollaboration.java b/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/FachstelleCollaboration.java index 5a4dabfeef4046606754daf0d8abf7f76b7ba139..bfb7417ba47d9bfa7952ba406d04978dda900f4f 100644 --- a/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/FachstelleCollaboration.java +++ b/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/FachstelleCollaboration.java @@ -3,13 +3,16 @@ package de.ozgcloud.alfa.collaboration; import com.fasterxml.jackson.annotation.JsonIgnore; import de.ozgcloud.alfa.common.LinkedResource; -import de.ozgcloud.alfa.common.command.CommandBody; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; +import lombok.NoArgsConstructor; @Getter @Builder -public class FachstelleCollaboration implements CommandBody, Collaboration { +@AllArgsConstructor +@NoArgsConstructor +public class FachstelleCollaboration implements Collaboration { @JsonIgnore private String vorgangId; diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitCollaboration.java b/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitCollaboration.java index 00e7b26902aa3aeb7cf95c2eaea12b1a8a2b61c7..793d2bf2160d5f713264b1f743cf8033b0b4a754 100644 --- a/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitCollaboration.java +++ b/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitCollaboration.java @@ -3,13 +3,16 @@ package de.ozgcloud.alfa.collaboration; import com.fasterxml.jackson.annotation.JsonIgnore; import de.ozgcloud.alfa.common.LinkedResource; -import de.ozgcloud.alfa.common.command.CommandBody; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; +import lombok.NoArgsConstructor; @Getter @Builder -public class OrganisationsEinheitCollaboration implements CommandBody, Collaboration { +@AllArgsConstructor +@NoArgsConstructor +public class OrganisationsEinheitCollaboration implements Collaboration { @JsonIgnore private String vorgangId; diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandBody.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandBody.java index 42f3ec714dd2a8c466b34cf2670977e2eba6d45a..8b610f6bd4eecebcb9d32127b85aea8f200d1a63 100644 --- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandBody.java +++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandBody.java @@ -29,7 +29,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import de.ozgcloud.alfa.aktenzeichen.AktenzeichenCommandBody; import de.ozgcloud.alfa.bescheid.Bescheid; import de.ozgcloud.alfa.bescheid.BescheidDocumentFromFileBody; -import de.ozgcloud.alfa.collaboration.Collaboration; +import de.ozgcloud.alfa.collaboration.CollaborationCommandBody; import de.ozgcloud.alfa.kommentar.Kommentar; import de.ozgcloud.alfa.loeschanforderung.DeleteLoeschAnforderung; import de.ozgcloud.alfa.loeschanforderung.LoeschAnforderung; @@ -56,7 +56,7 @@ import de.ozgcloud.alfa.wiedervorlage.Wiedervorlage; @Type(value = ProcessVorgangBody.class, name = "PROCESS_VORGANG"), @Type(value = AktenzeichenCommandBody.class, name = "SET_AKTENZEICHEN"), @Type(value = BescheidDocumentFromFileBody.class, name = "CREATE_BESCHEID_DOCUMENT_FROM_FILE"), - @Type(value = Collaboration.class, name = "CREATE_COLLABORATION_REQUEST") + @Type(value = CollaborationCommandBody.class, name = "CREATE_COLLABORATION_REQUEST") }) public interface CommandBody { }