Skip to content

Commit 984bec6

Browse files
committed
refactor: eventType enum 추가
1 parent fd72c03 commit 984bec6

File tree

12 files changed

+29
-17
lines changed

12 files changed

+29
-17
lines changed

src/main/java/com/oronaminc/join/answer/dto/AnswerCreateResponse.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.oronaminc.join.answer.dto;
22

33
import com.oronaminc.join.global.dto.WriterDto;
4+
import com.oronaminc.join.websocket.common.EventType;
45
import io.swagger.v3.oas.annotations.media.Schema;
56
import jakarta.validation.constraints.NotBlank;
67
import jakarta.validation.constraints.Size;
@@ -14,7 +15,7 @@ public record AnswerCreateResponse(
1415
@Schema(description = "답변이 생성될 질문 ID")
1516
Long questionId,
1617
@Schema(description = "답변 생성/삭제/수정 상태", example = "CREATE")
17-
String event,
18+
EventType event,
1819
@Schema(description = "답변 ID", example = "11")
1920
Long answerId,
2021
@Schema(description = "답변 내용", example = "답변입니다.")
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.oronaminc.join.answer.dto;
22

3+
import com.oronaminc.join.websocket.common.EventType;
34
import io.swagger.v3.oas.annotations.media.Schema;
45

56
@Schema(description = "답변 삭제 응답 DTO")
67
public record AnswerDeleteResponse(
78
Long answerId,
89
@Schema(description = "삭제 이벤트", example = "DELETE")
9-
String event
10+
EventType event
1011
) {
1112

1213
}

src/main/java/com/oronaminc/join/answer/dto/AnswerUpdateResponse.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.oronaminc.join.answer.dto;
22

3+
import com.oronaminc.join.websocket.common.EventType;
34
import io.swagger.v3.oas.annotations.media.Schema;
45
import lombok.Builder;
56

@@ -8,7 +9,7 @@
89
public record AnswerUpdateResponse(
910
Long answerId,
1011
@Schema(description = "수정 이벤트", example = "UPDATE")
11-
String event,
12+
EventType event,
1213
@Schema(description = "수정된 내용", example = "수정된 답변입니다.")
1314
String content
1415

src/main/java/com/oronaminc/join/answer/mapper/AnswerMapper.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.oronaminc.join.global.dto.WriterDto;
99
import com.oronaminc.join.member.domain.Member;
1010
import com.oronaminc.join.question.domain.Question;
11+
import com.oronaminc.join.websocket.common.EventType;
1112
import lombok.AccessLevel;
1213
import lombok.NoArgsConstructor;
1314

@@ -17,7 +18,7 @@ public class AnswerMapper {
1718
public static AnswerCreateResponse toAnswerCreateResponse(Answer answer) {
1819
return AnswerCreateResponse.builder()
1920
.questionId(answer.getQuestion().getId())
20-
.event("CREATE")
21+
.event(EventType.CREATE)
2122
.answerId(answer.getId())
2223
.content(answer.getContent())
2324
.emojiCount(0)
@@ -51,7 +52,7 @@ public static Answer toEntity(Question question, Member member, AnswerRequest re
5152
public static AnswerUpdateResponse toAnswerUpdateResponse(Answer answer) {
5253
return AnswerUpdateResponse.builder()
5354
.answerId(answer.getId())
54-
.event("UPDATE")
55+
.event(EventType.UPDATE)
5556
.content(answer.getContent())
5657
.build();
5758
}

src/main/java/com/oronaminc/join/emoji/dto/EmojiResponse.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.oronaminc.join.emoji.dto;
22

33
import com.oronaminc.join.emoji.domain.TargetType;
4+
import com.oronaminc.join.websocket.common.EventType;
45
import io.swagger.v3.oas.annotations.media.Schema;
56

67
@Schema(description = "발표방/질문/답변 공감 생성/삭제 응답 DTO")
78
public record EmojiResponse(
89
@Schema(description = "이벤트 타입 (CREATE, DELETE)", example = "CREATE")
9-
String event,
10+
EventType event,
1011
@Schema(description = "공감 대상 타입 (ROOM, QUESTION, ANSWER)", example = "ROOM")
1112
TargetType targetType,
1213
@Schema(description = "공감 대상 ID", example = "1")

src/main/java/com/oronaminc/join/emoji/service/EmojiService.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.oronaminc.join.member.service.MemberReader;
1212
import com.oronaminc.join.question.service.QuestionReader;
1313
import com.oronaminc.join.room.service.RoomReader;
14+
import com.oronaminc.join.websocket.common.EventType;
1415
import lombok.RequiredArgsConstructor;
1516
import org.springframework.stereotype.Service;
1617
import org.springframework.transaction.annotation.Transactional;
@@ -46,7 +47,7 @@ public EmojiResponse createEmoji(Long memberId, EmojiRequest emojiRequest) {
4647

4748
emojiCount = incrementEmojiCount(targetType, targetId);
4849

49-
return new EmojiResponse("CREATE", targetType, targetId, emojiCount);
50+
return new EmojiResponse(EventType.CREATE, targetType, targetId, emojiCount);
5051

5152
}
5253

@@ -62,7 +63,7 @@ public EmojiResponse deleteEmoji(Long memberId, EmojiRequest emojiRequest) {
6263
);
6364
emojiCount = decrementEmojiCount(targetType, targetId);
6465

65-
return new EmojiResponse("DELETE", targetType, targetId, emojiCount);
66+
return new EmojiResponse(EventType.DELETE, targetType, targetId, emojiCount);
6667

6768
}
6869

src/main/java/com/oronaminc/join/question/dto/QuestionCreateResponse.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33

44
import com.oronaminc.join.global.dto.WriterDto;
5+
import com.oronaminc.join.websocket.common.EventType;
56
import io.swagger.v3.oas.annotations.media.Schema;
67
import java.time.LocalDateTime;
78
import lombok.Builder;
@@ -10,7 +11,7 @@
1011
@Schema(description = "질문 생성 응답 DTO")
1112
public record QuestionCreateResponse(
1213
@Schema(description = "", example = "CREATE")
13-
String event,
14+
EventType event,
1415
@Schema(description = "질문 ID", example = "11")
1516
Long questionId,
1617
@Schema(description = "질문 내용", example = "질문있습니다. 질문생성DTO가 맞나요?")
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package com.oronaminc.join.question.dto;
22

3+
import com.oronaminc.join.websocket.common.EventType;
34
import io.swagger.v3.oas.annotations.media.Schema;
45
import lombok.Builder;
56

67
@Schema(description = "질문 삭제 응답 DTO")
78
public record QuestionDeleteResponse(
8-
String event,
9+
EventType event,
910
Long questionId
1011
) {
1112
}

src/main/java/com/oronaminc/join/question/dto/QuestionUpdateResponse.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.oronaminc.join.question.dto;
22

3+
import com.oronaminc.join.websocket.common.EventType;
34
import io.swagger.v3.oas.annotations.media.Schema;
45
import lombok.Builder;
56

67
@Builder
78
@Schema(description = "질문 수정 응답 DTO")
89
public record QuestionUpdateResponse(
9-
String event,
10+
EventType event,
1011
Long questionId,
1112
String content
1213

src/main/java/com/oronaminc/join/question/service/QuestionService.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ public class QuestionService {
4242
public Question create(Long roomId, Long memberId, QuestionRequest requestDto) {
4343

4444
Member member = memberReader.getById(memberId);
45-
4645
Room room = roomReader.getById(roomId);
47-
4846
participantService.validateParticipant(memberId, roomId);
4947

5048
Question question = QuestionMapper.toQuestion(room, member, requestDto);
@@ -117,7 +115,6 @@ public Long delete(Long memberId, Long roomId, Long questionId) {
117115
return question.getId();
118116
}
119117

120-
121118
@Transactional
122119
public void deleteByRoomId(Long roomId) {
123120
List<Question> questions = questionReader.findByRoomId(roomId);

0 commit comments

Comments
 (0)