Skip to content

Commit 717c8b7

Browse files
authored
Merge pull request #222 from minseo003/develop
refactor: 테이블 키값 auto Increment -> Tsid로 변경
2 parents 0d54184 + 335c9bf commit 717c8b7

21 files changed

Lines changed: 47 additions & 24 deletions

build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,8 @@ dependencies {
5252
testImplementation 'org.springframework.security:spring-security-test'
5353
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
5454

55-
// Spring Kafka 관련 라이브러리 추가
56-
implementation 'org.springframework.kafka:spring-kafka'
57-
implementation 'org.apache.kafka:kafka-clients'
55+
implementation 'com.github.f4b6a3:tsid-creator:5.2.0' // TSID 생성기
56+
implementation 'io.hypersistence:hypersistence-utils-hibernate-60:3.5.1' // Hibernate 6.0 이상용
5857

5958
// jwt 관련
6059
implementation("io.jsonwebtoken:jjwt-api:0.11.5")

src/main/java/com/project/Teaming/domain/mentoring/entity/Category.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
import lombok.AllArgsConstructor;
55
import lombok.Getter;
66
import lombok.NoArgsConstructor;
7-
import org.w3c.dom.stylesheets.LinkStyle;
7+
import io.hypersistence.utils.hibernate.id.Tsid;
8+
9+
810

911
import java.util.ArrayList;
1012
import java.util.List;
@@ -17,7 +19,7 @@
1719
public class Category {
1820

1921
@Id
20-
@GeneratedValue(strategy = GenerationType.IDENTITY)
22+
@Tsid
2123
@Column(name = "category_id")
2224
private Long id;
2325
@Column(name = "category_name",unique = true)

src/main/java/com/project/Teaming/domain/mentoring/entity/Event.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.project.Teaming.domain.mentoring.entity;
22

33
import com.project.Teaming.global.auditing.BaseEntity;
4+
import io.hypersistence.utils.hibernate.id.Tsid;
45
import jakarta.persistence.*;
56
import lombok.AllArgsConstructor;
67
import lombok.Getter;
@@ -13,7 +14,7 @@
1314
@AllArgsConstructor
1415
public class Event extends BaseEntity {
1516
@Id
16-
@GeneratedValue(strategy = GenerationType.IDENTITY)
17+
@Tsid
1718
@Column(name = "event_id")
1819
private Long id; // 일정 ID
1920
@Column(name = "title", nullable = false, length = 100)

src/main/java/com/project/Teaming/domain/mentoring/entity/EventAlarm.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.project.Teaming.domain.mentoring.entity;
22

33
import com.project.Teaming.domain.project.entity.AlarmStatus;
4+
import io.hypersistence.utils.hibernate.id.Tsid;
45
import jakarta.persistence.*;
56
import lombok.AllArgsConstructor;
67
import lombok.Getter;
@@ -13,7 +14,7 @@
1314
@AllArgsConstructor
1415
public class EventAlarm {
1516
@Id
16-
@GeneratedValue(strategy = GenerationType.IDENTITY)
17+
@Tsid
1718
@Column(name = "event_alarm_id")
1819
private Long id; // 일정 알림 ID
1920
@Column(name = "time_set", nullable = false)

src/main/java/com/project/Teaming/domain/mentoring/entity/MentoringBoard.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.project.Teaming.domain.mentoring.dto.request.BoardRequest;
44
import com.project.Teaming.domain.mentoring.dto.response.BoardSpecResponse;
55
import com.project.Teaming.global.auditing.BaseTimeEntity;
6+
import io.hypersistence.utils.hibernate.id.Tsid;
67
import jakarta.persistence.*;
78
import lombok.Builder;
89
import lombok.Getter;
@@ -16,7 +17,7 @@
1617
@NoArgsConstructor
1718
public class MentoringBoard extends BaseTimeEntity {
1819
@Id
19-
@GeneratedValue(strategy = GenerationType.IDENTITY)
20+
@Tsid
2021
@Column(name = "mentoring_board_id")
2122
private Long id; // 멘토링 모집글 ID
2223

src/main/java/com/project/Teaming/domain/mentoring/entity/MentoringParticipation.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.project.Teaming.domain.user.entity.Report;
66
import com.project.Teaming.domain.user.entity.User;
77
import com.project.Teaming.global.auditing.BaseTimeEntity;
8+
import io.hypersistence.utils.hibernate.id.Tsid;
89
import jakarta.persistence.*;
910
import lombok.AccessLevel;
1011
import lombok.Builder;
@@ -22,7 +23,7 @@
2223
@NoArgsConstructor(access = AccessLevel.PROTECTED)
2324
public class MentoringParticipation {
2425
@Id
25-
@GeneratedValue(strategy = GenerationType.IDENTITY)
26+
@Tsid
2627
@Column(name = "mp_id")
2728
private Long id; // 신청 ID
2829
@Column(name = "status")

src/main/java/com/project/Teaming/domain/mentoring/entity/MentoringTeam.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.project.Teaming.domain.mentoring.dto.response.TeamResponse;
44
import com.project.Teaming.domain.mentoring.dto.request.TeamRequest;
55
import com.project.Teaming.global.auditing.BaseEntity;
6+
import io.hypersistence.utils.hibernate.id.Tsid;
67
import jakarta.persistence.*;
78
import lombok.AccessLevel;
89
import lombok.Builder;
@@ -20,7 +21,7 @@
2021
public class MentoringTeam extends BaseEntity {
2122

2223
@Id
23-
@GeneratedValue(strategy = GenerationType.IDENTITY)
24+
@Tsid
2425
@Column(name = "mentoring_team_id")
2526
private Long id; // 멘토링 팀 ID
2627
@Column(name = "mentoring_name", length = 100)

src/main/java/com/project/Teaming/domain/mentoring/entity/TeamCategory.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.project.Teaming.domain.mentoring.entity;
22

3+
import io.hypersistence.utils.hibernate.id.Tsid;
34
import jakarta.persistence.*;
45
import lombok.AllArgsConstructor;
56
import lombok.Getter;
@@ -11,8 +12,9 @@
1112
@NoArgsConstructor
1213
@AllArgsConstructor
1314
public class TeamCategory {
15+
1416
@Id
15-
@GeneratedValue(strategy = GenerationType.IDENTITY)
17+
@Tsid
1618
@Column(name = "team_category_id")
1719
private Long id;
1820
@ManyToOne(fetch = FetchType.LAZY)

src/main/java/com/project/Teaming/domain/project/entity/Alarm.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.project.Teaming.domain.project.entity;
22

33
import com.project.Teaming.global.auditing.BaseEntity;
4+
import io.hypersistence.utils.hibernate.id.Tsid;
45
import jakarta.persistence.*;
56
import lombok.AllArgsConstructor;
67
import lombok.Getter;
@@ -13,7 +14,7 @@
1314
@AllArgsConstructor
1415
public class Alarm extends BaseEntity {
1516
@Id
16-
@GeneratedValue(strategy = GenerationType.IDENTITY)
17+
@Tsid
1718
@Column(name = "event_alarm_id")
1819
private Long id; // 일정 알람 ID
1920
@Column(name = "time_set", nullable = false)

src/main/java/com/project/Teaming/domain/project/entity/ProjectBoard.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.project.Teaming.domain.project.dto.request.CreatePostDto;
44
import com.project.Teaming.global.auditing.BaseTimeEntity;
5+
import io.hypersistence.utils.hibernate.id.Tsid;
56
import jakarta.persistence.*;
67
import java.time.LocalDate;
78
import lombok.AllArgsConstructor;
@@ -15,7 +16,7 @@
1516
@AllArgsConstructor
1617
public class ProjectBoard extends BaseTimeEntity {
1718
@Id
18-
@GeneratedValue(strategy = GenerationType.IDENTITY)
19+
@Tsid
1920
@Column(name = "pj_post_id")
2021
private Long id; // 프로젝트 모집글 ID
2122

0 commit comments

Comments
 (0)