Skip to content

Commit

Permalink
๐Ÿ—ƒ๏ธ [FEAT] ์—”ํ‹ฐํ‹ฐ ์—ฐ๊ด€๊ด€๊ณ„ ์„ค์ • DS-UMC-7th#2
Browse files Browse the repository at this point in the history
  • Loading branch information
7beunseo committed Oct 11, 2024
1 parent 4d31136 commit f6aaf4f
Show file tree
Hide file tree
Showing 15 changed files with 169 additions and 8 deletions.
5 changes: 5 additions & 0 deletions spring/src/main/java/umc/spring/domain/Alarm.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,9 @@ public class Alarm extends BaseEntity {

@Column(name = "is_read")
private Boolean isRead;

// inquiry
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id")
private User user;
}
21 changes: 21 additions & 0 deletions spring/src/main/java/umc/spring/domain/Comment.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import lombok.*;
import umc.spring.domain.common.BaseEntity;

import java.util.List;

@Entity
@Getter
@Builder
Expand All @@ -22,4 +24,23 @@ public class Comment extends BaseEntity {

@Column(name = "content") // ๊ธฐ๋ณธ 255์ž
private String content;

// market
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "market_id")
private Market market;

// user
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id")
private User user;

// comment image
@OneToMany(mappedBy = "comment", cascade = CascadeType.ALL, orphanRemoval = true)
private List<CommentImage> commentImages;

// comment reply
@OneToMany(mappedBy = "comment", cascade = CascadeType.ALL, orphanRemoval = true)
private List<CommentReply> commentReplies;

}
5 changes: 5 additions & 0 deletions spring/src/main/java/umc/spring/domain/CommentImage.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,9 @@ public class CommentImage extends BaseEntity {

@Column(name = "image_url", length = 40)
private String imageUrl;

// comment
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "comment_id")
private Comment comment;
}
5 changes: 5 additions & 0 deletions spring/src/main/java/umc/spring/domain/CommentReply.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,9 @@ public class CommentReply extends BaseEntity {

@Column(name = "content") // 255์ž
private String content;

// comment
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "comment_id")
private Comment comment;
}
6 changes: 6 additions & 0 deletions spring/src/main/java/umc/spring/domain/FoodCategory.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import lombok.*;
import umc.spring.domain.common.BaseEntity;

import java.util.List;

@Entity
@Getter
@Builder
Expand All @@ -16,4 +18,8 @@ public class FoodCategory extends BaseEntity {

@Column(name = "name", length = 20)
private String name;

// food like
@OneToMany(mappedBy = "foodCategory", cascade = CascadeType.ALL, orphanRemoval = true)
private List<FoodLike> foodLikes;
}
26 changes: 26 additions & 0 deletions spring/src/main/java/umc/spring/domain/FoodLike.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package umc.spring.domain;

import jakarta.persistence.*;
import lombok.*;
import umc.spring.domain.common.BaseEntity;

@Entity
@Getter
@Builder
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor
public class FoodLike extends BaseEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

// food category
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "food_category_id")
private FoodCategory foodCategory;

// user
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id")
private User user;
}
15 changes: 15 additions & 0 deletions spring/src/main/java/umc/spring/domain/Inquiry.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import umc.spring.domain.common.BaseEntity;
import umc.spring.domain.enums.InquiryStatus;

import java.util.List;

