Merge pull request #55 from SKU-Homepage/feature/53

✨ 키워드 관련 api 개발

Author: kssosoy

src/main/java/org/example/skuhomepage/domain/firebase/controller/FCMController.java

@@ -58,13 +58,14 @@ public ApiResponse<Void> topicRegister(TopicRequestDTO topicReq, CustomUserDetai
   }
 
   @Override
-  public ApiResponse<Void> topicDelete(String keyword, CustomUserDetails userDetails) {
-    keywordService.deleteKeyword(keyword, userDetails);
+  public ApiResponse<Void> topicDelete(Long keywordId, CustomUserDetails userDetails) {
+    keywordService.deleteKeyword(keywordId, userDetails);
     return ApiResponse.onSuccess(null);
   }
-  //
-  //  @Override
-  //  public ApiResponse<Void> topicList(TopicGroup topicGroup, CustomUserDetails userDetails) {
-  //    return ApiResponse.onSuccess(null);
-  //  }
+
+  @Override
+  public ApiResponse<NotificationResponseDTO.keywordDTO> topicList(CustomUserDetails userDetails) {
+    NotificationResponseDTO.keywordDTO result = keywordService.getUserKeywords(userDetails);
+    return ApiResponse.onSuccess(result);
+  }
 }

src/main/java/org/example/skuhomepage/domain/firebase/controller/FCMControllerSpec.java

@@ -9,6 +9,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 @Tag(name = "알림", description = "FCM 알림 관련 API")
@@ -40,16 +41,15 @@ ApiResponse<Void> topicRegister(
       @RequestBody TopicRequestDTO keywordReq,
       @AuthenticationPrincipal CustomUserDetails userDetails);
 
-  @DeleteMapping("/keyword")
+  @DeleteMapping("/keyword/{keywordId}")
   @Operation(summary = "키워드 삭제", description = "키워드를 삭제하는 API")
   ApiResponse<Void> topicDelete(
-      @RequestBody String keyword, @AuthenticationPrincipal CustomUserDetails userDetails);
-
-  //  @GetMapping("/keyword")
-  //  @Operation(summary = "키워드 조회", description = "키워드를 조회하는 API")
-  //  ApiResponse<Void> topicList(
-  //      @Parameter(description = "주제", example = "SKU_NOTICE", required = true) @RequestParam
-  //          TopicGroup topicGroup,
-  //      @Parameter(description = "사용자 정보", hidden = true) @AuthenticationPrincipal
-  //          CustomUserDetails userDetails);
+      @Parameter(description = "삭제할 키워드", example = "1") @PathVariable Long keywordId,
+      @AuthenticationPrincipal CustomUserDetails userDetails);
+
+  @GetMapping("/keyword")
+  @Operation(summary = "키워드 조회", description = "키워드를 조회하는 API")
+  ApiResponse<NotificationResponseDTO.keywordDTO> topicList(
+      @Parameter(description = "사용자 정보", hidden = true) @AuthenticationPrincipal
+          CustomUserDetails userDetails);
 }

src/main/java/org/example/skuhomepage/domain/firebase/dto/NotificationRequestDTO.java

@@ -0,0 +1,14 @@
+package org.example.skuhomepage.domain.firebase.dto;
+
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+public class NotificationRequestDTO {
+  @Getter
+  @AllArgsConstructor
+  public static class AddSubjectDTO {
+    private List<Long> subjectIds;
+  }
+}

src/main/java/org/example/skuhomepage/domain/firebase/dto/NotificationResponseDTO.java

@@ -22,5 +22,7 @@ public record keywordDTO(
       @ArraySchema(
               schema = @Schema(implementation = UserKeyword.class),
               arraySchema = @Schema(description = "키워드 리스트"))
-          List<UserKeyword> userKeywordList) {}
+          List<UserKeywordDTO> userKeywordList) {}
+
+  public record UserKeywordDTO(@Schema(description = "키워드", example = "대학혁신") String name) {}
 }

src/main/java/org/example/skuhomepage/domain/firebase/entity/UserKeyword.java

