Skip to content

Commit ac356ef

Browse files
authored
Merge pull request #506 from TaskFlow-CLAP/CLAP-390
CLAP-390 종료에서 완료로 상태변경시 종료일 초기화 되는 문제 수정
2 parents 038a5f2 + 35dfbca commit ac356ef

File tree

2 files changed

+13
-26
lines changed

2 files changed

+13
-26
lines changed

src/main/java/clap/server/domain/model/task/Task.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,9 @@ public void finalSave(int attachmentCount) {
6969
}
7070

7171
public void updateTaskStatus(TaskStatus status) {
72-
if (status.equals(TaskStatus.COMPLETED)) {
72+
if (TaskStatus.COMPLETED.equals(status)) {
7373
this.finishedAt = LocalDateTime.now();
74-
}
75-
if (this.taskStatus == TaskStatus.TERMINATED || this.taskStatus == TaskStatus.COMPLETED) {
74+
} else if (TaskStatus.TERMINATED.equals(this.taskStatus) || TaskStatus.COMPLETED.equals(this.taskStatus)) {
7675
this.finishedAt = null;
7776
}
7877
this.taskStatus = status;

src/main/resources/mysql.yml

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
spring:
2-
jpa:
3-
hibernate:
4-
ddl-auto: update
5-
properties:
6-
hibernate:
7-
default_batch_fetch_size: 100
8-
# format_sql: true
9-
show_sql: true
10-
112
datasource:
123
driver-class-name: com.mysql.cj.jdbc.Driver
134
url: jdbc:mysql://${DATABASE_HOST:localhost}:${DATABASE_PORT:3306}/${DATABASE_NAME:taskflow}?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&autoReconnect=true
145
username: ${DATABASE_USERNAME}
156
password: ${DATABASE_PASSWORD}
16-
data-source-properties:
17-
rewrite-batched-statements: true
187

198
---
209
spring.config.activate.on-profile: local
@@ -29,11 +18,12 @@ spring:
2918
open-in-view: false
3019
generate-ddl: false
3120
hibernate:
32-
ddl-auto: none
33-
show-sql: true
21+
ddl-auto: validate
3422
properties:
3523
hibernate:
36-
dialect: org.hibernate.dialect.MySQLDialect
24+
default_batch_fetch_size: 100
25+
format_sql: true
26+
show_sql: true
3727

3828
logging:
3929
level:
@@ -57,11 +47,10 @@ spring:
5747
generate-ddl: false
5848
hibernate:
5949
ddl-auto: validate
60-
show-sql: true
6150
properties:
6251
hibernate:
63-
dialect: org.hibernate.dialect.MySQLDialect
64-
52+
format_sql: false
53+
show_sql: true
6554
flyway:
6655
enabled: true
6756
baseline-on-migrate: true
@@ -76,13 +65,12 @@ spring:
7665
open-in-view: false
7766
generate-ddl: false
7867
hibernate:
79-
ddl-auto: none
80-
show-sql: true
68+
ddl-auto: validate
8169
properties:
8270
hibernate:
83-
dialect: org.hibernate.dialect.MySQLDialect
84-
71+
format_sql: false
72+
show_sql: false
8573
flyway:
8674
enabled: false
87-
baseline-on-migrate: true
88-
locations: classpath:db/migration/prod
75+
baseline-on-migrate: false
76+
locations: classpath:db/migration/prod

0 commit comments

Comments
 (0)