Merge pull request #36 from ThisIsComedy/feat/#33

잔디 가져오기 응답 형식 변경

src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/application/SmokeGetService.java

@@ -3,6 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import thisiscomedy.nodamnodam.server.domain.smoke.presentation.dto.response.GrassGetResponse;
+import thisiscomedy.nodamnodam.server.domain.smoke.presentation.dto.response.UserSmokedAtResponse;
 import thisiscomedy.nodamnodam.server.domain.smoke.presentation.dto.response.SmokeCauseResponse;
 import thisiscomedy.nodamnodam.server.domain.smoke.repository.SmokeRepository;
 import thisiscomedy.nodamnodam.server.domain.user.application.UserGetService;
@@ -17,12 +18,17 @@ public class SmokeGetService {
     private final SmokeRepository smokeRepository;
     private final UserGetService userGetService;
 
-    public List<GrassGetResponse> getGrass() {
+    public GrassGetResponse getGrass() {
         User user = userGetService.getUser();
 
-        return smokeRepository.findByUser(user).stream()
-                .map(GrassGetResponse::new)
+        List<UserSmokedAtResponse> smoked = smokeRepository.findByUser(user).stream()
+                .map(UserSmokedAtResponse::new)
                 .toList();
+
+        return new GrassGetResponse(
+                user.getCreatedAt(),
+                smoked
+        );
     }
 
     public SmokeCauseResponse getCauseStats() {

src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/presentation/SmokeController.java

@@ -8,8 +8,6 @@
 import thisiscomedy.nodamnodam.server.domain.smoke.presentation.dto.request.SmokeRequest;
 import thisiscomedy.nodamnodam.server.domain.smoke.presentation.dto.response.GrassGetResponse;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/api/smoke")
 @RequiredArgsConstructor
@@ -19,7 +17,7 @@ public class SmokeController {
     private final SmokeSaveService smokeSaveService;
 
     @GetMapping
-    public ResponseEntity<List<GrassGetResponse>> getGrass() {
+    public ResponseEntity<GrassGetResponse> getGrass() {
         return ResponseEntity.ok(smokeGetService.getGrass());
     }
 

src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/presentation/dto/response/GrassGetResponse.java

@@ -1,16 +1,9 @@
 package thisiscomedy.nodamnodam.server.domain.smoke.presentation.dto.response;
 
-import lombok.Getter;
-import thisiscomedy.nodamnodam.server.domain.smoke.domain.Smoke;
-
 import java.time.LocalDate;
+import java.util.List;
 
-@Getter
-public class GrassGetResponse {
-
-    private final LocalDate at;
-
-    public GrassGetResponse(Smoke smoke) {
-        this.at = smoke.getCreatedAt();
-    }
-}
+public record GrassGetResponse(
+        LocalDate userCreatedAt,
+        List<UserSmokedAtResponse> userSmokedAtResponses
+) {}

src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/presentation/dto/response/UserSmokedAtResponse.java

@@ -0,0 +1,13 @@
+package thisiscomedy.nodamnodam.server.domain.smoke.presentation.dto.response;
+
+import thisiscomedy.nodamnodam.server.domain.smoke.domain.Smoke;
+
+import java.time.LocalDate;
+
+public record UserSmokedAtResponse(
+        LocalDate at
+) {
+    public UserSmokedAtResponse(Smoke smoke) {
+        this(smoke.getCreatedAt());
+    }
+}

src/main/java/thisiscomedy/nodamnodam/server/domain/stats/application/StatsGetService.java

@@ -47,13 +47,13 @@ public StatsResponse getDetails() {
                 .map(StatsGetDetailsResponse::new)
                 .orElse(null);
 
-        List<GrassGetResponse> grassGetResponse = smokeGetService.getGrass();
+        GrassGetResponse userSmokedAtResponse = smokeGetService.getGrass();
 
         SmokeCauseResponse smokeCauseResponse = smokeGetService.getCauseStats();
 
         return new StatsResponse(
                 detailsResponse,
-                grassGetResponse,
+                userSmokedAtResponse.userSmokedAtResponses(),
                 smokeCauseResponse
         );
     }

src/main/java/thisiscomedy/nodamnodam/server/domain/stats/presentation/dto/response/StatsResponse.java

@@ -1,13 +1,13 @@
 package thisiscomedy.nodamnodam.server.domain.stats.presentation.dto.response;
 
-import thisiscomedy.nodamnodam.server.domain.smoke.presentation.dto.response.GrassGetResponse;
+import thisiscomedy.nodamnodam.server.domain.smoke.presentation.dto.response.UserSmokedAtResponse;
 import thisiscomedy.nodamnodam.server.domain.smoke.presentation.dto.response.SmokeCauseResponse;
 
 import java.util.List;
 
 public record StatsResponse(
         StatsGetDetailsResponse response,
-        List<GrassGetResponse> grass,
+        List<UserSmokedAtResponse> grass,
         SmokeCauseResponse smokeCause
 ) {
 }