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; 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