From dba9347fd8ea9bf8f99c174b83ccad7e700adb3f Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Wed, 12 Feb 2025 09:57:05 +0900 Subject: [PATCH 1/2] =?UTF-8?q?CLAP-390=20Fix:=20=EC=A2=85=EB=A3=8C?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=99=84=EB=A3=8C=EB=A1=9C=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=EB=B3=80=EA=B2=BD=EC=8B=9C=20=EC=A2=85=EB=A3=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=B4=88=EA=B8=B0=ED=99=94=20=EB=90=98=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/clap/server/domain/model/task/Task.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java index d3b80a16..4e032ab3 100644 --- a/src/main/java/clap/server/domain/model/task/Task.java +++ b/src/main/java/clap/server/domain/model/task/Task.java @@ -69,10 +69,9 @@ public void finalSave(int attachmentCount) { } public void updateTaskStatus(TaskStatus status) { - if (status.equals(TaskStatus.COMPLETED)) { + if (TaskStatus.COMPLETED.equals(status)) { this.finishedAt = LocalDateTime.now(); - } - if (this.taskStatus == TaskStatus.TERMINATED || this.taskStatus == TaskStatus.COMPLETED) { + } else if (TaskStatus.TERMINATED.equals(this.taskStatus) || TaskStatus.COMPLETED.equals(this.taskStatus)) { this.finishedAt = null; } this.taskStatus = status; From 35dfbcaa40c412cdb3bfb5bf1badb375873a6773 Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Wed, 12 Feb 2025 10:28:55 +0900 Subject: [PATCH 2/2] =?UTF-8?q?CLAP-390=20Fix:=20=ED=99=98=EA=B2=BD?= =?UTF-8?q?=EB=B3=84=20db=20=EB=A1=9C=EA=B9=85=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mysql.yml | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/src/main/resources/mysql.yml b/src/main/resources/mysql.yml index a43c9cbc..4d053e16 100644 --- a/src/main/resources/mysql.yml +++ b/src/main/resources/mysql.yml @@ -1,20 +1,9 @@ spring: - jpa: - hibernate: - ddl-auto: update - properties: - hibernate: - default_batch_fetch_size: 100 -# format_sql: true - show_sql: true - datasource: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${DATABASE_HOST:localhost}:${DATABASE_PORT:3306}/${DATABASE_NAME:taskflow}?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&autoReconnect=true username: ${DATABASE_USERNAME} password: ${DATABASE_PASSWORD} - data-source-properties: - rewrite-batched-statements: true --- spring.config.activate.on-profile: local @@ -29,11 +18,12 @@ spring: open-in-view: false generate-ddl: false hibernate: - ddl-auto: none - show-sql: true + ddl-auto: validate properties: hibernate: - dialect: org.hibernate.dialect.MySQLDialect + default_batch_fetch_size: 100 + format_sql: true + show_sql: true logging: level: @@ -57,11 +47,10 @@ spring: generate-ddl: false hibernate: ddl-auto: validate - show-sql: true properties: hibernate: - dialect: org.hibernate.dialect.MySQLDialect - + format_sql: false + show_sql: true flyway: enabled: true baseline-on-migrate: true @@ -76,13 +65,12 @@ spring: open-in-view: false generate-ddl: false hibernate: - ddl-auto: none - show-sql: true + ddl-auto: validate properties: hibernate: - dialect: org.hibernate.dialect.MySQLDialect - + format_sql: false + show_sql: false flyway: enabled: false - baseline-on-migrate: true - locations: classpath:db/migration/prod + baseline-on-migrate: false + locations: classpath:db/migration/prod \ No newline at end of file