Skip to content

Commit 59b2e06

Browse files
committed
fix: 코드스멜 제거
1 parent 1b30075 commit 59b2e06

File tree

4 files changed

+9
-20
lines changed

4 files changed

+9
-20
lines changed

src/main/java/org/dfbf/soundlink/domain/alert/controller/AlertController.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import io.swagger.v3.oas.annotations.tags.Tag;
55
import lombok.RequiredArgsConstructor;
66
import org.dfbf.soundlink.domain.alert.service.AlertService;
7-
import org.dfbf.soundlink.global.exception.ResponseResult;
87
import org.springframework.security.core.annotation.AuthenticationPrincipal;
98
import org.springframework.web.bind.annotation.*;
109
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
@@ -32,10 +31,4 @@ public SseEmitter subscribeTest(
3231
@RequestHeader(value = "Last-Event-ID", required = false, defaultValue = "") String lastEventId) {
3332
return alertService.connectAlarm(id, lastEventId);
3433
}
35-
36-
// @PostMapping("")
37-
// @Operation(summary = "알림 전송 API", description = "알림을 전송하는 기능 (CHAT 서버에서 사용하는 기능입니다.)")
38-
// public ResponseResult send(@RequestParam("id") Long id, @RequestParam("msg") String msg) {
39-
// return alertService.send(id,"test" ,msg);
40-
// }
4134
}

src/main/java/org/dfbf/soundlink/domain/alert/dto/AlertReq.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.dfbf.soundlink.domain.alert.dto;
22

3-
import com.fasterxml.jackson.annotation.JsonProperty;
4-
53
public record AlertReq(
64
String type,
75
String timestamp,

src/main/java/org/dfbf/soundlink/domain/alert/entity/Alert.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package org.dfbf.soundlink.domain.alert.entity;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
5-
import jakarta.persistence.Column;
6-
import jakarta.persistence.Entity;
7-
import jakarta.persistence.Id;
8-
import jakarta.persistence.Lob;
94
import lombok.*;
10-
import java.time.*;
5+
6+
import java.time.Instant;
7+
import java.time.ZoneId;
118
import java.time.format.DateTimeFormatter;
129

1310
@Data

src/main/java/org/dfbf/soundlink/domain/chat/service/ChatRoomService.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public class ChatRoomService {
5151
private final KafkaProducer kafkaProducer;
5252

5353
private static final String CHAT_REQUEST_KEY = "chatRequest";
54+
private static final String TOPIC = "alert-topic";
5455

5556
// 요청을 Redis에 저장 (TTL: 60초)
5657
public ResponseResult saveRequestToRedis(Long requestUserId, Long emotionRecordId) {
@@ -98,7 +99,7 @@ public ResponseResult saveRequestToRedis(Long requestUserId, Long emotionRecordI
9899
.orElseThrow(UserNotFoundException::new);
99100
AlertChatRequest alertChatRequest = new AlertChatRequest(emotionRecordId, requestUser.getNickname());
100101
Alert alert = alertService.createAlert(responseUserId, "alarm", alertChatRequest);
101-
kafkaProducer.send("alert-topic", alert);
102+
kafkaProducer.send(TOPIC, alert);
102103

103104
return new ResponseResult(ErrorCode.SUCCESS);
104105
} catch (EmotionRecordNotFoundException e) {
@@ -124,7 +125,7 @@ public ResponseResult deleteRequestFromRedis(Long userId, Long emotionRecordId)
124125
if (Boolean.TRUE.equals(redisTemplate.hasKey(key))) {
125126
redisTemplate.delete(key);
126127
Alert alert = alertService.createAlert(recordIdInUserId, "cancel", "Chat request has been canceled.");
127-
kafkaProducer.send("alert-topic", alert);
128+
kafkaProducer.send(TOPIC, alert);
128129
log.info("tset");
129130
return new ResponseResult(ErrorCode.SUCCESS);
130131
} else {
@@ -160,7 +161,7 @@ public ResponseResult requestRejected(Long responseUserId, ChatRejectDto chatRej
160161
if (Boolean.TRUE.equals(redisTemplate.hasKey(key))) {
161162
redisTemplate.delete(key);
162163
Alert alert = alertService.createAlert(requestUserId, "fail", "채팅 요청을 거부했습니다");
163-
kafkaProducer.send("alert-topic", alert);
164+
kafkaProducer.send(TOPIC, alert);
164165
return new ResponseResult(ErrorCode.SUCCESS);
165166
} else {
166167
return new ResponseResult(400, "ChatRequest not found or expired.");
@@ -210,7 +211,7 @@ public ResponseResult createChatRoom(Long userId, Long recordId, String requestN
210211
Map<String, Object> map = new HashMap<>();
211212
map.put("chatRoomId", chatRoomId.get());
212213
Alert alert = alertService.createAlert(requestUserId, "accept", map);
213-
kafkaProducer.send("alert-topic", alert);
214+
kafkaProducer.send(TOPIC, alert);
214215
return new ResponseResult(map);
215216
}
216217

@@ -238,7 +239,7 @@ public ResponseResult createChatRoom(Long userId, Long recordId, String requestN
238239

239240
// 요청자에게 방번호를 보냄
240241
Alert alert = alertService.createAlert(requestUserId, "accept", map);
241-
kafkaProducer.send("alert-topic", alert);
242+
kafkaProducer.send(TOPIC, alert);
242243

243244
return new ResponseResult(map);
244245
} else {

0 commit comments

Comments
 (0)