Merge pull request #217 from twenty-three-23/feature/TT-271

TT-271

src/main/java/com/twentythree/peech/usagetime/controller/SwaggerUsageTimeController.java

@@ -3,6 +3,7 @@
 import com.twentythree.peech.auth.dto.LoginUserId;
 import com.twentythree.peech.auth.dto.UserIdDTO;
 import com.twentythree.peech.usagetime.dto.response.CheckRemainingTimeResponseDTO;
+import com.twentythree.peech.usagetime.dto.response.MaxAudioTimeResponseDTO;
 import com.twentythree.peech.usagetime.dto.response.TextAndSecondTimeResponseDTO;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -15,6 +16,7 @@ public interface SwaggerUsageTimeController {
     @GetMapping("api/v1/usage-time")
     TextAndSecondTimeResponseDTO getUsageTime(@LoginUserId UserIdDTO userId);
 
-    TextAndSecondTimeResponseDTO getMaxAudioTime();
+    @GetMapping("api/v1/max-audio-time")
+    MaxAudioTimeResponseDTO getMaxAudioTime();
 
 }

src/main/java/com/twentythree/peech/usagetime/controller/UsageTimeController.java

@@ -2,6 +2,7 @@
 
 import com.twentythree.peech.auth.dto.UserIdDTO;
 import com.twentythree.peech.usagetime.dto.response.CheckRemainingTimeResponseDTO;
+import com.twentythree.peech.usagetime.dto.response.MaxAudioTimeResponseDTO;
 import com.twentythree.peech.usagetime.dto.response.TextAndSecondTimeResponseDTO;
 import com.twentythree.peech.usagetime.service.UsageTimeService;
 import lombok.RequiredArgsConstructor;
@@ -29,7 +30,7 @@ public TextAndSecondTimeResponseDTO getUsageTime(UserIdDTO userId) {
 
     @Override
     @GetMapping("api/v1/max-audio-time")
-    public TextAndSecondTimeResponseDTO getMaxAudioTime() {
+    public MaxAudioTimeResponseDTO getMaxAudioTime() {
         return usageTimeService.getMaxAudioTime();
     }
 }

src/main/java/com/twentythree/peech/usagetime/dto/RemainingTimeDTO.java → src/main/java/com/twentythree/peech/usagetime/dto/TextAndSecondDTO.java

@@ -5,7 +5,7 @@
 import lombok.Setter;
 
 @Getter @Setter @AllArgsConstructor
-public class RemainingTimeDTO {
+public class TextAndSecondDTO {
 
     private String text;
     private Long second;

src/main/java/com/twentythree/peech/usagetime/dto/response/MaxAudioTimeResponseDTO.java

@@ -0,0 +1,15 @@
+package com.twentythree.peech.usagetime.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.twentythree.peech.usagetime.dto.TextAndSecondDTO;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter @Setter @AllArgsConstructor
+public class MaxAudioTimeResponseDTO {
+
+    private TextAndSecondDTO maxAudioTime;
+}
+

src/main/java/com/twentythree/peech/usagetime/dto/response/TextAndSecondTimeResponseDTO.java

@@ -1,11 +1,14 @@
 package com.twentythree.peech.usagetime.dto.response;
 
-import com.twentythree.peech.usagetime.dto.RemainingTimeDTO;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.twentythree.peech.usagetime.dto.TextAndSecondDTO;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter @Setter @AllArgsConstructor
 public class TextAndSecondTimeResponseDTO {
-    private RemainingTimeDTO remainingTime;
+
+    private TextAndSecondDTO remainingTime;
 }

src/main/java/com/twentythree/peech/usagetime/service/UsageTimeService.java

@@ -3,8 +3,9 @@
 import com.twentythree.peech.common.utils.ScriptUtils;
 import com.twentythree.peech.usagetime.constant.ConstantValue;
 import com.twentythree.peech.usagetime.domain.UsageTimeEntity;
-import com.twentythree.peech.usagetime.dto.RemainingTimeDTO;
+import com.twentythree.peech.usagetime.dto.TextAndSecondDTO;
 import com.twentythree.peech.usagetime.dto.response.CheckRemainingTimeResponseDTO;
+import com.twentythree.peech.usagetime.dto.response.MaxAudioTimeResponseDTO;
 import com.twentythree.peech.usagetime.dto.response.TextAndSecondTimeResponseDTO;
 import com.twentythree.peech.usagetime.repository.UsageTimeRepository;
 import lombok.RequiredArgsConstructor;
@@ -92,7 +93,7 @@ public TextAndSecondTimeResponseDTO getUsageTime(Long userId) {
 
         remainingTimeToText = remainingTimeToText.trim();
 
-        return new TextAndSecondTimeResponseDTO(new RemainingTimeDTO(remainingTimeToText, remainingTimeToSecond));
+        return new TextAndSecondTimeResponseDTO(new TextAndSecondDTO(remainingTimeToText, remainingTimeToSecond));
     }
 
     public CheckRemainingTimeResponseDTO checkRemainingTime(Long userId, Long audioTime) {
@@ -102,7 +103,7 @@ public CheckRemainingTimeResponseDTO checkRemainingTime(Long userId, Long audioT
         return (remainingTime >= audioTime) ? new CheckRemainingTimeResponseDTO("성공") : new CheckRemainingTimeResponseDTO("사용 시간이 부족합니다.");
     }
 
-    public TextAndSecondTimeResponseDTO getMaxAudioTime() {
+    public MaxAudioTimeResponseDTO getMaxAudioTime() {
         Long maxAudioTimeToSecond = ConstantValue.MAX_AUDIO_TIME;
         LocalTime maxAudioTimeToLocalTime = ScriptUtils.transferSeoondToLocalTime(maxAudioTimeToSecond);
 
@@ -124,6 +125,6 @@ public TextAndSecondTimeResponseDTO getMaxAudioTime() {
 
         maxAudioTimeToText = maxAudioTimeToText.trim();
 
-        return new TextAndSecondTimeResponseDTO(new RemainingTimeDTO(maxAudioTimeToText, maxAudioTimeToSecond));
+        return new MaxAudioTimeResponseDTO(new TextAndSecondDTO(maxAudioTimeToText, maxAudioTimeToSecond));
     }
 }