#21 feat: entity 작성 양식 통합

테이블 매칭 확인

src/main/java/com/clone/wanted/Company/Company.java

@@ -9,24 +9,18 @@
 @Getter
 @NoArgsConstructor
 public class Company {
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(name = "company_id")
-	private Long companyId;
-
-	@ManyToOne
-	@JoinColumn(name = "user_id", referencedColumnName = "user_id")
+	private Long id;
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "user_id")
 	private User user;
-
-	@Column(name = "companyName", length = 100)
+	@Column(length = 100)
 	private String companyName;
-
-	@Column(name = "region", length = 100)
+	@Column(length = 100)
 	private String region;
-
-	@Column(name = "address", length = 255)
 	private String address;
-
-	@Column(name = "companyExplanation", length = 255)
 	private String companyExplanation;
 }

src/main/java/com/clone/wanted/User/User.java

@@ -1,5 +1,6 @@
 package com.clone.wanted.User;
 
+import com.clone.wanted.BaseEntity;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -10,52 +11,30 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-@Entity(name = "users")
+@Entity
 @Getter
+@Table(name = "users")
 @NoArgsConstructor
-public class User {
+public class User extends BaseEntity {
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(name = "user_id")
 	private Long userId;
-
 	//유저 아이디
-	@Column(name = "userName", length = 255)
 	private String username;
-
-	@Column(name = "password", length = 255)
 	private String password;
-
 	//실제 이름
-	@Column(name = "name", length = 20)
+	@Column(length = 20)
 	private String name;
-
-	@Column(name = "email", length = 100)
+	@Column(length = 100)
 	private String email;
-
-	@Column(name = "phoneNumber", length = 15)
+	@Column( length = 15)
 	private String phoneNumber;
-
-	@Column(name = "birthDate")
 	private LocalDate birthDate;
-
-	@Column(name = "jobStatus", length = 20)
+	@Column(length = 20)
 	private String jobStatus;
-
-	@CreatedDate
-	@Column(name = "createdAt", updatable = false)
-	private LocalDateTime createdAt;
-
-	@LastModifiedDate
-	@Column(name = "updatedAt")
-	private LocalDateTime updatedAt;
-
-	@Column(name = "deletedAt")
-	private LocalDateTime deletedAt;
-
-	@Column(name = "jobGroup", length = 30)
+	@Column(length = 30)
 	private String jobGroup;
-
-	@Column(name = "userType", length = 10)
+	@Column(length = 10)
 	private UserType userType;
 }

src/main/java/com/clone/wanted/application/Application.java

@@ -1,6 +1,8 @@
 package com.clone.wanted.application;
 
 import com.clone.wanted.BaseEntity;
+import com.clone.wanted.User.User;
+import com.clone.wanted.employment.Employment;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -12,12 +14,13 @@
 public class Application extends BaseEntity {
 
     @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "application_id")
     private Long id;
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "userId")
+    @JoinColumn(name = "user_id")
     private User user;
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "employmentId")
+    @JoinColumn(name = "employment_id")
     private Employment employment;
     @Enumerated(EnumType.STRING)
     private ApplicationStatus applicationStatus;

src/main/java/com/clone/wanted/employment/Employment.java

@@ -1,6 +1,8 @@
 package com.clone.wanted.employment;
 
 
+import com.clone.wanted.BaseEntity;
+import com.clone.wanted.Company.Company;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -13,34 +15,23 @@
 @Getter
 @NoArgsConstructor
 @Entity
-@DynamicInsert
-@DynamicUpdate
-@Table(name="Employment")
-public class Employment {
+public class Employment extends BaseEntity {
 
     /*Todo 1 develop 브랜치에서  merge 후 Company  FK키 오류 해결되는지 확인하기 */
     /*Todo 2 BaseEntity로 created_at, updated_at, deleted_at 상속받기 */
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private int employmentId;
-
-
-    @ManyToOne
+    @Column(name = "employment_id")
+    private Long id;
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name="company_id")
     private Company company;
-
     private String employmentTitle;
-
     private String employmentContents;
-
     private String address;
-
-    private LocalDateTime deadline;
-
-    private int employmentReward;
-
-    private String position;
-
+    private String deadline;
+    private int recommenderReward;
+    private int applicantReward;
 
 }

src/main/java/com/clone/wanted/employment/EmploymentHashtag.java

@@ -7,14 +7,14 @@
 @Entity
 @Getter
 @NoArgsConstructor
-@Table(name="EmploymentHashtag")
 public class EmploymentHashtag {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private int employmentHashtagId;
+    @Column(name = "employmnet_hashtag_id")
+    private Long id;
 
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name="employment_id")
     private Employment employment;
 

src/main/java/com/clone/wanted/likes/Likes.java

@@ -1,24 +1,28 @@
 package com.clone.wanted.likes;
 
 
+import com.clone.wanted.User.User;
+import com.clone.wanted.employment.Employment;
 import jakarta.persistence.*;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Entity
 @Getter
-@Table(name="Likes")
+@NoArgsConstructor
 public class Likes {
 
     /*Todo User, Employment FK 값 develop 에 머지 후 오류 해결되는지 확인*/
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int likeId;
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "like_id")
+    private Long id;
 
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name="user_id")
     private User user;
 
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name="employment_id")
     private Employment employment;
 

src/main/java/com/clone/wanted/skill/EmploymentSkill.java

@@ -1,5 +1,6 @@
 package com.clone.wanted.skill;
 
+import com.clone.wanted.employment.Employment;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -10,12 +11,12 @@
 public class EmploymentSkill {
 
     @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "EmploymentSkillId")
+    @Column(name = "Employment_skill_id")
     private Long id;
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "skillId")
+    @JoinColumn(name = "skill_id")
     private Skill skill;
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "employmentId")
+    @JoinColumn(name = "employment_id")
     private Employment employment;
 }

src/main/java/com/clone/wanted/skill/Skill.java

@@ -10,7 +10,7 @@
 public class Skill {
 
     @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "skillId")
+    @Column(name = "skill_id")
     private Long id;
     @Column(length = 20)
     private String skillName;

src/main/resources/application.yml

@@ -6,7 +6,16 @@ spring:
     name: wanted
 
   datasource:
-    url: jdbc:mysql://localhost:3306/wanted
-    username: root
-    password: qwer1234
+    url: jdbc:mysql://localhost:3306/${DB_DATABASE_NAME}
+    username: ${DB_USERNAME}
+    password: ${DB_PASSWORD}
     driver-class-name: com.mysql.cj.jdbc.Driver # mysql 8버전
+  jpa:
+    database: mysql
+    database-platform: org.hibernate.dialect.MySQL8Dialect
+    show-sql: true
+    hibernate:
+      ddl-auto: create-drop
+    properties:
+      hibernate:
+        format_sql: true