Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
runtimeOnly 'com.mysql:mysql-connector-j'

// flyway
implementation 'org.springframework.boot:spring-boot-starter-flyway'
implementation 'org.flywaydb:flyway-mysql'

// S3
implementation platform('io.awspring.cloud:spring-cloud-aws-dependencies:4.0.2')
implementation 'io.awspring.cloud:spring-cloud-aws-starter-s3'
Expand Down Expand Up @@ -65,10 +69,11 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-actuator'

// test
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.boot:spring-boot-starter-webmvc-test'
testImplementation 'org.springframework.security:spring-security-test'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testImplementation 'com.h2database:h2'
testImplementation 'org.springframework.boot:spring-boot-testcontainers'
testImplementation 'org.testcontainers:testcontainers-mysql'
Comment thread
fervovita marked this conversation as resolved.
}

// CheckStyle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
name = "textbook_pages",
uniqueConstraints = {
@UniqueConstraint(
name = "uk_commission_required_page_type",
name = "uk_textbook_pages_commission_id_page_type",
columnNames = {"commission_id", "page_type"}
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
name = "commission_colors",
uniqueConstraints = {
@UniqueConstraint(
name = "uk_commission_color_role",
name = "uk_commission_colors_commission_id_role",
columnNames = {"commission_id", "role"}
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
name = "commission_concepts",
uniqueConstraints = {
@UniqueConstraint(
name = "uk_commission_concept",
name = "uk_commission_concepts_commission_id_concept",
columnNames = {"commission_id", "concept"}
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
name = "commission_drafts",
uniqueConstraints = {
@UniqueConstraint(
name = "uk_commission_draft_round",
name = "uk_commission_drafts_commission_application_id_round",
columnNames = {"commission_application_id", "round"}
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
name = "commission_draft_files",
uniqueConstraints = {
@UniqueConstraint(
name = "uk_commission_draft_file_order",
name = "uk_commission_draft_files_commission_draft_id_file_order",
columnNames = {"commission_draft_id", "file_order"}
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
name = "revision_requests",
uniqueConstraints = {
@UniqueConstraint(
name = "uk_revision_request_target_draft",
name = "uk_revision_requests_target_draft_id",
columnNames = {"target_draft_id"}
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
name = "revision_responses",
uniqueConstraints = {
@UniqueConstraint(
name = "uk_revision_response_produced_draft",
name = "uk_revision_responses_produced_draft_id",
columnNames = {"produced_draft_id"}
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
@Entity
@Table(name = "settlements",
uniqueConstraints = @UniqueConstraint(
name = "uk_settlements_designer_commission_type",
name = "uk_settlements_designer_id_commission_id_settlement_type",
columnNames = {"designer_id", "commission_id", "settlement_type"}
))
@Getter
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ditda/backend/domain/user/entity/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public class User extends BaseEntity {
private String phone;

@Enumerated(EnumType.STRING)
@Column(name = "role", nullable = false)
@Column(name = "role", nullable = false, length = 20)
private UserRole role;

@Column(name = "email_verified_at")
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application-local.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
spring:
jpa:
hibernate:
ddl-auto: update
ddl-auto: validate
properties:
hibernate:
format_sql: true
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application-prod.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
spring:
jpa:
hibernate:
ddl-auto: update # TODO: validate로 변경
ddl-auto: validate
properties:
hibernate:
format_sql: false
Expand Down
7 changes: 7 additions & 0 deletions src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ spring:
password: ${DB_PASSWORD}
driver-class-name: com.mysql.cj.jdbc.Driver

flyway:
enabled: true
locations: classpath:db/migration
baseline-on-migrate: true
baseline-version: 1
out-of-order: true

data:
redis:
host: ${REDIS_HOST}
Expand Down
Loading