@@ -4,7 +4,6 @@
 
 import org.example.skuhomepage.domain.mypage.entity.User;
 import org.example.skuhomepage.global.common.BaseTimeEntity;
-import org.example.skuhomepage.global.enums.TopicGroup;
 
 import lombok.*;
 
@@ -23,6 +22,6 @@ public class UserKeyword extends BaseTimeEntity {
   @Column(nullable = false)
   private String keyword;
 
-  @Column(nullable = false)
-  private TopicGroup topicGroup;
+  //  @Column(nullable = false)
+  //  private TopicGroup topicGroup;
 }

src/main/java/org/example/skuhomepage/domain/firebase/repository/UserKeywordRepository.java

@@ -6,11 +6,15 @@
 import org.example.skuhomepage.domain.firebase.entity.UserKeyword;
 import org.example.skuhomepage.domain.mypage.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface UserKeywordRepository extends JpaRepository<UserKeyword, Long> {
   boolean existsByUserAndKeyword(User user, String keyword);
 
   List<UserKeyword> findAllByUser(User user);
 
-  Optional<UserKeyword> findByUserAndKeyword(User user, String keyword);
+  @Query("SELECT us FROM UserKeyword us WHERE us.user = :user AND us.id = :keywordId")
+  Optional<UserKeyword> findByUserAndKeywordId(
+      @Param("user") User user, @Param("keywordId") Long keywordId);
 }

src/main/java/org/example/skuhomepage/domain/firebase/service/KeywordService.java

@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.example.skuhomepage.domain.firebase.dto.NotificationResponseDTO;
 import org.example.skuhomepage.domain.firebase.dto.TopicRequestDTO;
 import org.example.skuhomepage.domain.firebase.entity.UserKeyword;
 import org.example.skuhomepage.domain.firebase.exception.FirebaseErrorStatus;
@@ -34,30 +35,39 @@ public void registerKeyword(TopicRequestDTO request, UserDetails userDetails) {
       throw new GeneralException(FirebaseErrorStatus.KEYWORD_NOT_VALID);
     }
 
-    UserKeyword keyword = UserKeyword.builder().user(user).keyword(request.getKeyword()).build();
+    UserKeyword keyword =
+        UserKeyword.builder()
+            .user(user)
+            .keyword(request.getKeyword())
+            // .topicGroup(TopicGroup.COMMON)
+            .build();
 
     keywordRepository.save(keyword);
   }
 
-  public List<String> getUserKeywords(UserDetails userDetails) {
+  public NotificationResponseDTO.keywordDTO getUserKeywords(UserDetails userDetails) {
     User user =
         userRepository
             .findByAccount(userDetails.getUsername())
             .orElseThrow(() -> new GeneralException(MyPageErrorStatus.USER_NOT_FOUND));
 
     List<UserKeyword> keywords = keywordRepository.findAllByUser(user);
-    return keywords.stream().map(UserKeyword::getKeyword).collect(Collectors.toList());
+    List<NotificationResponseDTO.UserKeywordDTO> dtos =
+        keywords.stream()
+            .map(keyword -> new NotificationResponseDTO.UserKeywordDTO(keyword.getKeyword()))
+            .collect(Collectors.toList());
+    return new NotificationResponseDTO.keywordDTO(dtos);
   }
 
-  public void deleteKeyword(String keywordToDelete, UserDetails userDetails) {
+  public void deleteKeyword(Long keywordId, UserDetails userDetails) {
     User user =
         userRepository
             .findByAccount(userDetails.getUsername())
             .orElseThrow(() -> new GeneralException(MyPageErrorStatus.USER_NOT_FOUND));
 
     UserKeyword keyword =
         keywordRepository
-            .findByUserAndKeyword(user, keywordToDelete)
+            .findByUserAndKeywordId(user, keywordId)
             .orElseThrow(() -> new GeneralException(FirebaseErrorStatus.KEYWORD_NOT_FOUND));
 
     keywordRepository.delete(keyword);