Merge pull request #45 from KNU-HAEDAL/issue/17

Issue/17 DB DDL 수정
KNU-HAEDAL · Jul 17, 2024 · 42bdc15 · 42bdc15
2 parents 8e74657 + 6dfa83a
commit 42bdc15
Show file tree

Hide file tree

Showing 11 changed files with 102 additions and 90 deletions.
diff --git a/...pi-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroup.java b/...pi-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroup.java
@@ -24,14 +24,19 @@ public class ChallengeGroup extends BaseTimeEntity {
  private Long id;
 
  @Enumerated(EnumType.STRING)
+ @Column(nullable = false)
  private ChallengeCategory category;
 
+ @Column(nullable = false)
  private String title;
 
+ @Column(nullable = false)
  private String content;
 
+ @Column(nullable = false)
  private String guide;
 
+ @Column(nullable = false)
  private Integer cumulativeCount;
 
  @OneToMany(mappedBy = "challengeGroup", fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)

diff --git a/...rver/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/challenge/Challenge.java b/...rver/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/challenge/Challenge.java
@@ -1,14 +1,7 @@
 package org.haedal.zzansuni.domain.challengegroup.challenge;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
+import jakarta.persistence.*;
+
 import java.time.LocalDate;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -31,23 +24,30 @@ public class Challenge extends BaseTimeEntity {
  @GeneratedValue(strategy = GenerationType.IDENTITY)
  private Long id;
 
- @ManyToOne(fetch = FetchType.LAZY)
+ @ManyToOne(fetch = FetchType.LAZY, optional = false)
  @JoinColumn(name = "challenge_group_id")
  private ChallengeGroup challengeGroup;
 
+ @Column(nullable = false)
  private Integer requiredCount;
 
  @Enumerated(EnumType.STRING)
+ @Column(nullable = false)
  private DayType dayType;
 
+ @Column(nullable = false)
  private Integer onceExp;
 
+ @Column(nullable = false)
  private Integer successExp;
 
+ @Column(nullable = false)
  private Integer difficulty;
 
+ @Column(nullable = false)
  private LocalDate startDate;
 
+ @Column(nullable = false)
  private LocalDate endDate;
 
 

diff --git a/...pp/src/main/java/org/haedal/zzansuni/domain/challengegroup/image/ChallengeGroupImage.java b/...pp/src/main/java/org/haedal/zzansuni/domain/challengegroup/image/ChallengeGroupImage.java
@@ -1,12 +1,6 @@
 package org.haedal.zzansuni.domain.challengegroup.image;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
+import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -26,10 +20,11 @@ public class ChallengeGroupImage extends BaseTimeEntity {
  @GeneratedValue(strategy = GenerationType.IDENTITY)
  private Long id;
 
+ @Column(nullable = false)
  private String imageUrl;
 
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "challenge_group_id")
+ @ManyToOne(fetch = FetchType.LAZY, optional = false)
+ @JoinColumn(name = "challenge_group_id", nullable = false)
  private ChallengeGroup challengeGroup;
 
 }
diff --git a/...r/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/review/ChallengeReview.java b/...r/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/review/ChallengeReview.java
@@ -1,12 +1,6 @@
 package org.haedal.zzansuni.domain.challengegroup.review;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
+import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -27,15 +21,18 @@ public class ChallengeReview extends BaseTimeEntity {
  @GeneratedValue(strategy = GenerationType.IDENTITY)
  private Long id;
 
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "user_challenge_id")
+ @ManyToOne(fetch = FetchType.LAZY, optional = false)
+ @JoinColumn(name = "user_challenge_id", nullable = false)
  private UserChallenge userChallenge;
 
+ @Column(nullable = false)
  private String content;
 
+ @Column(nullable = false)
  private Integer rating;
 
  // 쿼리 성능을 위해 비정규화
+ @Column(nullable = false)
  private Long challengeGroupId;
 
  public static ChallengeReview create(UserChallenge userChallenge,

diff --git a/.../src/main/java/org/haedal/zzansuni/domain/challengegroup/userchallenge/UserChallenge.java b/.../src/main/java/org/haedal/zzansuni/domain/challengegroup/userchallenge/UserChallenge.java
@@ -24,21 +24,30 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Getter
 @Builder
+@Table(
+ uniqueConstraints = {
+ @UniqueConstraint(
+ name = "user_challenge_unique",
+ columnNames = {"challenge_id", "user_id"}
+ )
+ }
+)
 public class UserChallenge extends BaseTimeEntity {
 
  @Id
  @GeneratedValue(strategy = GenerationType.IDENTITY)
  private Long id;
 
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "challenge_id")
+ @ManyToOne(fetch = FetchType.LAZY, optional = false)
+ @JoinColumn(name = "challenge_id", nullable = false)
  private Challenge challenge;
 
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "user_id")
+ @ManyToOne(fetch = FetchType.LAZY, optional = false)
+ @JoinColumn(name = "user_id", nullable = false)
  private User user;
 
  @Enumerated(EnumType.STRING)
+ @Column(nullable = false)
  private ChallengeStatus status;
 
  @OneToMany(mappedBy = "userChallenge", fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)

diff --git a/...rc/main/java/org/haedal/zzansuni/domain/challengegroup/userexp/ChallengeGroupUserExp.java b/...rc/main/java/org/haedal/zzansuni/domain/challengegroup/userexp/ChallengeGroupUserExp.java
@@ -10,18 +10,27 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
 @Builder
+@Table(
+ uniqueConstraints = {
+ @UniqueConstraint(
+ name = "challenge_group_user_exp_unique",
+ columnNames = {"challenge_group_id", "user_id"}
+ )
+ }
+)
 public class ChallengeGroupUserExp {
  @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
  private Long id;
 
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "challenge_group_id")
+ @ManyToOne(fetch = FetchType.LAZY, optional = false)
+ @JoinColumn(name = "challenge_group_id", nullable = false)
  private ChallengeGroup challengeGroup;
 
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "user_id")
+ @ManyToOne(fetch = FetchType.LAZY, optional = false)
+ @JoinColumn(name = "user_id", nullable = false)
  private User user;
 
