From e9bcfb9aa90173e0abd9b08e6019ceb5db49b264 Mon Sep 17 00:00:00 2001 From: eunseob Date: Thu, 24 Aug 2023 16:14:22 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=97=94=ED=8B=B0=ED=8B=B0=20=EC=84=A4?= =?UTF-8?q?=EA=B3=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sequence/anonymous/chat/domain/Chat.java | 18 +++++++ .../anonymous/college/domain/College.java | 18 +++++++ .../anonymous/college/domain/Department.java | 18 +++++++ .../sequence/anonymous/common/BaseEntity.java | 22 +++++++++ .../anonymous/invite/domain/Invite.java | 25 ++++++++++ .../anonymous/invite/domain/InviteKind.java | 6 +++ .../anonymous/invite/domain/InviteStatus.java | 6 +++ .../anonymous/post/domain/MatchPost.java | 34 +++++++++++++ .../post/domain/MatchPostStatus.java | 7 +++ .../anonymous/relation/domain/Relation.java | 22 +++++++++ .../relation/domain/RelationStatus.java | 6 +++ .../sequence/anonymous/tag/domain/Tag.java | 18 +++++++ .../anonymous/user/domain/Attachment.java | 20 ++++++++ .../anonymous/user/domain/FileType.java | 8 +++ .../anonymous/user/domain/Gender.java | 7 +++ .../sequence/anonymous/user/domain/Role.java | 15 ++---- .../sequence/anonymous/user/domain/User.java | 49 ++++++++++++++++--- .../anonymous/user/domain/UserChat.java | 18 +++++++ .../anonymous/user/domain/UserMatchPost.java | 21 ++++++++ .../user/domain/UserMatchPostRole.java | 5 ++ .../anonymous/user/domain/UserTag.java | 19 +++++++ 21 files changed, 344 insertions(+), 18 deletions(-) create mode 100644 src/main/java/com/sequence/anonymous/chat/domain/Chat.java create mode 100644 src/main/java/com/sequence/anonymous/college/domain/College.java create mode 100644 src/main/java/com/sequence/anonymous/college/domain/Department.java create mode 100644 src/main/java/com/sequence/anonymous/common/BaseEntity.java create mode 100644 src/main/java/com/sequence/anonymous/invite/domain/Invite.java create mode 100644 src/main/java/com/sequence/anonymous/invite/domain/InviteKind.java create mode 100644 src/main/java/com/sequence/anonymous/invite/domain/InviteStatus.java create mode 100644 src/main/java/com/sequence/anonymous/post/domain/MatchPost.java create mode 100644 src/main/java/com/sequence/anonymous/post/domain/MatchPostStatus.java create mode 100644 src/main/java/com/sequence/anonymous/relation/domain/Relation.java create mode 100644 src/main/java/com/sequence/anonymous/relation/domain/RelationStatus.java create mode 100644 src/main/java/com/sequence/anonymous/tag/domain/Tag.java create mode 100644 src/main/java/com/sequence/anonymous/user/domain/Attachment.java create mode 100644 src/main/java/com/sequence/anonymous/user/domain/FileType.java create mode 100644 src/main/java/com/sequence/anonymous/user/domain/Gender.java create mode 100644 src/main/java/com/sequence/anonymous/user/domain/UserChat.java create mode 100644 src/main/java/com/sequence/anonymous/user/domain/UserMatchPost.java create mode 100644 src/main/java/com/sequence/anonymous/user/domain/UserMatchPostRole.java create mode 100644 src/main/java/com/sequence/anonymous/user/domain/UserTag.java diff --git a/src/main/java/com/sequence/anonymous/chat/domain/Chat.java b/src/main/java/com/sequence/anonymous/chat/domain/Chat.java new file mode 100644 index 0000000..84ea9e5 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/chat/domain/Chat.java @@ -0,0 +1,18 @@ +package com.sequence.anonymous.chat.domain; + +import jakarta.persistence.*; +import lombok.Getter; + +import java.util.UUID; + +@Entity +@Getter +public class Chat { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "chatId") + private static Long id; + + @Column + private UUID chatIdentifier; +} diff --git a/src/main/java/com/sequence/anonymous/college/domain/College.java b/src/main/java/com/sequence/anonymous/college/domain/College.java new file mode 100644 index 0000000..ddef65e --- /dev/null +++ b/src/main/java/com/sequence/anonymous/college/domain/College.java @@ -0,0 +1,18 @@ +package com.sequence.anonymous; + +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; + +public class College { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "collegeId") + private static Long id; + + @Column + private String name; + + +} diff --git a/src/main/java/com/sequence/anonymous/college/domain/Department.java b/src/main/java/com/sequence/anonymous/college/domain/Department.java new file mode 100644 index 0000000..873b893 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/college/domain/Department.java @@ -0,0 +1,18 @@ +package com.sequence.anonymous.college.domain; + +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; + +public class Department { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "departmentId") + private static Long id; + + @Column(name = "collegeId") + private Long collegeId; + @Column + private String name; +} diff --git a/src/main/java/com/sequence/anonymous/common/BaseEntity.java b/src/main/java/com/sequence/anonymous/common/BaseEntity.java new file mode 100644 index 0000000..8b6cecb --- /dev/null +++ b/src/main/java/com/sequence/anonymous/common/BaseEntity.java @@ -0,0 +1,22 @@ +package com.sequence.anonymous.common; + +import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import lombok.Getter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@Getter @EntityListeners(AuditingEntityListener.class) +@MappedSuperclass +public class BaseEntity { + @CreatedDate + @Column(updatable = false) + private LocalDateTime createdAt; + + @LastModifiedDate + private LocalDateTime updatedAt; +} diff --git a/src/main/java/com/sequence/anonymous/invite/domain/Invite.java b/src/main/java/com/sequence/anonymous/invite/domain/Invite.java new file mode 100644 index 0000000..78b72a4 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/invite/domain/Invite.java @@ -0,0 +1,25 @@ +package com.sequence.anonymous.invite.domain; + +import jakarta.persistence.*; +import lombok.Getter; + +@Entity +@Getter +public class Invite { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "inviteId") + private static Long id; + + @Column(name = "inviterId") + private Long inviter; + + @Column(name = "inviteeId") + private Long invitee; + + @Column + private InviteStatus status; + + @Column + private InviteKind kind; +} diff --git a/src/main/java/com/sequence/anonymous/invite/domain/InviteKind.java b/src/main/java/com/sequence/anonymous/invite/domain/InviteKind.java new file mode 100644 index 0000000..0a159a1 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/invite/domain/InviteKind.java @@ -0,0 +1,6 @@ +package com.sequence.anonymous.invite.domain; + +public enum InviteKind { + MATCH_POST, + FRIEND +} diff --git a/src/main/java/com/sequence/anonymous/invite/domain/InviteStatus.java b/src/main/java/com/sequence/anonymous/invite/domain/InviteStatus.java new file mode 100644 index 0000000..499f99c --- /dev/null +++ b/src/main/java/com/sequence/anonymous/invite/domain/InviteStatus.java @@ -0,0 +1,6 @@ +package com.sequence.anonymous.invite.domain; + +public enum InviteStatus { + WAIT, + DONE +} diff --git a/src/main/java/com/sequence/anonymous/post/domain/MatchPost.java b/src/main/java/com/sequence/anonymous/post/domain/MatchPost.java new file mode 100644 index 0000000..03fe63c --- /dev/null +++ b/src/main/java/com/sequence/anonymous/post/domain/MatchPost.java @@ -0,0 +1,34 @@ +package com.sequence.anonymous.post.domain; + +import com.sequence.anonymous.common.BaseEntity; +import jakarta.persistence.*; +import lombok.Getter; + +import java.time.LocalDateTime; + +@Entity +@Getter +public class MatchPost extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "matchPostId") + private Long id; + + @Column(name = "userId") + private Long userId; + + @Column + private String title; + + @Column + private String introduce; + + @Column + private String appeal; + + @Column + @Enumerated(EnumType.STRING) + private MatchPostStatus status; + + +} diff --git a/src/main/java/com/sequence/anonymous/post/domain/MatchPostStatus.java b/src/main/java/com/sequence/anonymous/post/domain/MatchPostStatus.java new file mode 100644 index 0000000..e225b01 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/post/domain/MatchPostStatus.java @@ -0,0 +1,7 @@ +package com.sequence.anonymous.post.domain; + +public enum MatchPostStatus { + RECRUIT, + DONE +} + diff --git a/src/main/java/com/sequence/anonymous/relation/domain/Relation.java b/src/main/java/com/sequence/anonymous/relation/domain/Relation.java new file mode 100644 index 0000000..854d8c3 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/relation/domain/Relation.java @@ -0,0 +1,22 @@ +package com.sequence.anonymous.relation.domain; + +import jakarta.persistence.*; +import lombok.Getter; + +@Entity +@Getter +public class Relation { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "relationId") + private static Long id; + + @Column(name = "user1Id") + private Long user1Id; + + @Column(name = "user2Id") + private Long user2Id; + + @Column + private RelationStatus status; +} diff --git a/src/main/java/com/sequence/anonymous/relation/domain/RelationStatus.java b/src/main/java/com/sequence/anonymous/relation/domain/RelationStatus.java new file mode 100644 index 0000000..9b50884 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/relation/domain/RelationStatus.java @@ -0,0 +1,6 @@ +package com.sequence.anonymous.relation.domain; + +public enum RelationStatus { + BAN, + FRIEND +} diff --git a/src/main/java/com/sequence/anonymous/tag/domain/Tag.java b/src/main/java/com/sequence/anonymous/tag/domain/Tag.java new file mode 100644 index 0000000..b5a5118 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/tag/domain/Tag.java @@ -0,0 +1,18 @@ +package com.sequence.anonymous.tag.domain; + +import jakarta.persistence.*; +import lombok.Getter; + +@Entity +@Getter +public class Tag { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "tagId") + private static Long id; + + @Column + private String name; + + +} diff --git a/src/main/java/com/sequence/anonymous/user/domain/Attachment.java b/src/main/java/com/sequence/anonymous/user/domain/Attachment.java new file mode 100644 index 0000000..4591244 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/domain/Attachment.java @@ -0,0 +1,20 @@ +package com.sequence.anonymous.user.domain; + +import jakarta.persistence.*; +import lombok.Getter; + +@Entity +@Getter +public class Attachment { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "userId") + private Long userId; + + @Column + @Enumerated + private FileType fileType; + +} diff --git a/src/main/java/com/sequence/anonymous/user/domain/FileType.java b/src/main/java/com/sequence/anonymous/user/domain/FileType.java new file mode 100644 index 0000000..ca0fada --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/domain/FileType.java @@ -0,0 +1,8 @@ +package com.sequence.anonymous.user.domain; + +public enum FileType { + MP4, + MP3, + PNG, + JPEG +} diff --git a/src/main/java/com/sequence/anonymous/user/domain/Gender.java b/src/main/java/com/sequence/anonymous/user/domain/Gender.java new file mode 100644 index 0000000..235dd98 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/domain/Gender.java @@ -0,0 +1,7 @@ +package com.sequence.anonymous.user.domain; + +public enum Gender { + + MALE, + FEMALE +} diff --git a/src/main/java/com/sequence/anonymous/user/domain/Role.java b/src/main/java/com/sequence/anonymous/user/domain/Role.java index 3ba617a..de366c5 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/Role.java +++ b/src/main/java/com/sequence/anonymous/user/domain/Role.java @@ -1,16 +1,7 @@ package com.sequence.anonymous.user.domain; public enum Role { - ROLE_USER("USER"), - ROLE_ADMIN("ADMIN"); - - private final String role; - - Role(String role) { - this.role = role; - } - - public String role() { - return role; - } + ROLE_USER, + ROLE_ADMIN } + diff --git a/src/main/java/com/sequence/anonymous/user/domain/User.java b/src/main/java/com/sequence/anonymous/user/domain/User.java index 50c88bc..0fc0ec8 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/User.java +++ b/src/main/java/com/sequence/anonymous/user/domain/User.java @@ -8,7 +8,6 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import jakarta.validation.constraints.Email; import lombok.Getter; @Entity @@ -17,7 +16,8 @@ public class User { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; + @Column(name = "userId") + private static Long id; private String providerId; @@ -28,27 +28,64 @@ public class User { @Column(length = 40) private String email; + @Column + private Long college; + + @Column + private Long department; + + @Column(length = 20) + private String name; + + private Integer age; + + @Column(length = 10) + @Enumerated(EnumType.STRING) + private Gender gender; + @Column(length = 15) @Enumerated(EnumType.STRING) private Role role; + private Boolean withdrawal; + + private Boolean profileInitialized; + protected User() { } public User(String providerId, OAuth2Provider provider, String email) { - this(null, providerId, provider, email, Role.ROLE_USER); + this(null, providerId, provider, email, null, null, null, Role.ROLE_USER, false, false); } - - private User(Long id, String providerId, OAuth2Provider provider, String email, Role role) { + private User(Long id, String providerId, OAuth2Provider provider, String email, String name, Integer age, Gender gender, Role role, Boolean withdrawal, Boolean profileInitialized) { Preconditions.checkArgument(providerId != null, "providerId must be provided."); Preconditions.checkArgument(provider != null, "provider must be provided."); Preconditions.checkArgument(email != null, "email must be provided."); Preconditions.checkArgument(role != null, "role must be provided."); + Preconditions.checkArgument(withdrawal != null, "withdrawal must be provided."); + Preconditions.checkArgument(profileInitialized != null, "initialized must be provided."); this.id = id; this.providerId = providerId; this.provider = provider; + this.name = name; + this.age = age; + this.gender = gender; this.email = email; this.role = role; + this.withdrawal = withdrawal; + this.profileInitialized = profileInitialized; + } + + public void initializeProfile(String name, Integer age, Gender gender) { + Preconditions.checkArgument(name != null, "name must be provided."); + Preconditions.checkArgument(age != null, "age must be provided."); + Preconditions.checkArgument(gender != null, "gender must be provided."); + + this.name = name; + this.age = age; + this.gender = gender; + + this.profileInitialized = true; } -} +} \ No newline at end of file diff --git a/src/main/java/com/sequence/anonymous/user/domain/UserChat.java b/src/main/java/com/sequence/anonymous/user/domain/UserChat.java new file mode 100644 index 0000000..acc2930 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/domain/UserChat.java @@ -0,0 +1,18 @@ +package com.sequence.anonymous.user.domain; + +import jakarta.persistence.*; + +@Entity +public class UserChat { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "userChatId") + private static Long id; + + @Column(name = "userId") + private Long userId; + + @Column(name = "chatId") + private Long chatId; + +} diff --git a/src/main/java/com/sequence/anonymous/user/domain/UserMatchPost.java b/src/main/java/com/sequence/anonymous/user/domain/UserMatchPost.java new file mode 100644 index 0000000..c5dc017 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/domain/UserMatchPost.java @@ -0,0 +1,21 @@ +package com.sequence.anonymous.user.domain; + +import jakarta.persistence.*; +@Entity +public class UserMatchPost { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "userMatchPostId") + private static Long id; + + @Column(name = "matchPostId") + private Long matchPostId; + + @Column(name = "userId") + private Long userId; + + @Column + @Enumerated(EnumType.STRING) + private UserMatchPostRole role; + +} diff --git a/src/main/java/com/sequence/anonymous/user/domain/UserMatchPostRole.java b/src/main/java/com/sequence/anonymous/user/domain/UserMatchPostRole.java new file mode 100644 index 0000000..0ae04a3 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/domain/UserMatchPostRole.java @@ -0,0 +1,5 @@ +package com.sequence.anonymous.user.domain; + +public enum UserMatchPostRole { + OWNER +} diff --git a/src/main/java/com/sequence/anonymous/user/domain/UserTag.java b/src/main/java/com/sequence/anonymous/user/domain/UserTag.java new file mode 100644 index 0000000..cb425b4 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/domain/UserTag.java @@ -0,0 +1,19 @@ +package com.sequence.anonymous.user.domain; + +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; + +public class UserTag { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "userTagId") + private static Long id; + + @Column(name = "userId") + private Long user; + + @Column(name = "tagId") + private Long tagId; +} From 9ea4fb864c68b4baca7c91067b8e890f57b714fa Mon Sep 17 00:00:00 2001 From: eunseobb Date: Thu, 31 Aug 2023 18:42:33 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EB=B9=8C=EB=93=9C=EC=98=A4=EB=A5=98?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anonymous/post/domain/MatchPost.java | 16 ++++++++++++---- .../anonymous/user/domain/Attachment.java | 3 ++- .../sequence/anonymous/user/domain/User.java | 6 ++++++ .../anonymous/user/domain/UserChat.java | 10 +++++++++- .../anonymous/user/domain/UserMatchPost.java | 11 ++++++++++- .../anonymous/user/domain/UserTag.java | 19 +++++++++++++------ 6 files changed, 52 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/sequence/anonymous/post/domain/MatchPost.java b/src/main/java/com/sequence/anonymous/post/domain/MatchPost.java index 03fe63c..da806a6 100644 --- a/src/main/java/com/sequence/anonymous/post/domain/MatchPost.java +++ b/src/main/java/com/sequence/anonymous/post/domain/MatchPost.java @@ -1,5 +1,6 @@ package com.sequence.anonymous.post.domain; +import com.google.common.base.Preconditions; import com.sequence.anonymous.common.BaseEntity; import jakarta.persistence.*; import lombok.Getter; @@ -14,9 +15,6 @@ public class MatchPost extends BaseEntity { @Column(name = "matchPostId") private Long id; - @Column(name = "userId") - private Long userId; - @Column private String title; @@ -30,5 +28,15 @@ public class MatchPost extends BaseEntity { @Enumerated(EnumType.STRING) private MatchPostStatus status; - + public MatchPost(Long id, String title, String introduce, String appeal, MatchPostStatus status) { + Preconditions.checkArgument(title != null, "title must be provided."); + Preconditions.checkArgument(introduce != null, "introduce must be provided."); + Preconditions.checkArgument(appeal != null, "appeal must be provided."); + + this.id = id; + this.title = title; + this.introduce = introduce; + this.appeal = appeal; + this.status = status; + } } diff --git a/src/main/java/com/sequence/anonymous/user/domain/Attachment.java b/src/main/java/com/sequence/anonymous/user/domain/Attachment.java index 4591244..828e4f3 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/Attachment.java +++ b/src/main/java/com/sequence/anonymous/user/domain/Attachment.java @@ -10,7 +10,8 @@ public class Attachment { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(name = "userId") + @ManyToOne + @JoinColumn(name = "userId") private Long userId; @Column diff --git a/src/main/java/com/sequence/anonymous/user/domain/User.java b/src/main/java/com/sequence/anonymous/user/domain/User.java index 0fc0ec8..0ad6a3f 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/User.java +++ b/src/main/java/com/sequence/anonymous/user/domain/User.java @@ -18,6 +18,10 @@ public class User { @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "userId") private static Long id; + public Long getId() { + return id; + } + private String providerId; @@ -88,4 +92,6 @@ public void initializeProfile(String name, Integer age, Gender gender) { this.profileInitialized = true; } + + } \ No newline at end of file diff --git a/src/main/java/com/sequence/anonymous/user/domain/UserChat.java b/src/main/java/com/sequence/anonymous/user/domain/UserChat.java index acc2930..6681947 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/UserChat.java +++ b/src/main/java/com/sequence/anonymous/user/domain/UserChat.java @@ -1,18 +1,26 @@ package com.sequence.anonymous.user.domain; import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; @Entity +@Getter public class UserChat { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "userChatId") private static Long id; - @Column(name = "userId") + @ManyToOne + @JoinColumn(name = "userId") private Long userId; @Column(name = "chatId") private Long chatId; + public UserChat(Long userId, Long chatId) { + this.userId = userId; + this.chatId = chatId; + } } diff --git a/src/main/java/com/sequence/anonymous/user/domain/UserMatchPost.java b/src/main/java/com/sequence/anonymous/user/domain/UserMatchPost.java index c5dc017..8cb453a 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/UserMatchPost.java +++ b/src/main/java/com/sequence/anonymous/user/domain/UserMatchPost.java @@ -1,7 +1,10 @@ package com.sequence.anonymous.user.domain; import jakarta.persistence.*; +import lombok.Getter; + @Entity +@Getter public class UserMatchPost { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -11,11 +14,17 @@ public class UserMatchPost { @Column(name = "matchPostId") private Long matchPostId; - @Column(name = "userId") + @ManyToOne + @JoinColumn(name = "userId") private Long userId; @Column @Enumerated(EnumType.STRING) private UserMatchPostRole role; + public UserMatchPost(Long matchPostId, Long userId, UserMatchPostRole role) { + this.matchPostId = matchPostId; + this.userId = userId; + this.role = role; + } } diff --git a/src/main/java/com/sequence/anonymous/user/domain/UserTag.java b/src/main/java/com/sequence/anonymous/user/domain/UserTag.java index cb425b4..186610b 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/UserTag.java +++ b/src/main/java/com/sequence/anonymous/user/domain/UserTag.java @@ -1,19 +1,26 @@ package com.sequence.anonymous.user.domain; -import jakarta.persistence.Column; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; +import jakarta.persistence.*; +import lombok.Getter; +@Entity +@Getter public class UserTag { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "userTagId") private static Long id; - @Column(name = "userId") + @ManyToOne + @JoinColumn(name = "userId") private Long user; - @Column(name = "tagId") + @ManyToOne + @JoinColumn(name = "tagId") private Long tagId; + + public UserTag(Long user, Long tagId) { + this.user = user; + this.tagId = tagId; + } } From 1d8137148bc5285e0e158a2b53b72cb0a9c0feb9 Mon Sep 17 00:00:00 2001 From: eunseobb Date: Sat, 2 Sep 2023 18:20:05 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=97=B0=EA=B4=80=EA=B4=80=EA=B3=84?= =?UTF-8?q?=EB=A7=A4=ED=95=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anonymous/college/domain/College.java | 12 ++++++------ .../anonymous/college/domain/Department.java | 14 ++++++++------ .../sequence/anonymous/invite/domain/Invite.java | 8 +++++--- .../anonymous/{chat => post}/domain/Chat.java | 8 ++++++-- .../anonymous/post/domain/MatchPost.java | 11 +++++++---- .../anonymous/relation/domain/Relation.java | 8 +++++--- .../com/sequence/anonymous/tag/domain/Tag.java | 2 +- .../anonymous/user/domain/Attachment.java | 2 +- .../com/sequence/anonymous/user/domain/User.java | 16 ++++++---------- .../sequence/anonymous/user/domain/UserChat.java | 10 +++++----- .../anonymous/user/domain/UserMatchPost.java | 9 +++++---- .../anonymous/user/domain/UserMatchPostRole.java | 3 ++- .../sequence/anonymous/user/domain/UserTag.java | 10 +++++----- 13 files changed, 62 insertions(+), 51 deletions(-) rename src/main/java/com/sequence/anonymous/{chat => post}/domain/Chat.java (60%) diff --git a/src/main/java/com/sequence/anonymous/college/domain/College.java b/src/main/java/com/sequence/anonymous/college/domain/College.java index ddef65e..fff958c 100644 --- a/src/main/java/com/sequence/anonymous/college/domain/College.java +++ b/src/main/java/com/sequence/anonymous/college/domain/College.java @@ -1,14 +1,14 @@ -package com.sequence.anonymous; +package com.sequence.anonymous.college.domain; -import jakarta.persistence.Column; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; +import jakarta.persistence.*; +import lombok.Getter; +@Entity +@Getter public class College { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "collegeId") + @Column(name = "college_id") private static Long id; @Column diff --git a/src/main/java/com/sequence/anonymous/college/domain/Department.java b/src/main/java/com/sequence/anonymous/college/domain/Department.java index 873b893..581f5a6 100644 --- a/src/main/java/com/sequence/anonymous/college/domain/Department.java +++ b/src/main/java/com/sequence/anonymous/college/domain/Department.java @@ -1,18 +1,20 @@ package com.sequence.anonymous.college.domain; -import jakarta.persistence.Column; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; +import jakarta.persistence.*; +import lombok.Getter; +@Entity +@Getter public class Department { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "departmentId") + @Column(name = "department_id") private static Long id; - @Column(name = "collegeId") + @OneToOne + @Column(name = "college_id") private Long collegeId; + @Column private String name; } diff --git a/src/main/java/com/sequence/anonymous/invite/domain/Invite.java b/src/main/java/com/sequence/anonymous/invite/domain/Invite.java index 78b72a4..de3929b 100644 --- a/src/main/java/com/sequence/anonymous/invite/domain/Invite.java +++ b/src/main/java/com/sequence/anonymous/invite/domain/Invite.java @@ -8,13 +8,15 @@ public class Invite { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "inviteId") + @Column(name = "invite_id") private static Long id; - @Column(name = "inviterId") + @OneToOne + @JoinColumn(name = "inviter_id") private Long inviter; - @Column(name = "inviteeId") + @OneToMany + @JoinColumn(name = "invitee_id") private Long invitee; @Column diff --git a/src/main/java/com/sequence/anonymous/chat/domain/Chat.java b/src/main/java/com/sequence/anonymous/post/domain/Chat.java similarity index 60% rename from src/main/java/com/sequence/anonymous/chat/domain/Chat.java rename to src/main/java/com/sequence/anonymous/post/domain/Chat.java index 84ea9e5..1c4b454 100644 --- a/src/main/java/com/sequence/anonymous/chat/domain/Chat.java +++ b/src/main/java/com/sequence/anonymous/post/domain/Chat.java @@ -1,4 +1,4 @@ -package com.sequence.anonymous.chat.domain; +package com.sequence.anonymous.post.domain; import jakarta.persistence.*; import lombok.Getter; @@ -10,9 +10,13 @@ public class Chat { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "chatId") + @Column(name = "chat_id") private static Long id; @Column private UUID chatIdentifier; + + public Chat(UUID chatIdentifier) { + this.chatIdentifier = chatIdentifier; + } } diff --git a/src/main/java/com/sequence/anonymous/post/domain/MatchPost.java b/src/main/java/com/sequence/anonymous/post/domain/MatchPost.java index da806a6..65e9a8e 100644 --- a/src/main/java/com/sequence/anonymous/post/domain/MatchPost.java +++ b/src/main/java/com/sequence/anonymous/post/domain/MatchPost.java @@ -12,22 +12,25 @@ public class MatchPost extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "matchPostId") + @Column(name = "matchPost_id") private Long id; - @Column + @Column(name = "title", nullable = false) private String title; - @Column + @Column(name = "title", nullable = false) private String introduce; - @Column + @Column(name = "title", nullable = false) private String appeal; @Column @Enumerated(EnumType.STRING) private MatchPostStatus status; + protected MatchPost() { + } + public MatchPost(Long id, String title, String introduce, String appeal, MatchPostStatus status) { Preconditions.checkArgument(title != null, "title must be provided."); Preconditions.checkArgument(introduce != null, "introduce must be provided."); diff --git a/src/main/java/com/sequence/anonymous/relation/domain/Relation.java b/src/main/java/com/sequence/anonymous/relation/domain/Relation.java index 854d8c3..9873b19 100644 --- a/src/main/java/com/sequence/anonymous/relation/domain/Relation.java +++ b/src/main/java/com/sequence/anonymous/relation/domain/Relation.java @@ -8,13 +8,15 @@ public class Relation { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "relationId") + @Column(name = "relation_id") private static Long id; - @Column(name = "user1Id") + @OneToOne + @JoinColumn(name = "user1_id") private Long user1Id; - @Column(name = "user2Id") + @OneToOne + @JoinColumn(name = "user2_id") private Long user2Id; @Column diff --git a/src/main/java/com/sequence/anonymous/tag/domain/Tag.java b/src/main/java/com/sequence/anonymous/tag/domain/Tag.java index b5a5118..62225aa 100644 --- a/src/main/java/com/sequence/anonymous/tag/domain/Tag.java +++ b/src/main/java/com/sequence/anonymous/tag/domain/Tag.java @@ -8,7 +8,7 @@ public class Tag { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "tagId") + @Column(name = "tag_id") private static Long id; @Column diff --git a/src/main/java/com/sequence/anonymous/user/domain/Attachment.java b/src/main/java/com/sequence/anonymous/user/domain/Attachment.java index 828e4f3..81584be 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/Attachment.java +++ b/src/main/java/com/sequence/anonymous/user/domain/Attachment.java @@ -11,7 +11,7 @@ public class Attachment { private Long id; @ManyToOne - @JoinColumn(name = "userId") + @JoinColumn(name = "user_id") private Long userId; @Column diff --git a/src/main/java/com/sequence/anonymous/user/domain/User.java b/src/main/java/com/sequence/anonymous/user/domain/User.java index 0ad6a3f..3467b07 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/User.java +++ b/src/main/java/com/sequence/anonymous/user/domain/User.java @@ -1,13 +1,7 @@ package com.sequence.anonymous.user.domain; import com.google.common.base.Preconditions; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; +import jakarta.persistence.*; import lombok.Getter; @Entity @@ -16,7 +10,7 @@ public class User { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "userId") + @Column(name = "user_id") private static Long id; public Long getId() { return id; @@ -32,10 +26,12 @@ public Long getId() { @Column(length = 40) private String email; - @Column + @OneToOne + @JoinColumn(name = "college_id") private Long college; - @Column + @OneToOne + @JoinColumn(name = "department_id") private Long department; @Column(length = 20) diff --git a/src/main/java/com/sequence/anonymous/user/domain/UserChat.java b/src/main/java/com/sequence/anonymous/user/domain/UserChat.java index 6681947..8b86a39 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/UserChat.java +++ b/src/main/java/com/sequence/anonymous/user/domain/UserChat.java @@ -1,7 +1,6 @@ package com.sequence.anonymous.user.domain; import jakarta.persistence.*; -import lombok.AllArgsConstructor; import lombok.Getter; @Entity @@ -9,14 +8,15 @@ public class UserChat { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "userChatId") + @Column(name = "userChat_id") private static Long id; - @ManyToOne - @JoinColumn(name = "userId") + @OneToOne + @JoinColumn(name = "user_id") private Long userId; - @Column(name = "chatId") + @OneToMany + @JoinColumn(name = "chat_id") private Long chatId; public UserChat(Long userId, Long chatId) { diff --git a/src/main/java/com/sequence/anonymous/user/domain/UserMatchPost.java b/src/main/java/com/sequence/anonymous/user/domain/UserMatchPost.java index 8cb453a..02b825f 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/UserMatchPost.java +++ b/src/main/java/com/sequence/anonymous/user/domain/UserMatchPost.java @@ -8,14 +8,15 @@ public class UserMatchPost { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "userMatchPostId") + @Column(name = "userMatchPost_id") private static Long id; - @Column(name = "matchPostId") + @OneToMany + @Column(name = "matchPost_id") private Long matchPostId; - @ManyToOne - @JoinColumn(name = "userId") + @OneToOne + @JoinColumn(name = "user_id") private Long userId; @Column diff --git a/src/main/java/com/sequence/anonymous/user/domain/UserMatchPostRole.java b/src/main/java/com/sequence/anonymous/user/domain/UserMatchPostRole.java index 0ae04a3..ec88efb 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/UserMatchPostRole.java +++ b/src/main/java/com/sequence/anonymous/user/domain/UserMatchPostRole.java @@ -1,5 +1,6 @@ package com.sequence.anonymous.user.domain; public enum UserMatchPostRole { - OWNER + OWNER, + MEMBER } diff --git a/src/main/java/com/sequence/anonymous/user/domain/UserTag.java b/src/main/java/com/sequence/anonymous/user/domain/UserTag.java index 186610b..3aa6c94 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/UserTag.java +++ b/src/main/java/com/sequence/anonymous/user/domain/UserTag.java @@ -8,15 +8,15 @@ public class UserTag { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "userTagId") + @Column(name = "userTag_id") private static Long id; - @ManyToOne - @JoinColumn(name = "userId") + @OneToOne + @JoinColumn(name = "user_id") private Long user; - @ManyToOne - @JoinColumn(name = "tagId") + @OneToMany + @JoinColumn(name = "tag_id") private Long tagId; public UserTag(Long user, Long tagId) { From b0e16dce7687420754c6c92e31f3d1339d72192a Mon Sep 17 00:00:00 2001 From: eunseobb Date: Sat, 2 Sep 2023 18:38:10 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=97=B0=EA=B4=80=EA=B4=80=EA=B3=84?= =?UTF-8?q?=EB=A7=A4=ED=95=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anonymous/AnonymousApplicationTests.java | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 src/test/java/com/sequence/anonymous/AnonymousApplicationTests.java diff --git a/src/test/java/com/sequence/anonymous/AnonymousApplicationTests.java b/src/test/java/com/sequence/anonymous/AnonymousApplicationTests.java deleted file mode 100644 index e82b867..0000000 --- a/src/test/java/com/sequence/anonymous/AnonymousApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.sequence.anonymous; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class AnonymousApplicationTests { - - @Test - void contextLoads() { - } - -}