From 4fd139ab388ee68572cdff5e15ec97de901f63d3 Mon Sep 17 00:00:00 2001 From: bjkim Date: Mon, 4 Aug 2025 14:46:24 +0900 Subject: [PATCH] =?UTF-8?q?[UPDATE]=20SPEC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jwt/controllers/ProjectController.java | 2 +- .../etri/security/jwt/entity/ProjectEntity.java | 5 +++-- .../security/jwt/service/ProjectService.java | 4 +++- .../jwt/specification/ProjectSpecification.java | 3 ++- src/main/resources/application.properties | 17 +++++++++++++++-- src/main/resources/data.sql | 7 ++++--- 6 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/main/java/kr/re/etri/security/jwt/controllers/ProjectController.java b/src/main/java/kr/re/etri/security/jwt/controllers/ProjectController.java index 61011e9..5c232b3 100644 --- a/src/main/java/kr/re/etri/security/jwt/controllers/ProjectController.java +++ b/src/main/java/kr/re/etri/security/jwt/controllers/ProjectController.java @@ -63,7 +63,7 @@ public class ProjectController { @Operation(summary = "프로젝트 수정") @PutMapping("/{id}") public ResponseEntity updateProject( - @Parameter(description = "수정할 프로젝트 ID", required = true, in = ParameterIn.PATH) + @Parameter(description = "수정할 프로젝트 ID", required = true, in = ParameterIn.PATH) @PathVariable("id") Long id, @RequestBody ProjectRequest dto) { diff --git a/src/main/java/kr/re/etri/security/jwt/entity/ProjectEntity.java b/src/main/java/kr/re/etri/security/jwt/entity/ProjectEntity.java index 37e6c9f..d9d18a7 100644 --- a/src/main/java/kr/re/etri/security/jwt/entity/ProjectEntity.java +++ b/src/main/java/kr/re/etri/security/jwt/entity/ProjectEntity.java @@ -8,6 +8,7 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import java.time.LocalDate; +import java.time.LocalDateTime; @Schema(description = "프로젝트") @Comment("프로젝트") @@ -54,7 +55,7 @@ public class ProjectEntity { @CreatedDate @Schema(description = "등록 일자") @Comment("등록 일자") - private String regDate; + private LocalDateTime regDate; @Schema(description = "등록 유저 ID", example = "system") @Comment("등록 유저 ID") @@ -67,7 +68,7 @@ public class ProjectEntity { @LastModifiedDate @Schema(description = "수정 일자") @Comment("수정 일자") - private String modDate; + private LocalDateTime modDate; @Schema(description = "수정 유저 ID", example = "system") @Comment("수정 유저 ID") diff --git a/src/main/java/kr/re/etri/security/jwt/service/ProjectService.java b/src/main/java/kr/re/etri/security/jwt/service/ProjectService.java index ed6f5eb..b458063 100644 --- a/src/main/java/kr/re/etri/security/jwt/service/ProjectService.java +++ b/src/main/java/kr/re/etri/security/jwt/service/ProjectService.java @@ -37,8 +37,10 @@ public class ProjectService { } public Page search(BaseSearchRequest request) { + int pageIndex = request.getPage() > 0 ? request.getPage() - 1 : 0; + Pageable pageable = PageRequest.of( - request.getPage(), + pageIndex, request.getSize(), Sort.by(Sort.Direction.fromString(request.getSortDirection()), request.getSortField()) ); diff --git a/src/main/java/kr/re/etri/security/jwt/specification/ProjectSpecification.java b/src/main/java/kr/re/etri/security/jwt/specification/ProjectSpecification.java index fb4f455..2186bcd 100644 --- a/src/main/java/kr/re/etri/security/jwt/specification/ProjectSpecification.java +++ b/src/main/java/kr/re/etri/security/jwt/specification/ProjectSpecification.java @@ -50,7 +50,8 @@ public class ProjectSpecification { Predicate predicate = cb.conjunction(); if (keyword != null && !keyword.isEmpty()) { - if ("전체".equalsIgnoreCase(searchType) || "all".equalsIgnoreCase(searchType)) { + if (searchType == null || searchType.isEmpty() || + "전체".equalsIgnoreCase(searchType) || "all".equalsIgnoreCase(searchType)) { Predicate orPredicate = cb.disjunction(); for (String field : stringFields) { orPredicate = cb.or(orPredicate, diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index bae3b50..32b492c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,7 +3,7 @@ spring.datasource.username=cuuva spring.datasource.password=cuuva spring.jpa.database-platform=org.hibernate.dialect.MariaDBDialect -spring.jpa.hibernate.ddl-auto=create-only +spring.jpa.hibernate.ddl-auto=create-drop spring.sql.init.mode=always @@ -19,4 +19,17 @@ bezkoder.app.jwtSecret= 275511b31c520562d69802ce4a913773102563891563a24062f44b3f ## For test bezkoder.app.jwtExpirationMs= 60000 -bezkoder.app.jwtRefreshExpirationMs= 180000 \ No newline at end of file +bezkoder.app.jwtRefreshExpirationMs= 180000 + +# SQL ?? ?? +spring.jpa.show-sql=true + +# SQL ??? ????? ?? ?? ?? (??) +spring.jpa.properties.hibernate.format_sql=true + +# ??? ? ???? ??? ??? ?? ??? ?? ?? ?? +logging.level.org.hibernate.type.descriptor.sql=TRACE + +logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE + + diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 3a4d598..895cc04 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -1,5 +1,6 @@ -- src/main/resources/data.sql -# INSERT INTO tb_role (id, name) VALUES (1, 'ROLE_USER'); -# INSERT INTO tb_role (id, name) VALUES (2, 'ROLE_MODERATOR'); -# INSERT INTO tb_role (id, name) VALUES (3, 'ROLE_ADMIN'); +INSERT INTO tb_role (id, name) VALUES (1, 'ROLE_USER'); +INSERT INTO tb_role (id, name) VALUES (2, 'ROLE_MODERATOR'); +INSERT INTO tb_role (id, name) VALUES (3, 'ROLE_ADMIN'); +