@Entity
@Getter
@Builder
Expand All @@ -24,4 +26,17 @@ public class Inquiry extends BaseEntity {
@Enumerated(EnumType.STRING)
@Column(name = "status")
private InquiryStatus status;

// user
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id")
private User user;

// inquiry image
@OneToMany(mappedBy = "inquiry", cascade = CascadeType.ALL, orphanRemoval = true)
private List<InquiryImage> inquiryImages;

// inquiry reply
@OneToMany(mappedBy = "inquiry", cascade = CascadeType.ALL, orphanRemoval = true)
private List<InquiryReply> inquiryReplies;
}
5 changes: 5 additions & 0 deletions spring/src/main/java/umc/spring/domain/InquiryImage.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,9 @@ public class InquiryImage {

@Column(name = "image_url")
private String imageUrl;

// inquiry
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "inquiry_id")
private Inquiry inquiry;
}
5 changes: 5 additions & 0 deletions spring/src/main/java/umc/spring/domain/InquiryReply.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,9 @@ public class InquiryReply {

@Column(name = "content")
private String content;

// inquiry
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "inquiry_id")
private Inquiry inquiry;
}
6 changes: 6 additions & 0 deletions spring/src/main/java/umc/spring/domain/Location.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import lombok.*;
import umc.spring.domain.common.BaseEntity;

import java.util.List;

@Entity
@Getter
@Builder
Expand All @@ -16,4 +18,8 @@ public class Location extends BaseEntity {

@Column(name = "name", length = 20)
private String name;

// location์—์„œ market ์ •๋ณด ์ฐธ์กฐ ๅคš
@OneToMany(mappedBy = "location", cascade = CascadeType.ALL, orphanRemoval = true)
private List<Market> markets;
}
15 changes: 15 additions & 0 deletions spring/src/main/java/umc/spring/domain/Market.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import java.time.LocalDate;
import java.time.LocalTime;
import java.util.List;

@Entity
@Getter
Expand Down Expand Up @@ -35,4 +36,18 @@ public class Market extends BaseEntity {

@Column(name = "star")
private Float star;

// location
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "location_id")
private Location location;

// market image
@OneToMany(mappedBy = "market", cascade = CascadeType.ALL, orphanRemoval = true)
private List<MarketImage> marketImages;

// comment
@OneToMany(mappedBy = "market", cascade = CascadeType.ALL, orphanRemoval = true)
private List<Comment> comments;

}
16 changes: 12 additions & 4 deletions spring/src/main/java/umc/spring/domain/MarketImage.java
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
package umc.spring.domain;

import jakarta.persistence.Column;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.*;
import lombok.*;
import umc.spring.domain.common.BaseEntity;

@Entity
@Getter
@Builder
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor
public class MarketImage extends BaseEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Column(name = "image_url")
private String imageUrl;

// market
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "market_id")
private Market market;
}
16 changes: 12 additions & 4 deletions spring/src/main/java/umc/spring/domain/Mission.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
package umc.spring.domain;

import jakarta.persistence.Column;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.*;
import lombok.*;
import umc.spring.domain.common.BaseEntity;

import java.time.LocalDate;
import java.util.List;

@Entity
@Getter
@Builder
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor
public class Mission extends BaseEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Expand All @@ -21,4 +25,8 @@ public class Mission extends BaseEntity {

@Column(name = "point")
private Integer point;

// mission
@OneToMany(mappedBy = "mission", cascade = CascadeType.ALL, orphanRemoval = true)
private List<UserMission> missions;
}
21 changes: 21 additions & 0 deletions spring/src/main/java/umc/spring/domain/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import umc.spring.domain.enums.SocialType;

import java.time.LocalDate;
import java.util.List;

@Entity
@Getter
Expand Down Expand Up @@ -67,4 +68,24 @@ public class User extends BaseEntity {

@Column(name = "inactive_date")
private LocalDate inactiveDate;

// comment
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
private List<Comment> comments;

// inquiry
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
private List<Inquiry> inquiries;

// alarm
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
private List<Alarm> alarms;

// food like
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
private List<FoodLike> foodLikes;

// mission
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
private List<UserMission> missions;
}
10 changes: 10 additions & 0 deletions spring/src/main/java/umc/spring/domain/UserMission.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,14 @@ public class UserMission extends BaseEntity {
@Enumerated(EnumType.STRING)
@Column(name = "status")
private MemberStatus status;

// user
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id")
private User user;

// mission
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "mission_id")
private Mission mission;
}

0 comments on commit f6aaf4f

Please sign in to comment.