Merge pull request #47 from Today-s-Sound/refactor/#41-test1

[refactor] #41 PathVariable 오류 수정

Author: DOHOON0127

src/main/java/com/todaysound/todaysound_server/domain/alarm/controller/InternalAlertController.java

@@ -6,6 +6,7 @@
 import com.todaysound.todaysound_server.domain.subscription.repository.SubscriptionRepository;
 import com.todaysound.todaysound_server.global.exception.BaseException;
 import com.todaysound.todaysound_server.global.exception.CommonErrorCode;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -37,33 +38,39 @@ public class InternalAlertController implements InternalAlertApi {
 
     @PostMapping("/alerts")
     public void createAlert(@RequestBody InternalAlertRequest request) {
-        Subscription subscription = subscriptionRepository.findById(request.subscription_id())
+        Subscription subscription = subscriptionRepository.findById(request.subscriptionId())
                 .orElseThrow(() -> BaseException.type(CommonErrorCode.ENTITY_NOT_FOUND));
 
-        // 간단한 소유자 검증 (user_id 가 다르면 거부)
-        if (!subscription.getUser().getId().equals(request.user_id())) {
+        // 간단한 소유자 검증 (userId 가 다르면 거부)
+        if (!subscription.getUser().getId().equals(request.userId())) {
             throw BaseException.type(CommonErrorCode.FORBIDDEN);
         }
 
-        // site_post_id 를 해시 키로 사용
+        // sitePostId 를 해시 키로 사용
         Summary summary = Summary.create(
-                request.site_post_id(),
-                request.content_summary(),
+                request.sitePostId(),
+                request.title(),
+                request.contentSummary(),
+                request.url(),
+                request.publishedAt(),
                 subscription
         );
 
         summaryRepository.save(summary);
     }
 
     public record InternalAlertRequest(
-            Long user_id,
-            Long subscription_id,
-            String site_post_id,
-            String title,
-            String url,
-            String content_raw,
-            String content_summary,
-            boolean is_urgent
+            @JsonProperty("user_id") Long userId,
+            @JsonProperty("subscription_id") Long subscriptionId,
+            @JsonProperty("site_post_id") String sitePostId,
+            @JsonProperty("site_alias") String siteAlias,
+            @JsonProperty("title") String title,
+            @JsonProperty("url") String url,
+            @JsonProperty("published_at") String publishedAt,
+            @JsonProperty("content_raw") String contentRaw,
+            @JsonProperty("content_summary") String contentSummary,
+            @JsonProperty("is_urgent") boolean isUrgent,
+            @JsonProperty("keyword_matched") boolean keywordMatched
     ) {
     }
 }

src/main/java/com/todaysound/todaysound_server/domain/subscription/controller/InternalSubscriptionController.java

@@ -40,7 +40,7 @@ public List<InternalSubscriptionResponseDto> getSubscriptions() {
     @PatchMapping("/subscriptions/{id}/last_seen")
     @Transactional
     public void updateLastSeenPostId(
-            @PathVariable Long id,
+            @PathVariable("id") Long id,
             @RequestBody UpdateLastSeenPostRequest request
     ) {
         Subscription subscription = subscriptionRepository.findById(id)

src/main/java/com/todaysound/todaysound_server/domain/summary/entity/Summary.java

@@ -29,6 +29,12 @@ public class Summary extends BaseEntity {
     @Column(name = "title", nullable = false)
     private String title;
 
+    @Column(name = "post_url", nullable = false)
+    private String postUrl;
+
+    @Column(name = "post_date")
+    private String postDate;
+
     @Column(name = "is_read", nullable = false)
     private boolean isRead;
 
@@ -43,10 +49,15 @@ public class Summary extends BaseEntity {
     private Subscription subscription;
 
     // Summary 생성 팩토리 메서드
-    public static Summary create(String hash, String content, Subscription subscription) {
+    public static Summary create(String hash, String title, String content,
+            String postUrl, String postDate,
+            Subscription subscription) {
         Summary summary = new Summary();
         summary.hash = hash;
+        summary.title = title;
         summary.content = content;
+        summary.postUrl = postUrl;
+        summary.postDate = postDate;
         summary.isRead = false;
         summary.createdAt = LocalDateTime.now();
         summary.updatedAt = LocalDateTime.now();

src/main/resources/application-local.yml

@@ -1,8 +1,12 @@
 spring:
   datasource:
-    url: ${DB_URL}
-    username: ${DB_USERNAME}
-    password: ${DB_PASSWORD}
+    # url: ${DB_URL}
+    # username: ${DB_USERNAME}
+    # password: ${DB_PASSWORD}
+
+    url: jdbc:mysql://localhost:3306/today_sound_local?serverTimezone=Asia/Seoul
+    username: root
+    password: 1234
 
     driver-class-name: com.mysql.cj.jdbc.Driver