From 9847c49a90a8668a3c48aee5b6f829548e4c56e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=A7=88=ED=98=84=EC=9A=B0?= Date: Mon, 27 Nov 2023 15:46:08 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=EC=9E=94=EB=94=94=20=EC=9D=91?= =?UTF-8?q?=EB=8B=B5=20dto=20record=EB=A1=9C=20=EB=A6=AC=ED=8C=A9=ED=86=A0?= =?UTF-8?q?=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/dto/response/GrassGetResponse.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/presentation/dto/response/GrassGetResponse.java b/src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/presentation/dto/response/GrassGetResponse.java index a0cac73..b6b77dd 100644 --- a/src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/presentation/dto/response/GrassGetResponse.java +++ b/src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/presentation/dto/response/GrassGetResponse.java @@ -1,16 +1,13 @@ package thisiscomedy.nodamnodam.server.domain.smoke.presentation.dto.response; -import lombok.Getter; import thisiscomedy.nodamnodam.server.domain.smoke.domain.Smoke; import java.time.LocalDate; -@Getter -public class GrassGetResponse { - - private final LocalDate at; - +public record GrassGetResponse( + LocalDate at +) { public GrassGetResponse(Smoke smoke) { - this.at = smoke.getCreatedAt(); + this(smoke.getCreatedAt()); } -} +} \ No newline at end of file From 656b8a8c520c83ba2be88cf9314e8f405231ed8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=A7=88=ED=98=84=EC=9A=B0?= Date: Mon, 27 Nov 2023 16:48:36 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=EC=9E=94=EB=94=94=20=EA=B0=80?= =?UTF-8?q?=EC=A0=B8=EC=98=A4=EA=B8=B0=20=EC=9D=91=EB=8B=B5=20=ED=98=95?= =?UTF-8?q?=EC=8B=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/smoke/application/SmokeGetService.java | 12 +++++++++--- .../domain/smoke/presentation/SmokeController.java | 4 +--- .../presentation/dto/response/GrassGetResponse.java | 12 ++++-------- .../dto/response/UserSmokedAtResponse.java | 13 +++++++++++++ .../domain/stats/application/StatsGetService.java | 4 ++-- .../presentation/dto/response/StatsResponse.java | 4 ++-- 6 files changed, 31 insertions(+), 18 deletions(-) create mode 100644 src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/presentation/dto/response/UserSmokedAtResponse.java diff --git a/src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/application/SmokeGetService.java b/src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/application/SmokeGetService.java index f225a63..8470e73 100644 --- a/src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/application/SmokeGetService.java +++ b/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 getGrass() { + public GrassGetResponse getGrass() { User user = userGetService.getUser(); - return smokeRepository.findByUser(user).stream() - .map(GrassGetResponse::new) + List smoked = smokeRepository.findByUser(user).stream() + .map(UserSmokedAtResponse::new) .toList(); + + return new GrassGetResponse( + user.getCreatedAt(), + smoked + ); } public SmokeCauseResponse getCauseStats() { diff --git a/src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/presentation/SmokeController.java b/src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/presentation/SmokeController.java index db8fc40..7f45672 100644 --- a/src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/presentation/SmokeController.java +++ b/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> getGrass() { + public ResponseEntity getGrass() { return ResponseEntity.ok(smokeGetService.getGrass()); } diff --git a/src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/presentation/dto/response/GrassGetResponse.java b/src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/presentation/dto/response/GrassGetResponse.java index b6b77dd..769e10f 100644 --- a/src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/presentation/dto/response/GrassGetResponse.java +++ b/src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/presentation/dto/response/GrassGetResponse.java @@ -1,13 +1,9 @@ package thisiscomedy.nodamnodam.server.domain.smoke.presentation.dto.response; -import thisiscomedy.nodamnodam.server.domain.smoke.domain.Smoke; - import java.time.LocalDate; +import java.util.List; public record GrassGetResponse( - LocalDate at -) { - public GrassGetResponse(Smoke smoke) { - this(smoke.getCreatedAt()); - } -} \ No newline at end of file + LocalDate userCreatedAt, + List userSmokedAtResponses +) {} diff --git a/src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/presentation/dto/response/UserSmokedAtResponse.java b/src/main/java/thisiscomedy/nodamnodam/server/domain/smoke/presentation/dto/response/UserSmokedAtResponse.java new file mode 100644 index 0000000..48a4b3f --- /dev/null +++ b/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()); + } +} \ No newline at end of file diff --git a/src/main/java/thisiscomedy/nodamnodam/server/domain/stats/application/StatsGetService.java b/src/main/java/thisiscomedy/nodamnodam/server/domain/stats/application/StatsGetService.java index 746b0f3..7426442 100644 --- a/src/main/java/thisiscomedy/nodamnodam/server/domain/stats/application/StatsGetService.java +++ b/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 = smokeGetService.getGrass(); + GrassGetResponse userSmokedAtResponse = smokeGetService.getGrass(); SmokeCauseResponse smokeCauseResponse = smokeGetService.getCauseStats(); return new StatsResponse( detailsResponse, - grassGetResponse, + userSmokedAtResponse.userSmokedAtResponses(), smokeCauseResponse ); } diff --git a/src/main/java/thisiscomedy/nodamnodam/server/domain/stats/presentation/dto/response/StatsResponse.java b/src/main/java/thisiscomedy/nodamnodam/server/domain/stats/presentation/dto/response/StatsResponse.java index 1658b98..f9a700d 100644 --- a/src/main/java/thisiscomedy/nodamnodam/server/domain/stats/presentation/dto/response/StatsResponse.java +++ b/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 grass, + List grass, SmokeCauseResponse smokeCause ) { }