Merge pull request #153 from FOREGG-DEV/dev

♻️ refactor: 지원금 Res 수정 및 스웨거 tag name 추가
FOREGG-DEV · Sep 4, 2024 · f6e9fe9 · f6e9fe9
2 parents 0400ae7 + ca4837d
commit f6e9fe9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/src/main/java/foregg/foreggserver/controller/SubsidyController.java b/src/main/java/foregg/foreggserver/controller/SubsidyController.java
@@ -7,13 +7,15 @@
 import foregg.foreggserver.service.subsidyService.SubsidyService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/subsidy")
+@Tag(name = "지원금 API")
 public class SubsidyController {
 
     private final SubsidyService subsidyService;

diff --git a/src/main/java/foregg/foreggserver/converter/SubsidyConverter.java b/src/main/java/foregg/foreggserver/converter/SubsidyConverter.java
@@ -29,6 +29,7 @@ public static SubsidyResponseDTO toDetailResponseDTO(String period, List<Subsidy
             SubsidyResponseDTO.SubsidyDetailResponseDTO result = SubsidyResponseDTO.SubsidyDetailResponseDTO.builder()
                     .id(ss.getId())
                     .nickname(ss.getNickname())
+                    .color(ss.getColor())
                     .amount(ss.getAmount())
                     .expenditure(ss.getExpenditure())
                     .available(ss.getAvailable())

diff --git a/src/main/java/foregg/foreggserver/dto/subsidyDTO/SubsidyResponseDTO.java b/src/main/java/foregg/foreggserver/dto/subsidyDTO/SubsidyResponseDTO.java
@@ -1,5 +1,6 @@
 package foregg.foreggserver.dto.subsidyDTO;
 
+import foregg.foreggserver.domain.enums.SubsidyColorType;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -23,6 +24,7 @@ public class SubsidyResponseDTO {
     public static class SubsidyDetailResponseDTO {
         private Long id;
         private String nickname;
+        private SubsidyColorType color;
         private int amount;
         private int expenditure;
         private int available;