From 717601d5acbbb163d16fb1a8d230ec67eb43c848 Mon Sep 17 00:00:00 2001 From: senna Date: Mon, 7 Oct 2024 19:06:15 +0900 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=EA=B8=B0=EB=B3=B8=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=EC=9D=84=20=EC=A0=95=EC=9D=98=ED=95=9C=20entity=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xclone/common/entity/BaseTimeEntity.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/main/java/com/leets/team2/xclone/common/entity/BaseTimeEntity.java diff --git a/src/main/java/com/leets/team2/xclone/common/entity/BaseTimeEntity.java b/src/main/java/com/leets/team2/xclone/common/entity/BaseTimeEntity.java new file mode 100644 index 0000000..8994337 --- /dev/null +++ b/src/main/java/com/leets/team2/xclone/common/entity/BaseTimeEntity.java @@ -0,0 +1,33 @@ +package com.leets.team2.xclone.common.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +@Getter +@Setter +public abstract class BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + protected Long id; + + @CreatedDate + @Column(name = "created_at", nullable = false, updatable = false) + private LocalDateTime createdAt; + + @LastModifiedDate + @Column(name = "updated_at") + private LocalDateTime updatedAt; +} From 95e18c46259fc779373fdbf62b0c4e126b7e2b8c Mon Sep 17 00:00:00 2001 From: senna Date: Mon, 7 Oct 2024 19:06:23 +0900 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20Member=20=EC=97=94=ED=8B=B0?= =?UTF-8?q?=ED=8B=B0=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xclone/domain/member/entities/Member.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 src/main/java/com/leets/team2/xclone/domain/member/entities/Member.java diff --git a/src/main/java/com/leets/team2/xclone/domain/member/entities/Member.java b/src/main/java/com/leets/team2/xclone/domain/member/entities/Member.java new file mode 100644 index 0000000..b3b8898 --- /dev/null +++ b/src/main/java/com/leets/team2/xclone/domain/member/entities/Member.java @@ -0,0 +1,36 @@ +package com.leets.team2.xclone.domain.member.entities; + +import com.leets.team2.xclone.common.entity.BaseTimeEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import java.time.LocalDateTime; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Table(name = "member") +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +public class Member extends BaseTimeEntity { + + @Column(name = "email", nullable = false) + private String email; + + @Column(name = "phone_number", nullable = false) + private String phoneNumber; + + @Column(name = "birth_date", nullable = true) + private LocalDateTime birthDate; + + @Column(name = "name", nullable = false) + private String name; + + @Column(name = "introduction", nullable = true) + private String introduction; +} From f31aa5ede946df57768c724d45bc7a20331488a7 Mon Sep 17 00:00:00 2001 From: senna Date: Mon, 7 Oct 2024 19:07:17 +0900 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=EB=8F=84=EB=A9=94=EC=9D=B8=20?= =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=EB=93=A4=20=EA=BB=8D=EB=8D=B0?= =?UTF-8?q?=EA=B8=B0=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/member/controller/MemberController.java | 5 +++++ .../member/controller/MemberControllerImpl.java | 14 ++++++++++++++ .../domain/member/repository/MemberRepository.java | 9 +++++++++ .../domain/member/service/MemberService.java | 12 ++++++++++++ 4 files changed, 40 insertions(+) create mode 100644 src/main/java/com/leets/team2/xclone/domain/member/controller/MemberController.java create mode 100644 src/main/java/com/leets/team2/xclone/domain/member/controller/MemberControllerImpl.java create mode 100644 src/main/java/com/leets/team2/xclone/domain/member/repository/MemberRepository.java create mode 100644 src/main/java/com/leets/team2/xclone/domain/member/service/MemberService.java diff --git a/src/main/java/com/leets/team2/xclone/domain/member/controller/MemberController.java b/src/main/java/com/leets/team2/xclone/domain/member/controller/MemberController.java new file mode 100644 index 0000000..356da1c --- /dev/null +++ b/src/main/java/com/leets/team2/xclone/domain/member/controller/MemberController.java @@ -0,0 +1,5 @@ +package com.leets.team2.xclone.domain.member.controller; + +public interface MemberController { + +} diff --git a/src/main/java/com/leets/team2/xclone/domain/member/controller/MemberControllerImpl.java b/src/main/java/com/leets/team2/xclone/domain/member/controller/MemberControllerImpl.java new file mode 100644 index 0000000..70bca7e --- /dev/null +++ b/src/main/java/com/leets/team2/xclone/domain/member/controller/MemberControllerImpl.java @@ -0,0 +1,14 @@ +package com.leets.team2.xclone.domain.member.controller; + +import com.leets.team2.xclone.domain.member.service.MemberService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/api/members") +@RequiredArgsConstructor +public class MemberControllerImpl implements MemberController{ + + private final MemberService memberService; +} diff --git a/src/main/java/com/leets/team2/xclone/domain/member/repository/MemberRepository.java b/src/main/java/com/leets/team2/xclone/domain/member/repository/MemberRepository.java new file mode 100644 index 0000000..4b4d6c0 --- /dev/null +++ b/src/main/java/com/leets/team2/xclone/domain/member/repository/MemberRepository.java @@ -0,0 +1,9 @@ +package com.leets.team2.xclone.domain.member.repository; + +import com.leets.team2.xclone.domain.member.entities.Member; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface MemberRepository extends JpaRepository { +} diff --git a/src/main/java/com/leets/team2/xclone/domain/member/service/MemberService.java b/src/main/java/com/leets/team2/xclone/domain/member/service/MemberService.java new file mode 100644 index 0000000..b38b5cd --- /dev/null +++ b/src/main/java/com/leets/team2/xclone/domain/member/service/MemberService.java @@ -0,0 +1,12 @@ +package com.leets.team2.xclone.domain.member.service; + +import com.leets.team2.xclone.domain.member.repository.MemberRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class MemberService { + + private final MemberRepository memberRepository; +} From d2d6dae37558bb7acf40601251ebd97fecb966d2 Mon Sep 17 00:00:00 2001 From: senna Date: Mon, 7 Oct 2024 23:36:27 +0900 Subject: [PATCH 4/5] =?UTF-8?q?rename:=20BaseTimeEntity=20->=20AbstractEnt?= =?UTF-8?q?ity=EB=A1=9C=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/entity/{BaseTimeEntity.java => AbstractEntity.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/main/java/com/leets/team2/xclone/common/entity/{BaseTimeEntity.java => AbstractEntity.java} (95%) diff --git a/src/main/java/com/leets/team2/xclone/common/entity/BaseTimeEntity.java b/src/main/java/com/leets/team2/xclone/common/entity/AbstractEntity.java similarity index 95% rename from src/main/java/com/leets/team2/xclone/common/entity/BaseTimeEntity.java rename to src/main/java/com/leets/team2/xclone/common/entity/AbstractEntity.java index 8994337..f0f00ab 100644 --- a/src/main/java/com/leets/team2/xclone/common/entity/BaseTimeEntity.java +++ b/src/main/java/com/leets/team2/xclone/common/entity/AbstractEntity.java @@ -17,7 +17,7 @@ @EntityListeners(AuditingEntityListener.class) @Getter @Setter -public abstract class BaseTimeEntity { +public abstract class AbstractEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) From 8dc4e4b1fb1f71c6246363ebb0c4570730100c0d Mon Sep 17 00:00:00 2001 From: senna Date: Mon, 7 Oct 2024 23:36:59 +0900 Subject: [PATCH 5/5] =?UTF-8?q?refactor:=20MemberEntity=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - email 삭제 - tag 추가 --- .../xclone/domain/member/entities/Member.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/leets/team2/xclone/domain/member/entities/Member.java b/src/main/java/com/leets/team2/xclone/domain/member/entities/Member.java index b3b8898..f4f2aa1 100644 --- a/src/main/java/com/leets/team2/xclone/domain/member/entities/Member.java +++ b/src/main/java/com/leets/team2/xclone/domain/member/entities/Member.java @@ -1,6 +1,6 @@ package com.leets.team2.xclone.domain.member.entities; -import com.leets.team2.xclone.common.entity.BaseTimeEntity; +import com.leets.team2.xclone.common.entity.AbstractEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Table; @@ -17,10 +17,7 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor(access = AccessLevel.PRIVATE) @Getter -public class Member extends BaseTimeEntity { - - @Column(name = "email", nullable = false) - private String email; +public class Member extends AbstractEntity { @Column(name = "phone_number", nullable = false) private String phoneNumber; @@ -28,8 +25,11 @@ public class Member extends BaseTimeEntity { @Column(name = "birth_date", nullable = true) private LocalDateTime birthDate; - @Column(name = "name", nullable = false) - private String name; + @Column(name = "tag", nullable = false, unique = true) + private String tag; + + @Column(name = "nickname", nullable = false) + private String nickname; @Column(name = "introduction", nullable = true) private String introduction;