Skip to content

Commit

Permalink
[COZY-476] test: 기존 테스트 코드 전체 삭제, (chat, chatroom, fcm, notificationl…
Browse files Browse the repository at this point in the history
…og, favorite, inquiry, report) 테스트 데이터 생성 (#238)

* [COZY-476] fix: 쪽지 생성 로직에서 차단한 사용자에 대한 확인 로직을 삭제한다

* [COZY-476] fix: Chat 테스트 코드 주석을 해제한다

* [COZY-476] fix: ChatRoom 테스트 코드 주석을 해제한다

* [COZY-476] fix: 쪽지 작성에 대한 테스트 결과 검증을 추가한다

* [COZY-476] fix: sender를 추가한다

* [COZY-476] feat: fixture 테스트 데이터를 추가한다

* [COZY-476] fix: 오타를 수정한다

* [COZY-476] fix: 이전 테스트 코드 전체를 삭제한다

* [COZY-476] fix: 컨벤션에 맞춰 정상 데이터를 수정한다

* [COZY-476] feat: 쪽지 작성에서 글자 수 제약 조건을 추가한다

* [COZY-476] test: Chat 에러 데이터를 추가한다

* [COZY-476] test: ChatRoom 정상 더미데이터를 추가한다

* [COZY-476] feat: Inquiry 엔티티에 제약 조건을 추가한다

* [COZY-476] test: Inquiry 에러 데이터를 추가한다

* [COZY-476] feat: Favorite 엔티티에 제약 조건을 추가한다

* [COZY-476] test: Favorite 에러 데이터를 추가한다

* [COZY-476] feat: Report에 대한 제약 조건을 추가한다

* [COZY-476] test: Report 에러 데이터를 추가한다

* [COZY-476] test: 누락된 id 값을 추가한다

* [COZY-476] fix: 중복 선언된 id 값을 수정한다

* [COZY-476] test: ChatFixture에 정상 데이터를 추가한다

* [COZY-476] feat: NotificationLog 엔티티에 제약 조건을 추가한다

* [COZY-476] test: NotificationLogFixture에 에러 데이터를 추가한다

* [COZY-476] feat: Fcm 엔티티에 제약 조건을 추가한다

* [COZY-476] test: FcmFixture에 에러 데이터를 추가한다

* [COZY-476] test: Fixture 전체 메서드를 static으로 변경한다
  • Loading branch information
veronees authored Jan 17, 2025
1 parent 8c8eb85 commit 31204e0
Show file tree
Hide file tree
Showing 27 changed files with 505 additions and 1,413 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne;
import jakarta.validation.constraints.Size;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand All @@ -33,6 +34,7 @@ public class Chat extends BaseTimeEntity {
@ManyToOne(fetch = FetchType.LAZY)
private Member sender;

@Column(length = 500)
@Size(min = 1, max = 500)
@Column(nullable = false, length = 500)
private String content;
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package com.cozymate.cozymate_server.domain.chat.dto.request;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;

public record CreateChatRequestDTO(
@NotBlank(message = "쪽지 내용이 공백일 수 없습니다.")
@Size(max = 500, message = "500자 이하로 입력해주세요.")
String content
) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import com.cozymate.cozymate_server.domain.member.repository.MemberRepository;
import com.cozymate.cozymate_server.domain.chat.converter.ChatConverter;
import com.cozymate.cozymate_server.domain.chatroom.converter.ChatRoomConverter;
import com.cozymate.cozymate_server.domain.memberblock.util.MemberBlockUtil;
import com.cozymate.cozymate_server.global.response.code.status.ErrorStatus;
import com.cozymate.cozymate_server.global.response.exception.GeneralException;
import java.util.Optional;
Expand All @@ -26,14 +25,11 @@ public class ChatCommandService {
private final ChatRepository chatRepository;
private final MemberRepository memberRepository;
private final ChatRoomRepository chatRoomRepository;
private final MemberBlockUtil memberBlockUtil;

public ChatRoomIdResponseDTO createChat(CreateChatRequestDTO createChatRequestDTO, Member sender, Long recipientId) {
Member recipient = memberRepository.findById(recipientId)
.orElseThrow(() -> new GeneralException(ErrorStatus._CHAT_NOT_FOUND_RECIPIENT));

checkBlockedMember(sender, recipientId);

Optional<ChatRoom> findChatRoom = chatRoomRepository.findByMemberAAndMemberB(sender,
recipient);

Expand All @@ -43,19 +39,13 @@ public ChatRoomIdResponseDTO createChat(CreateChatRequestDTO createChatRequestDT
return ChatRoomConverter.toChatRoomIdResponseDTO(findChatRoom.get().getId());
} else {
ChatRoom chatRoom = ChatRoomConverter.toEntity(sender, recipient);
chatRoomRepository.save(chatRoom);
chatRoom = chatRoomRepository.save(chatRoom);
saveChat(chatRoom, sender, createChatRequestDTO.content());

return ChatRoomConverter.toChatRoomIdResponseDTO(chatRoom.getId());
}
}

private void checkBlockedMember(Member sender, Long recipientId) {
if (memberBlockUtil.existsMemberBlock(sender, recipientId)) {
throw new GeneralException(ErrorStatus._REQUEST_TO_BLOCKED_MEMBER);
}
}

private void saveChat(ChatRoom chatRoom, Member sender, String content) {
Chat chat = ChatConverter.toEntity(chatRoom, sender, content.trim());
chatRepository.save(chat);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.cozymate.cozymate_server.domain.favorite.enums.FavoriteType;
import com.cozymate.cozymate_server.domain.member.Member;
import com.cozymate.cozymate_server.global.utils.BaseTimeEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
Expand All @@ -11,6 +12,7 @@
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne;
import jakarta.validation.constraints.NotNull;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand All @@ -31,6 +33,8 @@ public class Favorite extends BaseTimeEntity {
@ManyToOne(fetch = FetchType.LAZY)
private Member member;

@NotNull
@Column(nullable = false)
private Long targetId;

@Enumerated(EnumType.STRING)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public class Fcm extends BaseTimeEntity {
@ManyToOne(fetch = FetchType.LAZY)
private Member member;

@Column(nullable = false)
private String token;

private boolean isValid;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
import com.cozymate.cozymate_server.domain.inquiry.enums.InquiryStatus;
import com.cozymate.cozymate_server.domain.member.Member;
import com.cozymate.cozymate_server.global.utils.BaseTimeEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne;
import jakarta.validation.constraints.Size;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand All @@ -27,11 +30,14 @@ public class Inquiry extends BaseTimeEntity {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
private Member member;

@Size(min = 1, max = 255)
@Column(nullable = false, length = 255)
private String content;

@Column(nullable = false)
private String email;

@Enumerated(value = EnumType.STRING)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.cozymate.cozymate_server.domain.member.Member;
import com.cozymate.cozymate_server.domain.notificationlog.enums.NotificationType.NotificationCategory;
import com.cozymate.cozymate_server.global.utils.BaseTimeEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
Expand Down Expand Up @@ -34,6 +35,7 @@ public class NotificationLog extends BaseTimeEntity {
@Enumerated(EnumType.STRING)
private NotificationCategory category;

@Column(nullable = false)
private String content;

private Long targetId;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.cozymate.cozymate_server.domain.report.enums.ReportReason;
import com.cozymate.cozymate_server.domain.report.enums.ReportSource;
import com.cozymate.cozymate_server.global.utils.BaseTimeEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
Expand All @@ -12,6 +13,7 @@
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne;
import jakarta.validation.constraints.Size;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand All @@ -32,6 +34,7 @@ public class Report extends BaseTimeEntity {
@ManyToOne(fetch = FetchType.LAZY)
private Member reporter;

@Column(nullable = false)
private Long reportedMemberId;

@Enumerated(EnumType.STRING)
Expand All @@ -40,5 +43,6 @@ public class Report extends BaseTimeEntity {
@Enumerated(EnumType.STRING)
private ReportSource reportSource;

@Size(max = 255)
private String content;
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@
import com.cozymate.cozymate_server.global.utils.EnumValid;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.validation.constraints.AssertTrue;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;

public record ReportRequestDTO(
@NotNull
Long memberId,
@EnumValid(enumClass = ReportSource.class)
String source,
@EnumValid(enumClass = ReportReason.class)
String reason,
@Size(max = 255, message = "255자 이하로 입력해주세요")
String content
) {
@AssertTrue(message = "기타 사유의 경우 신고 내용을 입력해야 합니다.")
Expand Down

This file was deleted.

Loading

0 comments on commit 31204e0

Please sign in to comment.