Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ public interface PlazaLetterRepository extends JpaRepository<PlazaLetter, Long>

List<PlazaLetter> findByLetterIdIn(List<Long> letterIds);

long countByStatus(PlazaLetterStatus status);

Slice<PlazaLetter> findByReceiverIdOrderByArrivedAtDesc(
Long receiverId,
Pageable pageable
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.example.egobook_be.domain.letters.service;

import com.example.egobook_be.domain.letters.entity.BadWordBlockLog;
import com.example.egobook_be.domain.letters.enums.BlockType;
import com.example.egobook_be.domain.letters.repository.BadWordBlockLogRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.util.List;

@Service
@RequiredArgsConstructor
public class BadWordBlockLogService {

private final BadWordBlockLogRepository badWordBlockLogRepo;

@Transactional(propagation = Propagation.REQUIRES_NEW)
public void saveBlockLog(Long userId, BlockType type, String text,
List<String> badWords, double score) {
badWordBlockLogRepo.save(BadWordBlockLog.builder()
.userId(userId)
.type(type)
.originalText(text)
.badWords(badWords != null ? badWords : List.of())
.score(score)
.blockedAt(LocalDateTime.now())
.build());
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package com.example.egobook_be.domain.letters.service;

import com.example.egobook_be.domain.letters.entity.LetterSendFailLog;
import com.example.egobook_be.domain.letters.entity.PlazaLetter;
import com.example.egobook_be.domain.letters.entity.PlazaLetterStatus;
import com.example.egobook_be.domain.letters.repository.LetterSendFailLogRepository;
import com.example.egobook_be.domain.letters.repository.PlazaLetterRepository;
import com.example.egobook_be.domain.restriction.enums.RestrictionDomainType;
import com.example.egobook_be.domain.restriction.service.RestrictionGuardService;
Expand All @@ -26,6 +28,7 @@ public class PlazaLetterDispatchService {
private final PlazaLetterRepository plazaLetterRepository;
private final UserRepository userRepository;
private final RestrictionGuardService restrictionGuardService;
private final LetterSendFailLogRepository letterFailLogRepo;

private static final int BATCH_SIZE = 20;
private static final int RECEIVER_POOL_SIZE = 300;
Expand All @@ -49,23 +52,48 @@ public void dispatchWaitingLetters() {
PageRequest.of(0, RECEIVER_POOL_SIZE)
);

if (receiverPool.isEmpty()) return;
if (receiverPool.isEmpty()) {
for (PlazaLetter letter : waitingLetters) {
letterFailLogRepo.save(LetterSendFailLog.builder()
.letterId(letter.getLetterId())
.failedAt(LocalDateTime.now())
.reason("์ˆ˜์‹  ๊ฐ€๋Šฅํ•œ ์œ ์ € ์—†์Œ")
.build());
}
return;
}

// LETTER ์ œ์žฌ ์‚ฌ์šฉ์ž ์ˆ˜์‹ ์ž ํ’€์—์„œ ์ œ์™ธ
Set<Long> restrictedIds = restrictionGuardService.getActivelyRestrictedUserIds(RestrictionDomainType.LETTER);
if (!restrictedIds.isEmpty()) {
receiverPool = receiverPool.stream()
.filter(id -> !restrictedIds.contains(id))
.collect(Collectors.toList());
if (receiverPool.isEmpty()) return;
if (receiverPool.isEmpty()) {
for (PlazaLetter letter : waitingLetters) {
letterFailLogRepo.save(LetterSendFailLog.builder()
.letterId(letter.getLetterId())
.failedAt(LocalDateTime.now())
.reason("์ˆ˜์‹  ๊ฐ€๋Šฅํ•œ ์œ ์ € ์—†์Œ")
.build());
}
return;
}
}

for (PlazaLetter letter : waitingLetters) {
Long senderId = letter.getSenderId();

Long receiverId = pickRandomExcluding(receiverPool, senderId);
if (receiverId == null) continue;

if (receiverId == null) {
// ๊ธฐ์กด์—” ๊ทธ๋ƒฅ continue โ†’ ์‹คํŒจ ๋กœ๊ทธ ์ €์žฅ ์ถ”๊ฐ€
letterFailLogRepo.save(LetterSendFailLog.builder()
.letterId(letter.getLetterId())
.failedAt(LocalDateTime.now())
.reason("์ˆ˜์‹  ๊ฐ€๋Šฅํ•œ ์œ ์ € ์—†์Œ")
.build());
continue;
}
letter.assignReceiver(receiverId, now, now.plusHours(24));
}
log.info("[PlazaLetterDispatchService] dispatchWaitingLetters End");
Expand Down Expand Up @@ -96,4 +124,4 @@ private Long pickRandomExcluding(List<Long> pool, Long excluded) {
}
return null;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ public class PlazaLetterService {

private final RestrictionGuardService restrictionGuardService;

private final BadWordBlockLogService badWordBlockLogService;

@Value("${spring.cloud.aws.cloudfront.domain}")
private String cloudfrontDomain;

Expand All @@ -115,14 +117,8 @@ private void enforceWordAiOrThrow(String text, Long userId, BlockType blockType)
try {
WordDetectResponse res = wordClient.detect(text);
if (wordClient.shouldBlock(res)) {
badWordBlockLogRepo.save(BadWordBlockLog.builder()
.userId(userId)
.type(blockType)
.originalText(text)
.badWords(res.getBadWords() != null ? res.getBadWords() : List.of())
.score(res.getPercentage() / 100.0)
.blockedAt(LocalDateTime.now())
.build());
badWordBlockLogService.saveBlockLog(userId, blockType, text,
res.getBadWords(), res.getPercentage() / 100.0);
throw new CustomException(LettersErrorCode.AI_MODERATION_FAILED);
}
} catch (CustomException e) {
Expand Down Expand Up @@ -290,14 +286,8 @@ public void handleAiResult(Long letterId, WordDetectResponse result,

if (wordClient.shouldBlock(result)) {
// ์š•์„ค ๊ฐ์ง€ โ†’ ์ฐจ๋‹จ ๋กœ๊ทธ ์ €์žฅ ํ›„ ํŽธ์ง€ ์‚ญ์ œ
badWordBlockLogRepo.save(BadWordBlockLog.builder()
.userId(letter.getSenderId())
.type(BlockType.LETTER)
.originalText(result.getText())
.badWords(result.getBadWords() != null ? result.getBadWords() : List.of())
.score(result.getPercentage() / 100.0)
.blockedAt(LocalDateTime.now())
.build());
badWordBlockLogService.saveBlockLog(letter.getSenderId(), BlockType.LETTER,
result.getText(), result.getBadWords(), result.getPercentage() / 100.0);
plazaLetterRepository.delete(letter);
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,7 @@ public LetterStatusRes getLetterStatus(LocalDate startDate, LocalDate endDate) {
long sentCount = plazaLetterRepo.countByCreatedAtBetweenAndStatuses(
start, end, List.of(PlazaLetterStatus.REPLIED, PlazaLetterStatus.AI_REPLIED));

long waitingCount = plazaLetterRepo.countByCreatedAtBetweenAndStatus(
start, end, PlazaLetterStatus.WAITING);
long waitingCount = plazaLetterRepo.countByStatus(PlazaLetterStatus.WAITING);

long aiReplyCount = plazaLetterRepo.countByCreatedAtBetweenAndStatus(
start, end, PlazaLetterStatus.AI_REPLIED);
Expand Down
Loading