From 93ced38e0f1bfc329940c4d35312e5398190321e Mon Sep 17 00:00:00 2001 From: jungeun Date: Tue, 23 Jul 2024 00:16:40 +0900 Subject: [PATCH 01/12] =?UTF-8?q?feat=20:=20Base=20=EB=94=94=EB=A0=89?= =?UTF-8?q?=ED=86=A0=EB=A6=AC=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../likelion12/domain/base/BaseStatus.java | 6 +++++ .../likelion12/domain/base/BaseTime.java | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 src/main/java/com/example/likelion12/domain/base/BaseStatus.java create mode 100644 src/main/java/com/example/likelion12/domain/base/BaseTime.java diff --git a/src/main/java/com/example/likelion12/domain/base/BaseStatus.java b/src/main/java/com/example/likelion12/domain/base/BaseStatus.java new file mode 100644 index 0000000..4d35fa7 --- /dev/null +++ b/src/main/java/com/example/likelion12/domain/base/BaseStatus.java @@ -0,0 +1,6 @@ +package com.example.likelion12.domain.base; + +public enum BaseStatus { + ACTIVE, + DELETE +} diff --git a/src/main/java/com/example/likelion12/domain/base/BaseTime.java b/src/main/java/com/example/likelion12/domain/base/BaseTime.java new file mode 100644 index 0000000..202a913 --- /dev/null +++ b/src/main/java/com/example/likelion12/domain/base/BaseTime.java @@ -0,0 +1,23 @@ +package com.example.likelion12.domain.base; + +import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +public class BaseTime { + + @CreatedDate + @Column(nullable = false) + private LocalDateTime createdAt; + + @LastModifiedDate + private LocalDateTime modifiedAt; + +} From 5cd1f3261edff4913dce9b794964ce953403f0bb Mon Sep 17 00:00:00 2001 From: jungeun Date: Tue, 23 Jul 2024 00:48:16 +0900 Subject: [PATCH 02/12] =?UTF-8?q?feat=20:=20Base=20=EB=94=94=EB=A0=89?= =?UTF-8?q?=ED=86=A0=EB=A6=AC=EC=97=90=20BaseRole=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/likelion12/domain/base/BaseRole.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/main/java/com/example/likelion12/domain/base/BaseRole.java diff --git a/src/main/java/com/example/likelion12/domain/base/BaseRole.java b/src/main/java/com/example/likelion12/domain/base/BaseRole.java new file mode 100644 index 0000000..9b5cfcc --- /dev/null +++ b/src/main/java/com/example/likelion12/domain/base/BaseRole.java @@ -0,0 +1,6 @@ +package com.example.likelion12.domain.base; + +public enum BaseRole { + CAPTAIN, + CREW +} From 1c5209495924a11fa72ce5d8c63d114562625e4f Mon Sep 17 00:00:00 2001 From: jungeun Date: Tue, 23 Jul 2024 01:03:05 +0900 Subject: [PATCH 03/12] =?UTF-8?q?feat=20:=20domain=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../likelion12/domain/ActivityRegion.java | 39 +++++++++++ .../com/example/likelion12/domain/Crew.java | 63 +++++++++++++++++ .../example/likelion12/domain/Exercise.java | 39 +++++++++++ .../example/likelion12/domain/Facility.java | 56 ++++++++++++++++ .../com/example/likelion12/domain/Member.java | 46 +++++++++++-- .../example/likelion12/domain/MemberCrew.java | 42 ++++++++++++ .../likelion12/domain/MemberSocialring.java | 42 ++++++++++++ .../com/example/likelion12/domain/Review.java | 42 ++++++++++++ .../example/likelion12/domain/Socialring.java | 67 +++++++++++++++++++ 9 files changed, 429 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/example/likelion12/domain/ActivityRegion.java create mode 100644 src/main/java/com/example/likelion12/domain/Crew.java create mode 100644 src/main/java/com/example/likelion12/domain/Exercise.java create mode 100644 src/main/java/com/example/likelion12/domain/Facility.java create mode 100644 src/main/java/com/example/likelion12/domain/MemberCrew.java create mode 100644 src/main/java/com/example/likelion12/domain/MemberSocialring.java create mode 100644 src/main/java/com/example/likelion12/domain/Review.java create mode 100644 src/main/java/com/example/likelion12/domain/Socialring.java diff --git a/src/main/java/com/example/likelion12/domain/ActivityRegion.java b/src/main/java/com/example/likelion12/domain/ActivityRegion.java new file mode 100644 index 0000000..20ed722 --- /dev/null +++ b/src/main/java/com/example/likelion12/domain/ActivityRegion.java @@ -0,0 +1,39 @@ +package com.example.likelion12.domain; + +import com.example.likelion12.domain.base.BaseStatus; +import com.example.likelion12.domain.base.BaseTime; +import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@AllArgsConstructor +@NoArgsConstructor +public class ActivityRegion extends BaseTime { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "activity_region_id", nullable = false) + private long activityRegionId; + + @Column(nullable = false) + private String activityRegionName; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private BaseStatus status; + + @JsonIgnore + @OneToMany(mappedBy = "activityRegion") + private List crewList = new ArrayList<>(); + + @JsonIgnore + @OneToMany(mappedBy = "activityRegion") + private List socialringList = new ArrayList<>(); +} diff --git a/src/main/java/com/example/likelion12/domain/Crew.java b/src/main/java/com/example/likelion12/domain/Crew.java new file mode 100644 index 0000000..bc521c0 --- /dev/null +++ b/src/main/java/com/example/likelion12/domain/Crew.java @@ -0,0 +1,63 @@ +package com.example.likelion12.domain; + +import com.example.likelion12.domain.base.BaseStatus; +import com.example.likelion12.domain.base.BaseTime; +import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.List; + +import static jakarta.persistence.FetchType.LAZY; + +@Entity +@Getter +@AllArgsConstructor +@NoArgsConstructor +public class Crew extends BaseTime { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "crew_id", nullable = false) + private long crewId; + + @Column(nullable = false) + private String crewName; + + private String crewImg; + + @Column(nullable = false) + private int totalRecruits; + + @Column(nullable = false) + private int crewCost; + + @Column(nullable = false) + private String comment; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private BaseStatus status; + + @JsonIgnore + @OneToMany(mappedBy = "crew") + private List memberCrewList = new ArrayList<>(); + + /** 체육시설 과의 연관관계의 주인 */ + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "facility_id") + private Facility facility; + + /** 활동지역 과의 연관관계의 주인 */ + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "activity_region_id") + private ActivityRegion activityRegion; + + /** 운동종목 과의 연관관계의 주인 */ + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "exercise_id") + private Exercise exercise; +} diff --git a/src/main/java/com/example/likelion12/domain/Exercise.java b/src/main/java/com/example/likelion12/domain/Exercise.java new file mode 100644 index 0000000..b7f1f44 --- /dev/null +++ b/src/main/java/com/example/likelion12/domain/Exercise.java @@ -0,0 +1,39 @@ +package com.example.likelion12.domain; + +import com.example.likelion12.domain.base.BaseStatus; +import com.example.likelion12.domain.base.BaseTime; +import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@AllArgsConstructor +@NoArgsConstructor +public class Exercise extends BaseTime { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "exercise_id", nullable = false) + private long exerciseId; + + @Column(nullable = false) + private String exerciseName; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private BaseStatus status; + + @JsonIgnore + @OneToMany(mappedBy = "exercise") + private List crewList = new ArrayList<>(); + + @JsonIgnore + @OneToMany(mappedBy = "exercise") + private List socialringList = new ArrayList<>(); +} diff --git a/src/main/java/com/example/likelion12/domain/Facility.java b/src/main/java/com/example/likelion12/domain/Facility.java new file mode 100644 index 0000000..ae45590 --- /dev/null +++ b/src/main/java/com/example/likelion12/domain/Facility.java @@ -0,0 +1,56 @@ +package com.example.likelion12.domain; + +import com.example.likelion12.domain.base.BaseStatus; +import com.example.likelion12.domain.base.BaseTime; +import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +import static jakarta.persistence.FetchType.LAZY; + +@Entity +@Getter +@AllArgsConstructor +@NoArgsConstructor +public class Facility extends BaseTime { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "facility_id", nullable = false) + private long facilityId; + + @Column(nullable = false) + private String facilityName; + + @Column(nullable = false) + private String facilityAddress; + + private String facilityPhone; + private String facilitySize; + private String administer; + private LocalDateTime weekday; + private LocalDateTime weekend; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private BaseStatus status; + + @JsonIgnore + @OneToMany(mappedBy = "facility") + private List reviewList = new ArrayList<>(); + + @JsonIgnore + @OneToMany(mappedBy = "facility") + private List socialringList = new ArrayList<>(); + + @JsonIgnore + @OneToMany(mappedBy = "facility") + private List crewList = new ArrayList<>(); +} diff --git a/src/main/java/com/example/likelion12/domain/Member.java b/src/main/java/com/example/likelion12/domain/Member.java index 1d54fbe..339d8d6 100644 --- a/src/main/java/com/example/likelion12/domain/Member.java +++ b/src/main/java/com/example/likelion12/domain/Member.java @@ -1,23 +1,55 @@ package com.example.likelion12.domain; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; +import com.example.likelion12.domain.base.BaseStatus; +import com.example.likelion12.domain.base.BaseTime; +import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import java.util.ArrayList; +import java.util.List; + @Entity @Getter @AllArgsConstructor @NoArgsConstructor -public class Member { +public class Member extends BaseTime { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - private long id; - private String name; + @Column(name = "member_id", nullable = false) + private long memberId; + + @Column(nullable = false) + private String memberName; + + @Column(nullable = false) + private String id; + + @Column(nullable = false) + private String password; + + private String memberImg; + + @Column(nullable = false) + private String memberPhone; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private BaseStatus status; + + @JsonIgnore + @OneToMany(mappedBy = "member") + private List reviewList = new ArrayList<>(); + + @JsonIgnore + @OneToMany(mappedBy = "member") + private List memerSocialringList = new ArrayList<>(); + @JsonIgnore + @OneToMany(mappedBy = "member") + private List memberCrewList = new ArrayList<>(); } diff --git a/src/main/java/com/example/likelion12/domain/MemberCrew.java b/src/main/java/com/example/likelion12/domain/MemberCrew.java new file mode 100644 index 0000000..d0e8935 --- /dev/null +++ b/src/main/java/com/example/likelion12/domain/MemberCrew.java @@ -0,0 +1,42 @@ +package com.example.likelion12.domain; + +import com.example.likelion12.domain.base.BaseRole; +import com.example.likelion12.domain.base.BaseStatus; +import com.example.likelion12.domain.base.BaseTime; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import static jakarta.persistence.FetchType.LAZY; + +@Entity +@Getter +@AllArgsConstructor +@NoArgsConstructor +public class MemberCrew extends BaseTime { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "member_crew_id", nullable = false) + private long memberCrewId; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private BaseRole role; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private BaseStatus status; + + /** 크루 과의 연관관계의 주인 */ + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "crew_id") + private Crew crew; + + /** 멤버 와의 연관관계의 주인 */ + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "member_id") + private Member member; + +} diff --git a/src/main/java/com/example/likelion12/domain/MemberSocialring.java b/src/main/java/com/example/likelion12/domain/MemberSocialring.java new file mode 100644 index 0000000..264b57a --- /dev/null +++ b/src/main/java/com/example/likelion12/domain/MemberSocialring.java @@ -0,0 +1,42 @@ +package com.example.likelion12.domain; + +import com.example.likelion12.domain.base.BaseRole; +import com.example.likelion12.domain.base.BaseStatus; +import com.example.likelion12.domain.base.BaseTime; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import static jakarta.persistence.FetchType.LAZY; + +@Entity +@Getter +@AllArgsConstructor +@NoArgsConstructor +public class MemberSocialring extends BaseTime { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "member_socialring_id", nullable = false) + private long memberSocialringId; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private BaseRole role; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private BaseStatus status; + + /** 크루 과의 연관관계의 주인 */ + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "socialring_id") + private Socialring socialring; + + /** 멤버 와의 연관관계의 주인 */ + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "member_id") + private Member member; + +} diff --git a/src/main/java/com/example/likelion12/domain/Review.java b/src/main/java/com/example/likelion12/domain/Review.java new file mode 100644 index 0000000..abf39ab --- /dev/null +++ b/src/main/java/com/example/likelion12/domain/Review.java @@ -0,0 +1,42 @@ +package com.example.likelion12.domain; + +import com.example.likelion12.domain.base.BaseStatus; +import com.example.likelion12.domain.base.BaseTime; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import static jakarta.persistence.FetchType.LAZY; + +@Entity +@Getter +@AllArgsConstructor +@NoArgsConstructor +public class Review extends BaseTime { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "review_id", nullable = false) + private long reviewId; + + @Column(nullable = false) + private String comment; + + @Column(nullable = false) + private int ranking; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private BaseStatus status; + + /** 멤버 와의 연관관계의 주인 */ + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "member_id") + private Member member; + + /** 체육시설 과의 연관관계의 주인 */ + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "facility_id") + private Facility facility; +} diff --git a/src/main/java/com/example/likelion12/domain/Socialring.java b/src/main/java/com/example/likelion12/domain/Socialring.java new file mode 100644 index 0000000..f80c464 --- /dev/null +++ b/src/main/java/com/example/likelion12/domain/Socialring.java @@ -0,0 +1,67 @@ +package com.example.likelion12.domain; + +import com.example.likelion12.domain.base.BaseStatus; +import com.example.likelion12.domain.base.BaseTime; +import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +import static jakarta.persistence.FetchType.LAZY; + +@Entity +@Getter +@AllArgsConstructor +@NoArgsConstructor +public class Socialring extends BaseTime { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "socialring_id", nullable = false) + private long socialringId; + + @Column(nullable = false) + private String socialringName; + + private String socialringImg; + + @Column(nullable = false) + private int totalRecruits; + + @Column(nullable = false) + private LocalDateTime socialringDate; + + @Column(nullable = false) + private int socialringCost; + + @Column(nullable = false) + private String comment; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private BaseStatus status; + + @JsonIgnore + @OneToMany(mappedBy = "socialring") + private List memberSocialringList = new ArrayList<>(); + + /** 체육시설 과의 연관관계의 주인 */ + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "facility_id") + private Facility facility; + + /** 활동지역 과의 연관관계의 주인 */ + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "activity_region_id") + private ActivityRegion activityRegion; + + /** 운동종목 과의 연관관계의 주인 */ + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "exercise_id") + private Exercise exercise; +} From 942bd0d1276f1f801decc26d3788431c413f1b67 Mon Sep 17 00:00:00 2001 From: jungeun Date: Wed, 24 Jul 2024 01:53:25 +0900 Subject: [PATCH 04/12] =?UTF-8?q?feat=20:=20gender=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/likelion12/domain/Member.java | 5 +++++ src/main/java/com/example/likelion12/domain/base/Gender.java | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 src/main/java/com/example/likelion12/domain/base/Gender.java diff --git a/src/main/java/com/example/likelion12/domain/Member.java b/src/main/java/com/example/likelion12/domain/Member.java index 339d8d6..2c10dac 100644 --- a/src/main/java/com/example/likelion12/domain/Member.java +++ b/src/main/java/com/example/likelion12/domain/Member.java @@ -2,6 +2,7 @@ import com.example.likelion12.domain.base.BaseStatus; import com.example.likelion12.domain.base.BaseTime; +import com.example.likelion12.domain.base.Gender; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; import lombok.AllArgsConstructor; @@ -36,6 +37,10 @@ public class Member extends BaseTime { @Column(nullable = false) private String memberPhone; + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private Gender gender; + @Enumerated(EnumType.STRING) @Column(nullable = false) private BaseStatus status; diff --git a/src/main/java/com/example/likelion12/domain/base/Gender.java b/src/main/java/com/example/likelion12/domain/base/Gender.java new file mode 100644 index 0000000..077b733 --- /dev/null +++ b/src/main/java/com/example/likelion12/domain/base/Gender.java @@ -0,0 +1,5 @@ +package com.example.likelion12.domain.base; + +public enum Gender { + F, M, U +} From 142a3de50d42c8cefa99e3ec6405d8a4c3ae10d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=90=EB=AA=85=EC=A7=84?= Date: Wed, 24 Jul 2024 12:56:44 +0900 Subject: [PATCH 05/12] =?UTF-8?q?=ED=81=AC=EB=A3=A8/=EC=86=8C=EC=85=9C?= =?UTF-8?q?=EB=A7=81=20=ED=95=9C=EC=A4=84=EC=84=A4=EB=AA=85=20=EC=86=8D?= =?UTF-8?q?=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 0 -> 6148 bytes src/.DS_Store | Bin 0 -> 6148 bytes .../java/com/example/likelion12/domain/Crew.java | 3 +++ .../example/likelion12/domain/Socialring.java | 3 +++ 4 files changed, 6 insertions(+) create mode 100644 .DS_Store create mode 100644 src/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..fc021e74d564dada1dfb6b41f8d94742e4378b12 GIT binary patch literal 6148 zcmeHKJ5Iwu5S?`_WCTS@=(eLn$_-3pXec95LlP8_Y&rb;Jq-l{iH;T;#0_XU0Eghs z?#S_CLJ0`XNV9J}AJ6(Z@??m}46mjGqCOF2P{w2x%NN3a){Z1%SqB=vM>!jeCUrIM zM5^JhGQjUHrEQwgDP2bI&+MJGeN|l)$j0Oq|yqi zp3@OcsifnmHr+gY_P6W5>^JqJdsOw}49jAobI>E7qemAw$0R<%=Ig@KuKj-7)Rw$< z)vhxwSc-R1ImCh&@jN?2McA)1zkY@>A>Pg0ALEU7wmbK z;2bNM3%Y>tKukylhEyXXh6(AgTZzjBUBHk|Mura~m5od&##hJvtq&)Y2h>#=PzGWK zdf~Fq{eO4){2wRjl`^0V{3`}bT8xSz9!Yv@=i#{5TIeB^h2vbnCIuVciV@4LcmwJM YcFP-JF6aWn0?|JLo(5f%fgfey11|JtqW}N^ literal 0 HcmV?d00001 diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..97b860fbcfd41c45be092cb442b9fa0dc5077773 GIT binary patch literal 6148 zcmeHKy-EZ@3{G^51)BpK?WVK7H&~DL2@b6FJW=7+J@D-3Q3Pv!48h(9@KOBoqwe5h zDWVC?e7R&Y+5MKAOo)hQx63KfgotVkK^A31#60TS^2Oq0*<*DvouBpHdSsK|YLaKK zsH0Q5qU-Yc_qT_>u5a7Ls$alX@7_PW9v?g%mj30p{`KXMn>&Oe?}pClhBjqhdKvnL zd7mE#c|Er4Kl6_H%e?ZPLxO=|AQ%V+{y77v*&_9hVa&lmFc1uUFd*kc!Vqj6v!Nax zn6w1|RxqnT*E=RKi2>L+W Date: Mon, 29 Jul 2024 18:06:47 +0900 Subject: [PATCH 06/12] =?UTF-8?q?feat=20:=20gender=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/likelion12/domain/base/Gender.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/example/likelion12/domain/base/Gender.java b/src/main/java/com/example/likelion12/domain/base/Gender.java index 077b733..23f4b4f 100644 --- a/src/main/java/com/example/likelion12/domain/base/Gender.java +++ b/src/main/java/com/example/likelion12/domain/base/Gender.java @@ -2,4 +2,5 @@ public enum Gender { F, M, U + } From 5afd2d6f7cb11d9306a1889715b51915e726bf23 Mon Sep 17 00:00:00 2001 From: jungeun Date: Mon, 29 Jul 2024 18:13:22 +0900 Subject: [PATCH 07/12] =?UTF-8?q?feat=20:=20.gitignore=20=EC=97=90=20DS=5F?= =?UTF-8?q?store=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index c2065bc..6ad92c4 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,5 @@ out/ ### VS Code ### .vscode/ +### macOS ### +.DS_Store \ No newline at end of file From 5b28104fa34f928af06850b2552099ab8131ef1a Mon Sep 17 00:00:00 2001 From: jungeun Date: Mon, 29 Jul 2024 18:33:19 +0900 Subject: [PATCH 08/12] =?UTF-8?q?feat=20:=20level=20enum=20=ED=81=B4?= =?UTF-8?q?=EB=9E=98=EC=8A=A4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../likelion12/domain/base/{Gender.java => BaseGender.java} | 2 +- .../java/com/example/likelion12/domain/base/BaseLevel.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) rename src/main/java/com/example/likelion12/domain/base/{Gender.java => BaseGender.java} (70%) create mode 100644 src/main/java/com/example/likelion12/domain/base/BaseLevel.java diff --git a/src/main/java/com/example/likelion12/domain/base/Gender.java b/src/main/java/com/example/likelion12/domain/base/BaseGender.java similarity index 70% rename from src/main/java/com/example/likelion12/domain/base/Gender.java rename to src/main/java/com/example/likelion12/domain/base/BaseGender.java index 23f4b4f..5730863 100644 --- a/src/main/java/com/example/likelion12/domain/base/Gender.java +++ b/src/main/java/com/example/likelion12/domain/base/BaseGender.java @@ -1,6 +1,6 @@ package com.example.likelion12.domain.base; -public enum Gender { +public enum BaseGender { F, M, U } diff --git a/src/main/java/com/example/likelion12/domain/base/BaseLevel.java b/src/main/java/com/example/likelion12/domain/base/BaseLevel.java new file mode 100644 index 0000000..aae816d --- /dev/null +++ b/src/main/java/com/example/likelion12/domain/base/BaseLevel.java @@ -0,0 +1,5 @@ +package com.example.likelion12.domain.base; + +public enum BaseLevel { + S, A, B, C; +} From 94b3442ab891772cbec640ec3864e6d3446a56df Mon Sep 17 00:00:00 2001 From: jungeun Date: Mon, 29 Jul 2024 18:33:33 +0900 Subject: [PATCH 09/12] =?UTF-8?q?feat=20:=20=ED=81=AC=EB=A3=A8=EB=9E=91=20?= =?UTF-8?q?=EC=86=8C=EC=85=9C=EB=A7=81=EC=97=90=20gender,=20level=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/likelion12/domain/Crew.java | 10 ++++++++++ .../java/com/example/likelion12/domain/Member.java | 4 ++-- .../java/com/example/likelion12/domain/Socialring.java | 10 ++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/likelion12/domain/Crew.java b/src/main/java/com/example/likelion12/domain/Crew.java index e921869..ce33c97 100644 --- a/src/main/java/com/example/likelion12/domain/Crew.java +++ b/src/main/java/com/example/likelion12/domain/Crew.java @@ -1,5 +1,7 @@ package com.example.likelion12.domain; +import com.example.likelion12.domain.base.BaseGender; +import com.example.likelion12.domain.base.BaseLevel; import com.example.likelion12.domain.base.BaseStatus; import com.example.likelion12.domain.base.BaseTime; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -41,6 +43,14 @@ public class Crew extends BaseTime { @Column(nullable = false) private String commentSimple; + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private BaseGender gender; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private BaseLevel level; + @Enumerated(EnumType.STRING) @Column(nullable = false) private BaseStatus status; diff --git a/src/main/java/com/example/likelion12/domain/Member.java b/src/main/java/com/example/likelion12/domain/Member.java index 2c10dac..8a6266d 100644 --- a/src/main/java/com/example/likelion12/domain/Member.java +++ b/src/main/java/com/example/likelion12/domain/Member.java @@ -2,7 +2,7 @@ import com.example.likelion12.domain.base.BaseStatus; import com.example.likelion12.domain.base.BaseTime; -import com.example.likelion12.domain.base.Gender; +import com.example.likelion12.domain.base.BaseGender; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; import lombok.AllArgsConstructor; @@ -39,7 +39,7 @@ public class Member extends BaseTime { @Enumerated(EnumType.STRING) @Column(nullable = false) - private Gender gender; + private BaseGender gender; @Enumerated(EnumType.STRING) @Column(nullable = false) diff --git a/src/main/java/com/example/likelion12/domain/Socialring.java b/src/main/java/com/example/likelion12/domain/Socialring.java index b607984..8468678 100644 --- a/src/main/java/com/example/likelion12/domain/Socialring.java +++ b/src/main/java/com/example/likelion12/domain/Socialring.java @@ -1,5 +1,7 @@ package com.example.likelion12.domain; +import com.example.likelion12.domain.base.BaseGender; +import com.example.likelion12.domain.base.BaseLevel; import com.example.likelion12.domain.base.BaseStatus; import com.example.likelion12.domain.base.BaseTime; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -45,6 +47,14 @@ public class Socialring extends BaseTime { @Column(nullable = false) private String commentSimple; + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private BaseGender gender; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private BaseLevel level; + @Enumerated(EnumType.STRING) @Column(nullable = false) private BaseStatus status; From aa7d55b09f7120682042fbef354b1fe9a706a92b Mon Sep 17 00:00:00 2001 From: jungeun Date: Mon, 29 Jul 2024 19:23:23 +0900 Subject: [PATCH 10/12] =?UTF-8?q?feat=20:=20pr=20=ED=85=9C=ED=94=8C?= =?UTF-8?q?=EB=A6=BF=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/pull_request_template.md | 12 ++++++++++++ github/build.gradle | 19 +++++++++++++++++++ github/src/main/java/org/example/Main.java | 19 +++++++++++++++++++ settings.gradle | 2 ++ 4 files changed, 52 insertions(+) create mode 100644 .github/pull_request_template.md create mode 100644 github/build.gradle create mode 100644 github/src/main/java/org/example/Main.java diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..69cf241 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,12 @@ +## 요약 (Summary) +- [x] 작업 내용 요약 + +## 🔑 변경 사항 (Key Changes) + +- 변경 사항 작성 + +## 📝 리뷰 요구사항 (To Reviewers) + +- [ ] 리뷰 요구사항 작성 + +## 확인 방법 diff --git a/github/build.gradle b/github/build.gradle new file mode 100644 index 0000000..f69b966 --- /dev/null +++ b/github/build.gradle @@ -0,0 +1,19 @@ +plugins { + id 'java' +} + +group = 'org.example' +version = '0.0.1-SNAPSHOT' + +repositories { + mavenCentral() +} + +dependencies { + testImplementation platform('org.junit:junit-bom:5.9.1') + testImplementation 'org.junit.jupiter:junit-jupiter' +} + +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/github/src/main/java/org/example/Main.java b/github/src/main/java/org/example/Main.java new file mode 100644 index 0000000..09efe28 --- /dev/null +++ b/github/src/main/java/org/example/Main.java @@ -0,0 +1,19 @@ +package org.example; + +// Press Shift twice to open the Search Everywhere dialog and type `show whitespaces`, +// then press Enter. You can now see whitespace characters in your code. +public class Main { + public static void main(String[] args) { + // Press Opt+Enter with your caret at the highlighted text to see how + // IntelliJ IDEA suggests fixing it. + System.out.printf("Hello and welcome!"); + + // Press Ctrl+R or click the green arrow button in the gutter to run the code. + for (int i = 1; i <= 5; i++) { + + // Press Ctrl+D to start debugging your code. We have set one breakpoint + // for you, but you can always add more by pressing Cmd+F8. + System.out.println("i = " + i); + } + } +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 0a383dd..c2e9956 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,3 @@ rootProject.name = 'demo' +include 'github' + From 32baa27e99eb04327b12b3554c105ec939c59e71 Mon Sep 17 00:00:00 2001 From: jungeun Date: Mon, 29 Jul 2024 19:25:57 +0900 Subject: [PATCH 11/12] =?UTF-8?q?feat=20:=20pr=20=ED=85=9C=ED=94=8C?= =?UTF-8?q?=EB=A6=BF=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/pull_request_template.md | 12 ------------ github/build.gradle | 19 ------------------- github/src/main/java/org/example/Main.java | 19 ------------------- 3 files changed, 50 deletions(-) delete mode 100644 .github/pull_request_template.md delete mode 100644 github/build.gradle delete mode 100644 github/src/main/java/org/example/Main.java diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md deleted file mode 100644 index 69cf241..0000000 --- a/.github/pull_request_template.md +++ /dev/null @@ -1,12 +0,0 @@ -## 요약 (Summary) -- [x] 작업 내용 요약 - -## 🔑 변경 사항 (Key Changes) - -- 변경 사항 작성 - -## 📝 리뷰 요구사항 (To Reviewers) - -- [ ] 리뷰 요구사항 작성 - -## 확인 방법 diff --git a/github/build.gradle b/github/build.gradle deleted file mode 100644 index f69b966..0000000 --- a/github/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -plugins { - id 'java' -} - -group = 'org.example' -version = '0.0.1-SNAPSHOT' - -repositories { - mavenCentral() -} - -dependencies { - testImplementation platform('org.junit:junit-bom:5.9.1') - testImplementation 'org.junit.jupiter:junit-jupiter' -} - -test { - useJUnitPlatform() -} \ No newline at end of file diff --git a/github/src/main/java/org/example/Main.java b/github/src/main/java/org/example/Main.java deleted file mode 100644 index 09efe28..0000000 --- a/github/src/main/java/org/example/Main.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.example; - -// Press Shift twice to open the Search Everywhere dialog and type `show whitespaces`, -// then press Enter. You can now see whitespace characters in your code. -public class Main { - public static void main(String[] args) { - // Press Opt+Enter with your caret at the highlighted text to see how - // IntelliJ IDEA suggests fixing it. - System.out.printf("Hello and welcome!"); - - // Press Ctrl+R or click the green arrow button in the gutter to run the code. - for (int i = 1; i <= 5; i++) { - - // Press Ctrl+D to start debugging your code. We have set one breakpoint - // for you, but you can always add more by pressing Cmd+F8. - System.out.println("i = " + i); - } - } -} \ No newline at end of file From 7143c4f5aaadf8efc476766c85bc995bc2acfea1 Mon Sep 17 00:00:00 2001 From: jungeun Date: Mon, 29 Jul 2024 19:26:38 +0900 Subject: [PATCH 12/12] =?UTF-8?q?feat=20:=20pr=20=ED=85=9C=ED=94=8C?= =?UTF-8?q?=EB=A6=BF=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/pull_request_template.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..69cf241 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,12 @@ +## 요약 (Summary) +- [x] 작업 내용 요약 + +## 🔑 변경 사항 (Key Changes) + +- 변경 사항 작성 + +## 📝 리뷰 요구사항 (To Reviewers) + +- [ ] 리뷰 요구사항 작성 + +## 확인 방법