From be09672dbc5f4cdc7d622594ff204eb45122a83d Mon Sep 17 00:00:00 2001 From: JunbeomKoreaUniv Date: Sat, 1 Mar 2025 22:40:29 +0900 Subject: [PATCH 1/2] =?UTF-8?q?mod::=20user=ED=85=8C=EC=9D=B4=EB=B8=94?= =?UTF-8?q?=EB=AA=85=20users=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - github workflow에서 테스트코드 검증 시 h2인메모리 데이터베이스 환경에서 검증을 하는데, user가 h2에서는 예약어여서 테이블명으로 할 수 없음. --- ontime-back/src/main/java/devkor/ontime_back/entity/User.java | 1 + ontime-back/src/main/resources/db/migration/V1__init.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ontime-back/src/main/java/devkor/ontime_back/entity/User.java b/ontime-back/src/main/java/devkor/ontime_back/entity/User.java index 0450765..4350128 100644 --- a/ontime-back/src/main/java/devkor/ontime_back/entity/User.java +++ b/ontime-back/src/main/java/devkor/ontime_back/entity/User.java @@ -12,6 +12,7 @@ @Entity @Builder @AllArgsConstructor +@Table(name = "users") public class User { @Id diff --git a/ontime-back/src/main/resources/db/migration/V1__init.sql b/ontime-back/src/main/resources/db/migration/V1__init.sql index d6d90e7..ac64a20 100644 --- a/ontime-back/src/main/resources/db/migration/V1__init.sql +++ b/ontime-back/src/main/resources/db/migration/V1__init.sql @@ -9,7 +9,7 @@ CREATE TABLE api_log ( created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ); -CREATE TABLE user ( +CREATE TABLE users ( user_id BIGINT AUTO_INCREMENT PRIMARY KEY, email VARCHAR(255) UNIQUE NOT NULL, password VARCHAR(255), From 80cf8e04656f9a3cc2d47609ce5d52eee0bdf67c Mon Sep 17 00:00:00 2001 From: JunbeomKoreaUniv Date: Sun, 2 Mar 2025 15:06:28 +0900 Subject: [PATCH 2/2] =?UTF-8?q?test::=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EA=B2=80=EC=A6=9D=20=ED=8C=8C=EC=9D=B4?= =?UTF-8?q?=ED=94=84=EB=9D=BC=EC=9D=B8=20=EC=9E=98=20=EC=9E=91=EB=8F=99?= =?UTF-8?q?=ED=95=98=EB=8A=94=EC=A7=80=20=ED=99=95=EC=9D=B8=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=EC=9C=84=ED=95=9C=20=EC=BB=A4=EB=B0=8B(=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EC=BD=94=EB=93=9C=20=EC=8B=A4=ED=8C=A8?= =?UTF-8?q?=ED=95=98=EA=B2=8C=20=EC=A1=B0=EC=9E=91=ED=95=98=EC=98=80?= =?UTF-8?q?=EC=9D=8C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ontime-back/src/main/java/devkor/ontime_back/entity/User.java | 1 - ontime-back/src/main/resources/db/migration/V1__init.sql | 2 +- .../java/devkor/ontime_back/service/ScheduleServiceTest.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ontime-back/src/main/java/devkor/ontime_back/entity/User.java b/ontime-back/src/main/java/devkor/ontime_back/entity/User.java index 4350128..0450765 100644 --- a/ontime-back/src/main/java/devkor/ontime_back/entity/User.java +++ b/ontime-back/src/main/java/devkor/ontime_back/entity/User.java @@ -12,7 +12,6 @@ @Entity @Builder @AllArgsConstructor -@Table(name = "users") public class User { @Id diff --git a/ontime-back/src/main/resources/db/migration/V1__init.sql b/ontime-back/src/main/resources/db/migration/V1__init.sql index ac64a20..d6d90e7 100644 --- a/ontime-back/src/main/resources/db/migration/V1__init.sql +++ b/ontime-back/src/main/resources/db/migration/V1__init.sql @@ -9,7 +9,7 @@ CREATE TABLE api_log ( created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ); -CREATE TABLE users ( +CREATE TABLE user ( user_id BIGINT AUTO_INCREMENT PRIMARY KEY, email VARCHAR(255) UNIQUE NOT NULL, password VARCHAR(255), diff --git a/ontime-back/src/test/java/devkor/ontime_back/service/ScheduleServiceTest.java b/ontime-back/src/test/java/devkor/ontime_back/service/ScheduleServiceTest.java index b1e0819..f472920 100644 --- a/ontime-back/src/test/java/devkor/ontime_back/service/ScheduleServiceTest.java +++ b/ontime-back/src/test/java/devkor/ontime_back/service/ScheduleServiceTest.java @@ -1306,7 +1306,7 @@ void getLatenessHistory(){ assertThat(latenessHistory).hasSize(2) .extracting("scheduleId", "scheduleName", "scheduleTime", "latenessTime") .containsExactlyInAnyOrder( - tuple(UUID.fromString("3fa85f64-5717-4562-b3fc-2c963f66afe5"), "을사년 새해인줄 알았지?", LocalDateTime.of(2025, 1, 1, 0, 0), 3), + tuple(UUID.fromString("3fa85f64-5717-4562-b3fc-2c963f66afe5"), "을사년 새해인줄 알았지?^^", LocalDateTime.of(2025, 1, 1, 0, 0), 3), tuple(UUID.fromString("3fa85f64-5717-4562-b3fc-2c963f66afe6"), "생일파티", LocalDateTime.of(2025, 1, 12, 21, 0), 1) ); }