Fix attachment contract and reconcile storage safely across API replicas
This commit is contained in:
@@ -9,6 +9,8 @@ import org.hibernate.validator.constraints.CodePointLength;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.UUID;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* MessageDTO
|
||||
@@ -26,6 +28,8 @@ public class MessageDTO {
|
||||
|
||||
private Instant createdAt;
|
||||
|
||||
private List<UUID> attachmentIds = new ArrayList<>();
|
||||
|
||||
public MessageDTO() {
|
||||
super();
|
||||
}
|
||||
@@ -41,6 +45,15 @@ public class MessageDTO {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
|
||||
public MessageDTO(UUID id, UUID chatId, UUID senderId, String text, Instant createdAt, List<UUID> attachmentIds) {
|
||||
this.id = id;
|
||||
this.chatId = chatId;
|
||||
this.senderId = senderId;
|
||||
this.text = text;
|
||||
this.createdAt = createdAt;
|
||||
this.attachmentIds = attachmentIds != null ? attachmentIds : new ArrayList<>();
|
||||
}
|
||||
|
||||
public MessageDTO id(UUID id) {
|
||||
this.id = id;
|
||||
return this;
|
||||
@@ -142,6 +155,17 @@ public class MessageDTO {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
|
||||
@Valid
|
||||
@Schema(name = "attachment_ids", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@JsonProperty("attachment_ids")
|
||||
public List<UUID> getAttachmentIds() {
|
||||
return attachmentIds;
|
||||
}
|
||||
|
||||
public void setAttachmentIds(List<UUID> attachmentIds) {
|
||||
this.attachmentIds = attachmentIds;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) {
|
||||
@@ -155,12 +179,13 @@ public class MessageDTO {
|
||||
Objects.equals(this.chatId, messageDTO.chatId) &&
|
||||
Objects.equals(this.senderId, messageDTO.senderId) &&
|
||||
Objects.equals(this.text, messageDTO.text) &&
|
||||
Objects.equals(this.createdAt, messageDTO.createdAt);
|
||||
Objects.equals(this.createdAt, messageDTO.createdAt) &&
|
||||
Objects.equals(this.attachmentIds, messageDTO.attachmentIds);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(id, chatId, senderId, text, createdAt);
|
||||
return Objects.hash(id, chatId, senderId, text, createdAt, attachmentIds);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -172,6 +197,7 @@ public class MessageDTO {
|
||||
sb.append(" senderId: ").append(toIndentedString(senderId)).append("\n");
|
||||
sb.append(" text: ").append(toIndentedString(text)).append("\n");
|
||||
sb.append(" createdAt: ").append(toIndentedString(createdAt)).append("\n");
|
||||
sb.append(" attachmentIds: ").append(toIndentedString(attachmentIds)).append("\n");
|
||||
sb.append("}");
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user