From c4200e9be4ce7f0845365379701694b905e11186 Mon Sep 17 00:00:00 2001 From: uijin-j Date: Wed, 13 Mar 2024 17:06:56 +0900 Subject: [PATCH 1/5] chore: pull sidepeek_backend_secret --- sidepeek_backend_secret | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sidepeek_backend_secret b/sidepeek_backend_secret index a11729b4..5cbdcf8d 160000 --- a/sidepeek_backend_secret +++ b/sidepeek_backend_secret @@ -1 +1 @@ -Subproject commit a11729b4b5e29a7d61f214faecce3dc78919c402 +Subproject commit 5cbdcf8d8c0f3fc0ac43a05123539e7c657c3d18 From 42a371fb6206af4be64b3bd64f5d74519738ab0f Mon Sep 17 00:00:00 2001 From: uijin-j Date: Wed, 13 Mar 2024 17:18:14 +0900 Subject: [PATCH 2/5] =?UTF-8?q?docs:=20=EC=98=88=EC=8B=9C=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=EB=A5=BC=20=EB=B0=94=EB=A1=9C=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8A=94=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sixgaezzang/sidepeek/auth/dto/request/LoginRequest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/sixgaezzang/sidepeek/auth/dto/request/LoginRequest.java b/src/main/java/sixgaezzang/sidepeek/auth/dto/request/LoginRequest.java index 2086b3ac..b2d48b59 100644 --- a/src/main/java/sixgaezzang/sidepeek/auth/dto/request/LoginRequest.java +++ b/src/main/java/sixgaezzang/sidepeek/auth/dto/request/LoginRequest.java @@ -8,10 +8,10 @@ @Schema(description = "로그인 요청") public record LoginRequest( - @Schema(description = "이메일", example = "sidepeek@gmail.com") + @Schema(description = "이메일", example = "uijin@naver.com") @NotBlank(message = EMAIL_IS_NULL) String email, - @Schema(description = "비밀번호", example = "sidepeek6!") + @Schema(description = "비밀번호", example = "sidepeek123!") @NotBlank(message = PASSWORD_IS_NULL) String password ) { From 7c490c751054b0dfcb2d7b5331c1dce99781c0c3 Mon Sep 17 00:00:00 2001 From: uijin-j Date: Wed, 13 Mar 2024 17:18:31 +0900 Subject: [PATCH 3/5] =?UTF-8?q?docs:=20=EB=B6=88=EB=AA=85=ED=99=95?= =?UTF-8?q?=ED=95=9C=20=EC=98=88=EC=8B=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/sixgaezzang/sidepeek/common/dto/response/Page.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/sixgaezzang/sidepeek/common/dto/response/Page.java b/src/main/java/sixgaezzang/sidepeek/common/dto/response/Page.java index faac81e5..aa079971 100644 --- a/src/main/java/sixgaezzang/sidepeek/common/dto/response/Page.java +++ b/src/main/java/sixgaezzang/sidepeek/common/dto/response/Page.java @@ -7,7 +7,7 @@ @Schema(description = "페이징 정보") @Builder public record Page( - @Schema(description = "데이터 목록", example = "[]") + @Schema(description = "데이터 목록") List data, @Schema(description = "전체 페이지 수", example = "3") int totalPages, From 3ae193d77dac3b2ae330c5b8bf5bc233c97c89f1 Mon Sep 17 00:00:00 2001 From: uijin-j Date: Wed, 13 Mar 2024 17:18:59 +0900 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20=EA=B8=B0=EB=B3=B8=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=82=AC=EC=9D=B4=EC=A6=88=2012=20->=2024?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sixgaezzang/sidepeek/users/controller/UserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/sixgaezzang/sidepeek/users/controller/UserController.java b/src/main/java/sixgaezzang/sidepeek/users/controller/UserController.java index ee2980fb..1be168a3 100644 --- a/src/main/java/sixgaezzang/sidepeek/users/controller/UserController.java +++ b/src/main/java/sixgaezzang/sidepeek/users/controller/UserController.java @@ -124,7 +124,7 @@ public ResponseEntity> getProjects( @Login Long loginId, @PathVariable Long id, @RequestParam UserProjectSearchType type, - @PageableDefault(size = 12) Pageable pageable + @PageableDefault(size = 24) Pageable pageable ) { Page projects = projectService.findByUser(id, loginId, type, pageable); From 721f7962fff93534117b1b26ba3dd3864240a356 Mon Sep 17 00:00:00 2001 From: uijin-j Date: Wed, 13 Mar 2024 17:19:19 +0900 Subject: [PATCH 5/5] =?UTF-8?q?chore:=20=EB=8D=94=EB=AF=B8=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/db/data/afterMigrate.sql | 96 ++++++++++++++++++--- 1 file changed, 83 insertions(+), 13 deletions(-) diff --git a/src/main/resources/db/data/afterMigrate.sql b/src/main/resources/db/data/afterMigrate.sql index b6a8d81a..bbc9aa2a 100644 --- a/src/main/resources/db/data/afterMigrate.sql +++ b/src/main/resources/db/data/afterMigrate.sql @@ -48,7 +48,7 @@ insert into project(id, name, sub_name, overview, thumbnail_url, github_url, dep start_date, end_date, owner_id, description) values (3, '프로젝트3', '프로젝트3 더미데이터', '프로젝트3 더미데이터입니다.', 'https://thumbnail-images.project.com/3.png', 'https://github.com/project', - 'https://project3.netlify.app/', 3, 3, + 'https://project3.netlify.app/', 3, 3, '2024-01-29 00:00:00', '2024-03-25 00:00:00', 1, '# Project 3 기능'); insert into project(id, name, sub_name, overview, thumbnail_url, github_url, deploy_url, view_count, like_count, @@ -196,6 +196,64 @@ insert into project_member(id, project_id, user_id, role, nickname) values (2, 1, 2, '프론트', '동건'); insert into project_member(id, project_id, role, nickname) values (3, 1, '오락부짱', '민호'); +insert into project_member(id, project_id, user_id, role, nickname) +values (4, 2, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (5, 3, 1, '디자인', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (6, 4, 1, 'BE', '지니'); +insert into project_member(id, project_id, user_id, role, nickname) +values (7, 5, 1, 'BE', 'uijin'); +insert into project_member(id, project_id, user_id, role, nickname) +values (8, 6, 1, 'PO', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (9, 7, 1, '디자인', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (10, 8, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (11, 9, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (12, 10, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (13, 11, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (14, 12, 1, 'BE & FE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (15, 13, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (16, 14, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (17, 15, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (18, 16, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (19, 17, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (20, 18, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (21, 19, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (22, 20, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (23, 21, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (24, 22, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (25, 23, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (26, 24, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (27, 25, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (28, 26, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (29, 27, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (30, 28, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (31, 29, 1, 'BE', '의진'); +insert into project_member(id, project_id, user_id, role, nickname) +values (32, 30, 1, 'BE', '의진'); -- FILE insert into files(id, project_id, type, url) @@ -215,37 +273,49 @@ values (4, 'Figma', 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/ski insert into skill(id, name, icon_image_url) values (5, 'Git', 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/git-icon.png'); insert into skill(id, name, icon_image_url) -values (6, 'Github Actions', 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/github-actions.png'); +values (6, 'Github Actions', + 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/github-actions.png'); insert into skill(id, name, icon_image_url) -values (7, 'Github', 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/github-icon.png'); +values (7, 'Github', + 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/github-icon.png'); insert into skill(id, name, icon_image_url) values (8, 'Java', 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/java.png'); insert into skill(id, name, icon_image_url) -values (9, 'Javascript', 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/javascript.png'); +values (9, 'Javascript', + 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/javascript.png'); insert into skill(id, name, icon_image_url) -values (10, 'Kotlin', 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/kotlin-icon.png'); +values (10, 'Kotlin', + 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/kotlin-icon.png'); insert into skill(id, name, icon_image_url) -values (11, 'Notion', 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/notion-icon.png'); +values (11, 'Notion', + 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/notion-icon.png'); insert into skill(id, name, icon_image_url) -values (12, 'PostgreSQL', 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/postgresql.png'); +values (12, 'PostgreSQL', + 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/postgresql.png'); insert into skill(id, name, icon_image_url) -values (13, 'React Query', 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/react-query-icon.png'); +values (13, 'React Query', + 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/react-query-icon.png'); insert into skill(id, name, icon_image_url) values (14, 'React', 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/react.png'); insert into skill(id, name, icon_image_url) -values (15, 'Slack', 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/slack-icon.png'); +values (15, 'Slack', + 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/slack-icon.png'); insert into skill(id, name, icon_image_url) -values (16, 'Spring', 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/spring-icon.png'); +values (16, 'Spring', + 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/spring-icon.png'); insert into skill(id, name, icon_image_url) values (17, 'Swagger', 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/swagger.png'); insert into skill(id, name, icon_image_url) -values (18, 'Thymeleaf', 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/thymeleaf-icon.png'); +values (18, 'Thymeleaf', + 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/thymeleaf-icon.png'); insert into skill(id, name, icon_image_url) values (19, 'Tomcat', 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/tomcat.png'); insert into skill(id, name, icon_image_url) -values (20, 'Typescript', 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/typescript-icon.png'); +values (20, 'Typescript', + 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/typescript-icon.png'); insert into skill(id, name, icon_image_url) -values (21, 'Vercel', 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/vercel-icon.png'); +values (21, 'Vercel', + 'https://sidepeek-bucket.s3.ap-northeast-2.amazonaws.com/skill/vercel-icon.png'); -- PROJECT_SKILL insert into project_skill(id, project_id, skill_id, category)