From 07ce6ecd45a581c6739ba829b74cee74f1b16ece Mon Sep 17 00:00:00 2001 From: ykh4663 Date: Sat, 31 Jan 2026 21:06:53 +0900 Subject: [PATCH 1/4] =?UTF-8?q?git=20commit=20-m=20"[BE]=20[REFACTOR]=20te?= =?UTF-8?q?mplate=20=ED=8C=A8=ED=82=A4=EC=A7=80=EB=A5=BC=20backtest=20?= =?UTF-8?q?=EB=8F=84=EB=A9=94=EC=9D=B8=20=ED=95=98=EC=9C=84=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B4=EA=B4=80"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TemplateController.java | 8 ++++---- .../{template => backtest}/dto/TemplateRequest.java | 2 +- .../{template => backtest}/dto/TemplateResponse.java | 4 ++-- .../sejongisc/backend/backtest/entity/BacktestRun.java | 2 -- .../{template => backtest}/entity/Template.java | 3 +-- .../entity/TemplateBookmark.java | 2 +- .../{template => backtest}/entity/TemplateLike.java | 2 +- .../repository/TemplateRepository.java | 4 ++-- .../backend/backtest/service/BacktestService.java | 4 ++-- .../service/TemplateService.java | 10 +++++----- .../backend/backtest/service/BacktestServiceTest.java | 4 ++-- .../template/controller/TemplateControllerTest.java | 9 +++++---- .../backend/template/service/TemplateServiceTest.java | 9 +++++---- 13 files changed, 31 insertions(+), 32 deletions(-) rename backend/src/main/java/org/sejongisc/backend/{template => backtest}/controller/TemplateController.java (93%) rename backend/src/main/java/org/sejongisc/backend/{template => backtest}/dto/TemplateRequest.java (94%) rename backend/src/main/java/org/sejongisc/backend/{template => backtest}/dto/TemplateResponse.java (74%) rename backend/src/main/java/org/sejongisc/backend/{template => backtest}/entity/Template.java (95%) rename backend/src/main/java/org/sejongisc/backend/{template => backtest}/entity/TemplateBookmark.java (93%) rename backend/src/main/java/org/sejongisc/backend/{template => backtest}/entity/TemplateLike.java (93%) rename backend/src/main/java/org/sejongisc/backend/{template => backtest}/repository/TemplateRepository.java (74%) rename backend/src/main/java/org/sejongisc/backend/{template => backtest}/service/TemplateService.java (90%) diff --git a/backend/src/main/java/org/sejongisc/backend/template/controller/TemplateController.java b/backend/src/main/java/org/sejongisc/backend/backtest/controller/TemplateController.java similarity index 93% rename from backend/src/main/java/org/sejongisc/backend/template/controller/TemplateController.java rename to backend/src/main/java/org/sejongisc/backend/backtest/controller/TemplateController.java index 46ecd842..e8ae69cb 100644 --- a/backend/src/main/java/org/sejongisc/backend/template/controller/TemplateController.java +++ b/backend/src/main/java/org/sejongisc/backend/backtest/controller/TemplateController.java @@ -1,12 +1,12 @@ -package org.sejongisc.backend.template.controller; +package org.sejongisc.backend.backtest.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.sejongisc.backend.common.auth.dto.CustomUserDetails; -import org.sejongisc.backend.template.dto.TemplateRequest; -import org.sejongisc.backend.template.dto.TemplateResponse; -import org.sejongisc.backend.template.service.TemplateService; +import org.sejongisc.backend.backtest.dto.TemplateRequest; +import org.sejongisc.backend.backtest.dto.TemplateResponse; +import org.sejongisc.backend.backtest.service.TemplateService; import org.springframework.http.ResponseEntity; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; diff --git a/backend/src/main/java/org/sejongisc/backend/template/dto/TemplateRequest.java b/backend/src/main/java/org/sejongisc/backend/backtest/dto/TemplateRequest.java similarity index 94% rename from backend/src/main/java/org/sejongisc/backend/template/dto/TemplateRequest.java rename to backend/src/main/java/org/sejongisc/backend/backtest/dto/TemplateRequest.java index d7a0f881..bffb80ad 100644 --- a/backend/src/main/java/org/sejongisc/backend/template/dto/TemplateRequest.java +++ b/backend/src/main/java/org/sejongisc/backend/backtest/dto/TemplateRequest.java @@ -1,4 +1,4 @@ -package org.sejongisc.backend.template.dto; +package org.sejongisc.backend.backtest.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/backend/src/main/java/org/sejongisc/backend/template/dto/TemplateResponse.java b/backend/src/main/java/org/sejongisc/backend/backtest/dto/TemplateResponse.java similarity index 74% rename from backend/src/main/java/org/sejongisc/backend/template/dto/TemplateResponse.java rename to backend/src/main/java/org/sejongisc/backend/backtest/dto/TemplateResponse.java index 0be5bc73..d16183de 100644 --- a/backend/src/main/java/org/sejongisc/backend/template/dto/TemplateResponse.java +++ b/backend/src/main/java/org/sejongisc/backend/backtest/dto/TemplateResponse.java @@ -1,9 +1,9 @@ -package org.sejongisc.backend.template.dto; +package org.sejongisc.backend.backtest.dto; import lombok.Builder; import lombok.Getter; import org.sejongisc.backend.backtest.entity.BacktestRun; -import org.sejongisc.backend.template.entity.Template; +import org.sejongisc.backend.backtest.entity.Template; import java.util.List; diff --git a/backend/src/main/java/org/sejongisc/backend/backtest/entity/BacktestRun.java b/backend/src/main/java/org/sejongisc/backend/backtest/entity/BacktestRun.java index 67c2198c..4d360996 100644 --- a/backend/src/main/java/org/sejongisc/backend/backtest/entity/BacktestRun.java +++ b/backend/src/main/java/org/sejongisc/backend/backtest/entity/BacktestRun.java @@ -5,12 +5,10 @@ import lombok.*; import org.hibernate.annotations.JdbcTypeCode; import org.hibernate.type.SqlTypes; -import org.sejongisc.backend.template.entity.Template; import org.sejongisc.backend.user.entity.User; import java.time.LocalDate; import java.time.LocalDateTime; -import java.time.OffsetDateTime; @Entity @Getter diff --git a/backend/src/main/java/org/sejongisc/backend/template/entity/Template.java b/backend/src/main/java/org/sejongisc/backend/backtest/entity/Template.java similarity index 95% rename from backend/src/main/java/org/sejongisc/backend/template/entity/Template.java rename to backend/src/main/java/org/sejongisc/backend/backtest/entity/Template.java index fa1e3976..0a532d19 100644 --- a/backend/src/main/java/org/sejongisc/backend/template/entity/Template.java +++ b/backend/src/main/java/org/sejongisc/backend/backtest/entity/Template.java @@ -1,11 +1,10 @@ -package org.sejongisc.backend.template.entity; +package org.sejongisc.backend.backtest.entity; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; import lombok.*; import org.sejongisc.backend.common.entity.postgres.BasePostgresEntity; -import org.sejongisc.backend.template.dto.TemplateRequest; import org.sejongisc.backend.user.entity.User; import java.util.UUID; diff --git a/backend/src/main/java/org/sejongisc/backend/template/entity/TemplateBookmark.java b/backend/src/main/java/org/sejongisc/backend/backtest/entity/TemplateBookmark.java similarity index 93% rename from backend/src/main/java/org/sejongisc/backend/template/entity/TemplateBookmark.java rename to backend/src/main/java/org/sejongisc/backend/backtest/entity/TemplateBookmark.java index effb9a2b..ce35130c 100644 --- a/backend/src/main/java/org/sejongisc/backend/template/entity/TemplateBookmark.java +++ b/backend/src/main/java/org/sejongisc/backend/backtest/entity/TemplateBookmark.java @@ -1,4 +1,4 @@ -package org.sejongisc.backend.template.entity; +package org.sejongisc.backend.backtest.entity; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/backend/src/main/java/org/sejongisc/backend/template/entity/TemplateLike.java b/backend/src/main/java/org/sejongisc/backend/backtest/entity/TemplateLike.java similarity index 93% rename from backend/src/main/java/org/sejongisc/backend/template/entity/TemplateLike.java rename to backend/src/main/java/org/sejongisc/backend/backtest/entity/TemplateLike.java index 6438b479..18921656 100644 --- a/backend/src/main/java/org/sejongisc/backend/template/entity/TemplateLike.java +++ b/backend/src/main/java/org/sejongisc/backend/backtest/entity/TemplateLike.java @@ -1,4 +1,4 @@ -package org.sejongisc.backend.template.entity; +package org.sejongisc.backend.backtest.entity; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/backend/src/main/java/org/sejongisc/backend/template/repository/TemplateRepository.java b/backend/src/main/java/org/sejongisc/backend/backtest/repository/TemplateRepository.java similarity index 74% rename from backend/src/main/java/org/sejongisc/backend/template/repository/TemplateRepository.java rename to backend/src/main/java/org/sejongisc/backend/backtest/repository/TemplateRepository.java index 60cb5f74..173e2e22 100644 --- a/backend/src/main/java/org/sejongisc/backend/template/repository/TemplateRepository.java +++ b/backend/src/main/java/org/sejongisc/backend/backtest/repository/TemplateRepository.java @@ -1,6 +1,6 @@ -package org.sejongisc.backend.template.repository; +package org.sejongisc.backend.backtest.repository; -import org.sejongisc.backend.template.entity.Template; +import org.sejongisc.backend.backtest.entity.Template; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/backend/src/main/java/org/sejongisc/backend/backtest/service/BacktestService.java b/backend/src/main/java/org/sejongisc/backend/backtest/service/BacktestService.java index 2994a92e..d5e52fb7 100644 --- a/backend/src/main/java/org/sejongisc/backend/backtest/service/BacktestService.java +++ b/backend/src/main/java/org/sejongisc/backend/backtest/service/BacktestService.java @@ -14,8 +14,8 @@ import org.sejongisc.backend.common.exception.CustomException; import org.sejongisc.backend.common.exception.ErrorCode; import org.sejongisc.backend.stock.repository.PriceDataRepository; -import org.sejongisc.backend.template.entity.Template; -import org.sejongisc.backend.template.repository.TemplateRepository; +import org.sejongisc.backend.backtest.entity.Template; +import org.sejongisc.backend.backtest.repository.TemplateRepository; import org.sejongisc.backend.user.repository.UserRepository; import org.sejongisc.backend.user.entity.User; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/org/sejongisc/backend/template/service/TemplateService.java b/backend/src/main/java/org/sejongisc/backend/backtest/service/TemplateService.java similarity index 90% rename from backend/src/main/java/org/sejongisc/backend/template/service/TemplateService.java rename to backend/src/main/java/org/sejongisc/backend/backtest/service/TemplateService.java index 5000bddd..c8e30083 100644 --- a/backend/src/main/java/org/sejongisc/backend/template/service/TemplateService.java +++ b/backend/src/main/java/org/sejongisc/backend/backtest/service/TemplateService.java @@ -1,4 +1,4 @@ -package org.sejongisc.backend.template.service; +package org.sejongisc.backend.backtest.service; import lombok.RequiredArgsConstructor; @@ -6,10 +6,10 @@ import org.sejongisc.backend.backtest.repository.BacktestRunRepository; import org.sejongisc.backend.common.exception.CustomException; import org.sejongisc.backend.common.exception.ErrorCode; -import org.sejongisc.backend.template.dto.TemplateRequest; -import org.sejongisc.backend.template.dto.TemplateResponse; -import org.sejongisc.backend.template.entity.Template; -import org.sejongisc.backend.template.repository.TemplateRepository; +import org.sejongisc.backend.backtest.dto.TemplateRequest; +import org.sejongisc.backend.backtest.dto.TemplateResponse; +import org.sejongisc.backend.backtest.entity.Template; +import org.sejongisc.backend.backtest.repository.TemplateRepository; import org.sejongisc.backend.user.repository.UserRepository; import org.sejongisc.backend.user.entity.User; import org.springframework.stereotype.Service; diff --git a/backend/src/test/java/org/sejongisc/backend/backtest/service/BacktestServiceTest.java b/backend/src/test/java/org/sejongisc/backend/backtest/service/BacktestServiceTest.java index 2d6dde79..ee631452 100644 --- a/backend/src/test/java/org/sejongisc/backend/backtest/service/BacktestServiceTest.java +++ b/backend/src/test/java/org/sejongisc/backend/backtest/service/BacktestServiceTest.java @@ -14,8 +14,8 @@ import org.sejongisc.backend.backtest.repository.BacktestRunRepository; import org.sejongisc.backend.common.exception.CustomException; import org.sejongisc.backend.common.exception.ErrorCode; -import org.sejongisc.backend.template.entity.Template; -import org.sejongisc.backend.template.repository.TemplateRepository; +import org.sejongisc.backend.backtest.entity.Template; +import org.sejongisc.backend.backtest.repository.TemplateRepository; import org.sejongisc.backend.user.entity.User; import java.math.BigDecimal; diff --git a/backend/src/test/java/org/sejongisc/backend/template/controller/TemplateControllerTest.java b/backend/src/test/java/org/sejongisc/backend/template/controller/TemplateControllerTest.java index fc69ba0a..5352c768 100644 --- a/backend/src/test/java/org/sejongisc/backend/template/controller/TemplateControllerTest.java +++ b/backend/src/test/java/org/sejongisc/backend/template/controller/TemplateControllerTest.java @@ -3,13 +3,14 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.sejongisc.backend.backtest.controller.TemplateController; import org.sejongisc.backend.common.auth.dto.CustomUserDetails; import org.sejongisc.backend.common.config.security.SecurityConfig; import org.sejongisc.backend.common.auth.jwt.JwtParser; -import org.sejongisc.backend.template.dto.TemplateRequest; -import org.sejongisc.backend.template.dto.TemplateResponse; -import org.sejongisc.backend.template.entity.Template; -import org.sejongisc.backend.template.service.TemplateService; +import org.sejongisc.backend.backtest.dto.TemplateRequest; +import org.sejongisc.backend.backtest.dto.TemplateResponse; +import org.sejongisc.backend.backtest.entity.Template; +import org.sejongisc.backend.backtest.service.TemplateService; import org.sejongisc.backend.user.entity.Role; import org.sejongisc.backend.user.entity.User; import org.springframework.beans.factory.annotation.Autowired; diff --git a/backend/src/test/java/org/sejongisc/backend/template/service/TemplateServiceTest.java b/backend/src/test/java/org/sejongisc/backend/template/service/TemplateServiceTest.java index ded275e1..808a43c3 100644 --- a/backend/src/test/java/org/sejongisc/backend/template/service/TemplateServiceTest.java +++ b/backend/src/test/java/org/sejongisc/backend/template/service/TemplateServiceTest.java @@ -7,12 +7,13 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.sejongisc.backend.backtest.service.TemplateService; import org.sejongisc.backend.common.exception.CustomException; import org.sejongisc.backend.common.exception.ErrorCode; -import org.sejongisc.backend.template.dto.TemplateRequest; -import org.sejongisc.backend.template.dto.TemplateResponse; -import org.sejongisc.backend.template.entity.Template; -import org.sejongisc.backend.template.repository.TemplateRepository; +import org.sejongisc.backend.backtest.dto.TemplateRequest; +import org.sejongisc.backend.backtest.dto.TemplateResponse; +import org.sejongisc.backend.backtest.entity.Template; +import org.sejongisc.backend.backtest.repository.TemplateRepository; import org.sejongisc.backend.user.entity.User; import org.sejongisc.backend.user.repository.UserRepository; From ad7b59c19d1cdf8d435bcbe89e168fa5874d96d0 Mon Sep 17 00:00:00 2001 From: ykh4663 Date: Sat, 31 Jan 2026 21:29:37 +0900 Subject: [PATCH 2/4] =?UTF-8?q?git=20commit=20-m=20"[BE]=20[REFACTOR]=20Te?= =?UTF-8?q?mplateRequest,=20TemplateResponse=20Record=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20TemplateService=EC=9D=98=20createTemplate,=20updat?= =?UTF-8?q?eTemplate=20=EC=9D=B8=EC=9E=90=EC=97=90=20UUID=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TemplateController.java | 6 ++-- .../backend/backtest/dto/TemplateRequest.java | 31 +++++++------------ .../backtest/dto/TemplateResponse.java | 13 +++----- .../backtest/service/TemplateService.java | 14 ++++----- 4 files changed, 25 insertions(+), 39 deletions(-) diff --git a/backend/src/main/java/org/sejongisc/backend/backtest/controller/TemplateController.java b/backend/src/main/java/org/sejongisc/backend/backtest/controller/TemplateController.java index e8ae69cb..d1856802 100644 --- a/backend/src/main/java/org/sejongisc/backend/backtest/controller/TemplateController.java +++ b/backend/src/main/java/org/sejongisc/backend/backtest/controller/TemplateController.java @@ -53,8 +53,7 @@ public ResponseEntity getTemplateById(@PathVariable UUID templ ) public ResponseEntity createTemplate(@RequestBody TemplateRequest request, @AuthenticationPrincipal CustomUserDetails customUserDetail) { - request.setUserId(customUserDetail.getUserId()); - return ResponseEntity.ok(templateService.createTemplate(request)); + return ResponseEntity.ok(templateService.createTemplate(request, customUserDetail.getUserId())); } // 템플릿 수정 @@ -65,8 +64,7 @@ public ResponseEntity createTemplate(@RequestBody TemplateRequ ) public ResponseEntity updateTemplate(@RequestBody TemplateRequest request, @AuthenticationPrincipal CustomUserDetails customUserDetails) { - request.setUserId(customUserDetails.getUserId()); - return ResponseEntity.ok(templateService.updateTemplate(request)); + return ResponseEntity.ok(templateService.updateTemplate(request, customUserDetails.getUserId())); } // 템플릿 삭제 diff --git a/backend/src/main/java/org/sejongisc/backend/backtest/dto/TemplateRequest.java b/backend/src/main/java/org/sejongisc/backend/backtest/dto/TemplateRequest.java index bffb80ad..754b5c11 100644 --- a/backend/src/main/java/org/sejongisc/backend/backtest/dto/TemplateRequest.java +++ b/backend/src/main/java/org/sejongisc/backend/backtest/dto/TemplateRequest.java @@ -1,29 +1,20 @@ package org.sejongisc.backend.backtest.dto; + import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import org.sejongisc.backend.user.entity.User; import java.util.UUID; +public record TemplateRequest( + @Schema(hidden = true, description = "템플릿 ID") + UUID templateId, -@Getter -@Setter -public class TemplateRequest { - - @Schema(hidden = true, description = "유저") - private UUID userId; // 유저 ID - - @Schema(hidden = true, description = "템플릿 ID") - private UUID templateId; // 템플릿 ID - - @Schema(description = "템플릿 제목", defaultValue = "기술주 템플릿") - private String title; + @Schema(description = "템플릿 제목", defaultValue = "기술주 템플릿") + String title, - @Schema(description = "템플릿 설명", defaultValue = "기술주 템플릿입니다.") - private String description; + @Schema(description = "템플릿 설명", defaultValue = "기술주 템플릿입니다.") + String description, - @Schema(description = "템플릿 공개 여부", defaultValue = "false") - private Boolean isPublic; -} + @Schema(description = "템플릿 공개 여부", defaultValue = "false") + Boolean isPublic +) {} diff --git a/backend/src/main/java/org/sejongisc/backend/backtest/dto/TemplateResponse.java b/backend/src/main/java/org/sejongisc/backend/backtest/dto/TemplateResponse.java index d16183de..3fe0e847 100644 --- a/backend/src/main/java/org/sejongisc/backend/backtest/dto/TemplateResponse.java +++ b/backend/src/main/java/org/sejongisc/backend/backtest/dto/TemplateResponse.java @@ -6,12 +6,9 @@ import org.sejongisc.backend.backtest.entity.Template; import java.util.List; - - @Builder -@Getter -public class TemplateResponse { - private List