+ @Column(nullable = false)
  private Integer totalExp;
 
  public static ChallengeGroupUserExp create(ChallengeGroup challengeGroup, User user) {

diff --git a/...in/java/org/haedal/zzansuni/domain/challengegroup/verification/ChallengeVerification.java b/...in/java/org/haedal/zzansuni/domain/challengegroup/verification/ChallengeVerification.java
@@ -18,15 +18,17 @@ public class ChallengeVerification extends BaseTimeEntity {
  @GeneratedValue(strategy = GenerationType.IDENTITY)
  private Long id;
 
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "user_challenge_id")
+ @ManyToOne(fetch = FetchType.LAZY, optional = false)
+ @JoinColumn(name = "user_challenge_id", nullable = false)
  private UserChallenge userChallenge;
 
  private String imageUrl;
 
+ @Column(nullable = false)
  private String content;
 
  @Enumerated(EnumType.STRING)
+ @Column(nullable = false)
  private ChallengeVerificationStatus status;
 
  public static ChallengeVerification create(ChallengeCommand.VerificationCreate command, UserChallenge userChallenge) {

diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/User.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/User.java
@@ -25,6 +25,7 @@ public class User extends BaseTimeEntity {
  @Column(nullable = false)
  private Role role;
 
+ @Column(unique = true)
  private String email;
 
  private String password;

diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/global/api/SwaggerConfig.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/global/api/SwaggerConfig.java
@@ -1,7 +1,5 @@
 package org.haedal.zzansuni.global.api;
 
-import io.swagger.v3.oas.annotations.OpenAPIDefinition;
-import io.swagger.v3.oas.annotations.servers.Server;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
@@ -10,12 +8,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-@OpenAPIDefinition(
- servers = {
- @Server(url = "https://api.reditus.site",description = "Prod Server"),
- @Server(url = "http://localhost:8080", description = "localhost"),
- }
-)
 @Configuration
 public class SwaggerConfig {
  private static final String BEARER_KEY = "bearer-key";

diff --git a/zzansuni-api-server/app/src/main/resources/application.yml b/zzansuni-api-server/app/src/main/resources/application.yml
@@ -57,7 +57,7 @@ spring:
  h2.console.enabled: false
  flyway:
  enabled: true
- baseline-on-migrate: true # Flyway가 초기화되지 않은 데이터베이스에 마이그레이션을 적용할 때 초기 버전으로 마이그레이션 파일을 적용할지 여부
+ baseline-on-migrate: false # Flyway가 초기화되지 않은 데이터베이스에 마이그레이션을 적용할 때 초기 버전으로 마이그레이션 파일을 적용할지 여부
  fail-on-missing-locations: true # 스크립트 파일을 저장하는 위치를 못 찾을때 실패할지 여부
  baseline-version: 1 # Flyway가 초기화되지 않은 데이터베이스에 마이그레이션을 적용할 때 버전을 설정
 kakao:
@@ -70,7 +70,7 @@ spring: # dev profile
  activate:
  on-profile: dev
  datasource:
- url: jdbc:mysql://localhost:3306/zzansuni
+ url: jdbc:mysql://localhost:3306/zzansuni?createDatabaseIfNotExist=true
  username: "root"
  password: "root"
  jpa: