Skip to content

Commit 9a31be8

Browse files
authored
Merge pull request #42 from Grow-Fit/fix/41-erd
ERD 변경에 대한 목표보드 엔티티 수정
2 parents 9ce6068 + f645618 commit 9a31be8

15 files changed

Lines changed: 39 additions & 213 deletions

File tree

src/main/java/com/project/growfit/domain/Goal/entity/CertType.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/main/java/com/project/growfit/domain/Goal/entity/GoalCertDays.java renamed to src/main/java/com/project/growfit/domain/Goal/entity/Certification.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.project.growfit.domain.Goal.entity;
22

3-
import com.project.growfit.global.entity.BaseEntity;
43
import jakarta.persistence.Column;
54
import jakarta.persistence.Entity;
65
import jakarta.persistence.FetchType;
@@ -10,25 +9,29 @@
109
import jakarta.persistence.JoinColumn;
1110
import jakarta.persistence.ManyToOne;
1211
import jakarta.persistence.Table;
12+
import java.time.LocalDateTime;
1313
import lombok.AccessLevel;
1414
import lombok.Getter;
1515
import lombok.NoArgsConstructor;
1616

1717
@Getter
1818
@Entity
19-
@Table(name = "goal_cert_days")
19+
@Table(name = "goal")
2020
@NoArgsConstructor(access = AccessLevel.PROTECTED)
21-
public class GoalCertDays extends BaseEntity {
21+
public class Certification {
2222

2323
@Id
2424
@GeneratedValue(strategy = GenerationType.IDENTITY)
25-
@Column(name = "cert_day_id")
25+
@Column(name = "id")
2626
private Long id;
2727

28-
@Column(name = "day", nullable = false, length = 5)
29-
private String day;
28+
@Column(name = "image_url", nullable = false)
29+
private String imageUrl;
30+
31+
@Column(name = "certified_at", nullable = false)
32+
private LocalDateTime certifiedAt;
3033

3134
@ManyToOne(fetch = FetchType.LAZY)
32-
@JoinColumn(name = "goal_id")
35+
@JoinColumn(name = "goal_id", nullable = false)
3336
private Goal goal;
3437
}

src/main/java/com/project/growfit/domain/Goal/entity/Goal.java

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,20 @@ public class Goal extends BaseEntity {
3131
@Column(name = "goal_id")
3232
private Long id;
3333

34-
@Column(name = "name", nullable = false, length = 100)
34+
@Column(name = "name", length = 100, nullable = false)
3535
private String name;
3636

37-
@Column(name = "count", nullable = false)
38-
private int count;
37+
@Column(name = "icon_id", nullable = false)
38+
private int iconId;
3939

40-
@Column(name = "cert_type", nullable = false)
40+
@Column(name = "status", nullable = false)
4141
@Enumerated(EnumType.STRING)
42-
private CertType certType;
43-
44-
@Column(name = "state", nullable = false)
45-
private GoalState state;
42+
private GoalStatus status;
4643

4744
@ManyToOne(fetch = FetchType.LAZY)
48-
@JoinColumn(name = "goal_type_id")
49-
private GoalType goalType;
50-
51-
@OneToMany(mappedBy = "goal", cascade = CascadeType.ALL, orphanRemoval = true)
52-
private List<GoalCertDays> certDaysList = new ArrayList<>();
45+
@JoinColumn(name = "weekly_goal_id", nullable = false)
46+
private WeeklyGoal weeklyGoal;
5347

5448
@OneToMany(mappedBy = "goal", cascade = CascadeType.ALL, orphanRemoval = true)
55-
private List<GoalAcc> goalAccList = new ArrayList<>();
49+
private List<Certification> certificationList = new ArrayList<>();
5650
}

src/main/java/com/project/growfit/domain/Goal/entity/GoalAcc.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

src/main/java/com/project/growfit/domain/Goal/entity/GoalBoard.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/main/java/com/project/growfit/domain/Goal/entity/GoalProgress.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/main/java/com/project/growfit/domain/Goal/entity/GoalState.java

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package com.project.growfit.domain.Goal.entity;
2+
3+
public enum GoalStatus {
4+
PENDING, PROGRESS, COMPLETE
5+
}

src/main/java/com/project/growfit/domain/Goal/entity/PeriodType.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/main/java/com/project/growfit/domain/Goal/entity/RecommendGoal.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)