forked from mtusi2026/mtusi2026lab4
на 3 готово
This commit is contained in:
@@ -4,12 +4,17 @@ import lombok.RequiredArgsConstructor;
|
||||
import org.example.dto.MessagePage;
|
||||
import org.example.dto.create.CreateMessageDto;
|
||||
import org.example.dto.update.UpdateMessageDto;
|
||||
import org.example.exception.BadRequestException;
|
||||
import org.example.exception.ConflictException;
|
||||
import org.example.exception.ForbiddenException;
|
||||
import org.example.exception.NotFoundException;
|
||||
import org.example.model.Attachment;
|
||||
import org.example.model.IdempotencyKey;
|
||||
import org.example.model.Message;
|
||||
import org.example.model.MessageAttachment;
|
||||
import org.example.repository.AttachmentRepository;
|
||||
import org.example.repository.IdempotencyKeyRepository;
|
||||
import org.example.repository.MessageAttachmentRepository;
|
||||
import org.example.repository.MessageRepository;
|
||||
import org.springframework.dao.DataIntegrityViolationException;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
@@ -18,9 +23,8 @@ import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static org.example.config.TokenHasher.sha256;
|
||||
|
||||
@@ -32,8 +36,10 @@ public class MessageService {
|
||||
private final IdempotencyKeyRepository idempotencyKeyRepository;
|
||||
private final ChatService chatService;
|
||||
private final MessageIdempotencyWriter writer;
|
||||
private final AttachmentRepository attachmentRepository;
|
||||
private final MessageAttachmentRepository messageAttachmentRepository;
|
||||
|
||||
@Transactional(readOnly = true) // или без write на этом уровне
|
||||
@Transactional
|
||||
public Message sendMessage(
|
||||
UUID chatId,
|
||||
UUID senderId,
|
||||
@@ -45,8 +51,30 @@ public class MessageService {
|
||||
throw new ForbiddenException("Пользователь не является участником чата");
|
||||
}
|
||||
|
||||
String text = messageObject.getText() == null ? "" : messageObject.getText();
|
||||
|
||||
List<UUID> attIds = messageObject.getAttachmentIds() == null
|
||||
? List.of()
|
||||
: messageObject.getAttachmentIds().stream().distinct().toList();
|
||||
|
||||
if (text.isBlank() && attIds.isEmpty()) {
|
||||
throw new BadRequestException("text or attachment_ids required");
|
||||
}
|
||||
|
||||
if (!attIds.isEmpty()) {
|
||||
List<Attachment> found = attachmentRepository.findByIdInAndChatId(attIds, chatId);
|
||||
if (found.size() != attIds.size()) {
|
||||
throw new BadRequestException("Invalid attachment_ids");
|
||||
}
|
||||
}
|
||||
|
||||
String key = idempotencyKey.trim();
|
||||
String hash = sha256(messageObject.getText());
|
||||
String hash = sha256(
|
||||
text + "\n" + attIds.stream()
|
||||
.map(UUID::toString)
|
||||
.sorted()
|
||||
.collect(Collectors.joining(","))
|
||||
);
|
||||
|
||||
Optional<IdempotencyKey> exists =
|
||||
idempotencyKeyRepository.findByUserIdAndChatIdAndIdempotencyKey(senderId, chatId, key);
|
||||
@@ -56,7 +84,9 @@ public class MessageService {
|
||||
}
|
||||
|
||||
try {
|
||||
return writer.insertNew(chatId, senderId, messageObject.getText(), key, hash);
|
||||
Message message = writer.insertNew(chatId, senderId, text, attIds, key, hash);
|
||||
message.setAttachmentIds(attIds);
|
||||
return message;
|
||||
} catch (DataIntegrityViolationException e) {
|
||||
IdempotencyKey rec = idempotencyKeyRepository
|
||||
.findByUserIdAndChatIdAndIdempotencyKey(senderId, chatId, key)
|
||||
@@ -69,8 +99,15 @@ public class MessageService {
|
||||
if (!row.getRequestHash().equals(hash)) {
|
||||
throw new ConflictException("Idempotency key conflict");
|
||||
}
|
||||
return messageRepository.findById(row.getMessageId())
|
||||
Message message = messageRepository.findById(row.getMessageId())
|
||||
.orElseThrow(() -> new IllegalStateException("idempotency message missing"));
|
||||
|
||||
List<UUID> ids = messageAttachmentRepository.findByMessageId(message.getId())
|
||||
.stream()
|
||||
.map(MessageAttachment::getAttachmentId)
|
||||
.toList();
|
||||
message.setAttachmentIds(ids);
|
||||
return message;
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
@@ -124,6 +161,25 @@ public class MessageService {
|
||||
}
|
||||
}
|
||||
|
||||
if (!items.isEmpty()) {
|
||||
List<UUID> msgIds = items.stream().map(Message::getId).toList();
|
||||
List<MessageAttachment> links =
|
||||
messageAttachmentRepository.findByMessageIdIn(msgIds);
|
||||
|
||||
Map<UUID, List<UUID>> byMsg = new HashMap<>();
|
||||
for (MessageAttachment link : links) {
|
||||
byMsg.computeIfAbsent(link.getMessageId(), k -> new ArrayList<>())
|
||||
.add(link.getAttachmentId());
|
||||
}
|
||||
for (Message m : items) {
|
||||
m.setAttachmentIds(byMsg.getOrDefault(m.getId(), List.of()));
|
||||
}
|
||||
} else {
|
||||
for (Message m : items) {
|
||||
m.setAttachmentIds(List.of());
|
||||
}
|
||||
}
|
||||
|
||||
return new MessagePage(items, nextCursor);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user