Merge pull request #4 from Q-Dang/feature/#3-도메인엔티티모델생성

#3 [feat] : 도메인엔티티모델생성

was/.gitignore

@@ -36,6 +36,6 @@ out/
 ### VS Code ###
 .vscode/
 
-
 ### application.yml ###
-application.yaml
+application.yaml
+application.yml

was/src/main/java/qdang/group/was/WasApplication.java

@@ -2,7 +2,9 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
+@EnableJpaAuditing
 @SpringBootApplication
 public class WasApplication {
 

was/src/main/java/qdang/group/was/global/util/AuditingTimeEntity.java

@@ -0,0 +1,22 @@
+package qdang.group.was.global.util;
+
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.MappedSuperclass;
+import lombok.Getter;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+
+@Getter
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+public class AuditingTimeEntity {
+
+    @CreatedDate
+    private LocalDateTime createdAt;
+
+    @LastModifiedDate
+    private LocalDateTime updatedAt;
+}

was/src/main/java/qdang/group/was/match/domain/Match.java

@@ -1,15 +1,49 @@
 package qdang.group.was.match.domain;
 
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
+import jakarta.persistence.*;
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import qdang.group.was.matchProcess.domain.MatchProcess;
+import qdang.group.was.userMatch.domain.UserMatch;
+
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.List;
 
 @Getter
-@Entity
-public class Match {
+@Entity(name = "q_match")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class Match extends AuditingEntityListener {
 
     @Id
+    @Column(name = "q_match_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-}
+    @OneToMany(mappedBy = "match")
+    private List<UserMatch> userMatchList;
+
+    @Column(name = "user_count")
+    private int userCount;
+
+    private int matchTypeCode;
+
+    @Enumerated(EnumType.STRING)
+    private MatchType matchTypeName;
+
+    private LocalDateTime endAt;
+
+    private Duration duration;
+
+    private boolean deletedTf;
+
+    private boolean validTf;
+
+    @OneToMany(mappedBy = "match")
+    private List<UserMatch> userMatcheList;
+
+    @OneToMany(mappedBy = "match")
+    private List<MatchProcess> matchProcessList;
+}

was/src/main/java/qdang/group/was/match/domain/MatchType.java

@@ -0,0 +1,19 @@
+package qdang.group.was.match.domain;
+
+import jakarta.persistence.Embeddable;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public enum MatchType {
+
+    pool(0, "pool"),
+    BALL4(1, "ball4"),
+    BALL3(2, "ball3");
+
+    private final int matchTypeCode;
+    private final String matchTypeName;
+
+}

was/src/main/java/qdang/group/was/matchProcess/domain/MatchProcess.java

@@ -1,13 +1,32 @@
 package qdang.group.was.matchProcess.domain;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
+import jakarta.persistence.*;
 import lombok.Getter;
+import qdang.group.was.match.domain.Match;
+import qdang.group.was.user.domain.User;
 
 @Getter
-@Entity
+@Entity(name = "q_match_process")
 public class MatchProcess {
 
     @Id
+    @Column(name = "q_match_process_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "q_match_id")
+    private Match match;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "q_user_id")
+    private User user;
+
+    private int processCount;
+
+    private int turnCount;
+
+    private int phaseCount;
+
+    private boolean validTf;
 }

was/src/main/java/qdang/group/was/phoneAuth/domain/PhoneAuth.java

@@ -2,6 +2,8 @@
 
 
 import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import lombok.Getter;
 
@@ -10,5 +12,8 @@
 public class PhoneAuth {
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
+
 }

was/src/main/java/qdang/group/was/user/domain/User.java

@@ -1,18 +1,28 @@
 package qdang.group.was.user.domain;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
+import jakarta.persistence.*;
 import lombok.Getter;
+import qdang.group.was.matchProcess.domain.MatchProcess;
+import qdang.group.was.userMatch.domain.UserMatch;
+
+import java.util.List;
 
 @Getter
-@Entity
+@Entity(name = "q_user")
 public class User {
 
     @Id
-    @Column(name = "USER_ID")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "q_user_id")
     private Long id;
 
+    @OneToMany(mappedBy = "user")
+    private List<UserMatch> userMatchList;
+
+    @OneToMany(mappedBy = "user")
+    private List<MatchProcess> matchProcessList;
+
+
     private String username;
     private String phone;
     private String password;
@@ -36,4 +46,6 @@ public class User {
     private String agreeUpdateAt;
     private String accessAt;
     private String accessCount;
+
+
 }

was/src/main/java/qdang/group/was/userMatch/domain/UserMatch.java

@@ -1,14 +1,39 @@
 package qdang.group.was.userMatch.domain;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
+import jakarta.persistence.*;
 import lombok.Getter;
+import qdang.group.was.global.util.AuditingTimeEntity;
+import qdang.group.was.match.domain.Match;
+import qdang.group.was.user.domain.User;
 
 @Getter
-@Entity
-public class UserMatch {
+@Entity(name = "q_user_match")
+public class UserMatch extends AuditingTimeEntity {
 
     @Id
+    @Column(name = "q_user_match_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "q_user_id")
+    private User user;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "q_match_id")
+    private Match match;
+
+    private int targetScore;
+    private int finishCushionTargetScore;
+    private int finishBankShotTargetScore;
+    private boolean validTf;
+    private int score;
+    private int finishCushionScore;
+    private int finishBankShotScore;
+    private int ranking;
+    private int maxHighRun;
+    private int average;
+    private int inningCount;
+    private int succeedInningCount;
+    private int failedInningCount;
 }

was/src/main/java/qdang/group/was/userMatchProcess/domain/UserMatchProcess.java

@@ -1,14 +1,15 @@
 package qdang.group.was.userMatchProcess.domain;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
+import jakarta.persistence.*;
 import lombok.Getter;
 
 @Getter
-@Entity
+@Entity(name = "q_user_match_process")
 public class UserMatchProcess {
 
     @Id
+    @Column(name = "q_user_match_proccess_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
 }