From a2807509541ce46e9221421ded8226267ad22c7a Mon Sep 17 00:00:00 2001 From: mk3058 Date: Tue, 22 Aug 2023 00:46:54 +0900 Subject: [PATCH 01/19] =?UTF-8?q?feat(domain):=20college,=20invite,=20user?= =?UTF-8?q?,=20relation,=20tag,=20attachment=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EC=97=94=ED=8B=B0=ED=8B=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anonymous/college/domain/College.java | 42 +++++++++++++ .../anonymous/college/domain/Department.java | 45 ++++++++++++++ .../anonymous/invite/domain/Invite.java | 60 +++++++++++++++++++ .../anonymous/invite/domain/InviteKind.java | 5 ++ .../anonymous/invite/domain/InviteStatus.java | 5 ++ .../anonymous/relation/domain/Relation.java | 53 ++++++++++++++++ .../relation/domain/RelationStatus.java | 5 ++ .../sequence/anonymous/tag/domain/Tag.java | 31 ++++++++++ .../anonymous/user/domain/Attachment.java | 48 +++++++++++++++ .../anonymous/user/domain/FileType.java | 5 ++ .../anonymous/user/domain/UserTag.java | 40 +++++++++++++ 11 files changed, 339 insertions(+) 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/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/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/UserTag.java 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..c38a3f7 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/college/domain/College.java @@ -0,0 +1,42 @@ +package com.sequence.anonymous.college.domain; + +import com.google.common.base.Preconditions; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import lombok.Getter; +import org.springframework.data.geo.Point; + +@Entity +@Getter +public class College { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, unique = true) + private String name; + + private Point location; + + protected College() { + } + + public College(String name, Point location) { + Preconditions.checkArgument(name != null, "name must be provided"); + Preconditions.checkArgument(location != null, "location must be provided"); + + this.id = null; + this.name = name; + this.location = location; + } + + public void updateName(String name) { + Preconditions.checkArgument(name != null, "name must be provided"); + + this.name = 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..381bea9 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/college/domain/Department.java @@ -0,0 +1,45 @@ +package com.sequence.anonymous.college.domain; + +import com.google.common.base.Preconditions; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import lombok.Getter; + +@Entity +@Getter +public class Department { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private String name; + + @ManyToOne + @JoinColumn(name = "college_id") + private College college; + + protected Department() { + } + + public Department(String name, College college) { + Preconditions.checkArgument(name != null, "name must be provided"); + Preconditions.checkArgument(college != null, "college must be provided"); + + this.id = null; + this.name = name; + this.college = college; + } + + public void updateName(String name) { + Preconditions.checkArgument(name != null, "name must be provided"); + + this.name = 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 new file mode 100644 index 0000000..a116ae5 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/invite/domain/Invite.java @@ -0,0 +1,60 @@ +package com.sequence.anonymous.invite.domain; + +import com.google.common.base.Preconditions; +import com.sequence.anonymous.user.domain.User; +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.JoinColumn; +import jakarta.persistence.ManyToOne; +import lombok.Getter; + +@Entity +@Getter +public class Invite { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne + @JoinColumn(name = "inviter_id") + private User inviter; + + @ManyToOne + @JoinColumn(name = "invitee_id") + private User invitee; + + @Enumerated(EnumType.STRING) + private InviteStatus status; + + @Enumerated(EnumType.STRING) + private InviteKind kind; + + protected Invite() { + } + + public Invite(User inviter, User invitee, InviteKind kind) { + this(inviter, invitee, kind, InviteStatus.WAIT); + } + + private Invite(User inviter, User invitee, InviteKind kind, InviteStatus status) { + Preconditions.checkArgument(inviter != null, "inviter must be provided"); + Preconditions.checkArgument(invitee != null, "invitee must be provided"); + Preconditions.checkArgument(kind != null, "kind must be provided"); + + this.inviter = inviter; + this.invitee = invitee; + this.kind = kind; + this.status = status; + } + + public void updateStatus(InviteStatus status) { + Preconditions.checkArgument(status != null, "status must be provided"); + + this.status = status; + } +} 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..1a0209f --- /dev/null +++ b/src/main/java/com/sequence/anonymous/invite/domain/InviteKind.java @@ -0,0 +1,5 @@ +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..a04a99b --- /dev/null +++ b/src/main/java/com/sequence/anonymous/invite/domain/InviteStatus.java @@ -0,0 +1,5 @@ +package com.sequence.anonymous.invite.domain; + +public enum InviteStatus { + WAIT, 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..7100f44 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/relation/domain/Relation.java @@ -0,0 +1,53 @@ +package com.sequence.anonymous.relation.domain; + +import com.google.common.base.Preconditions; +import com.sequence.anonymous.invite.domain.InviteStatus; +import com.sequence.anonymous.user.domain.User; +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.JoinColumn; +import jakarta.persistence.ManyToOne; +import lombok.Getter; + +@Entity +@Getter +public class Relation { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne + @JoinColumn(name = "user1_id") + private User user1; + + @ManyToOne + @JoinColumn(name = "user2_id") + private User user2; + + @Enumerated(EnumType.STRING) + private RelationStatus status; + + protected Relation() { + } + + public Relation(User user1, User user2, RelationStatus status) { + Preconditions.checkArgument(user1 != null, "user1 must be provided"); + Preconditions.checkArgument(user2 != null, "user2 must be provided"); + Preconditions.checkArgument(status != null, "status must be provided"); + + this.user1 = user1; + this.user2 = user2; + this.status = status; + } + + public void updateStatus(RelationStatus status) { + Preconditions.checkArgument(status != null, "status must be provided"); + + this.status = 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..e09cfe0 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/relation/domain/RelationStatus.java @@ -0,0 +1,5 @@ +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..36fe6bd --- /dev/null +++ b/src/main/java/com/sequence/anonymous/tag/domain/Tag.java @@ -0,0 +1,31 @@ +package com.sequence.anonymous.tag.domain; + +import com.google.common.base.Preconditions; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import lombok.Getter; + +@Entity +@Getter +public class Tag { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, unique = true) + private String name; + + protected Tag() { + } + + public Tag(String name) { + Preconditions.checkArgument(name != null, "name must be provided"); + + this.id = null; + this.name = 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..39e45c0 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/domain/Attachment.java @@ -0,0 +1,48 @@ +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.JoinColumn; +import jakarta.persistence.ManyToOne; +import java.io.File; +import java.util.UUID; +import lombok.Getter; + +@Entity +@Getter +public class Attachment { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, unique = true) + private UUID name; + + @ManyToOne + @JoinColumn(name = "user_id") + private User user; + + @Enumerated(EnumType.STRING) + private FileType type; + + protected Attachment() { + } + + public Attachment(UUID name, User user, FileType type) { + Preconditions.checkArgument(name != null, "name must be provided"); + Preconditions.checkArgument(user != null, "user must be provided"); + Preconditions.checkArgument(type != null, "type must be provided"); + + this.id = null; + this.name = name; + this.user = user; + this.type = type; + } +} 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..6021ffc --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/domain/FileType.java @@ -0,0 +1,5 @@ +package com.sequence.anonymous.user.domain; + +public enum FileType { + MP4, MP3, PNG, JPEG +} 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..6684954 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/domain/UserTag.java @@ -0,0 +1,40 @@ +package com.sequence.anonymous.user.domain; + +import com.google.common.base.Preconditions; +import com.sequence.anonymous.tag.domain.Tag; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import lombok.Getter; + +@Entity +@Getter +public class UserTag { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne + @JoinColumn(name = "tag_id") + private Tag tag; + + protected UserTag() { + } + + public UserTag(User user, Tag tag) { + Preconditions.checkArgument(user != null, "User must be provided"); + Preconditions.checkArgument(tag != null, "Tag must be provided"); + + this.id = null; + this.user = user; + this.tag = tag; + } +} From c65be37d1e621da0dc9ccea00f66e3ef936222c0 Mon Sep 17 00:00:00 2001 From: mk3058 Date: Tue, 22 Aug 2023 12:41:22 +0900 Subject: [PATCH 02/19] feat(domain): add default entities --- .../sequence/anonymous/chat/domain/Chat.java | 32 ++++++++++ .../anonymous/college/domain/College.java | 8 +-- .../anonymous/college/domain/Department.java | 7 +- .../presentation/dto/CollegeUpdateDto.java | 12 ++++ .../presentation/dto/DepartmentUpdateDto.java | 10 +++ .../anonymous/common/BaseTimeEntity.java | 26 ++++++++ .../anonymous/invite/domain/Invite.java | 7 +- .../presentation/dto/InviteUpdateDto.java | 10 +++ .../anonymous/matchPost/domain/MatchPost.java | 64 +++++++++++++++++++ .../matchPost/domain/MatchPostStatus.java | 5 ++ .../presentation/dto/MatchPostUpdateDto.java | 16 +++++ .../anonymous/relation/domain/Relation.java | 7 +- .../presentation/dto/RelationUpdateDto.java | 10 +++ .../anonymous/user/domain/Gender.java | 5 ++ .../sequence/anonymous/user/domain/User.java | 48 ++++++++++++-- .../anonymous/user/domain/UserChat.java | 40 ++++++++++++ .../anonymous/user/domain/UserMatchPost.java | 48 ++++++++++++++ .../user/domain/UserMatchPostRole.java | 5 ++ 18 files changed, 340 insertions(+), 20 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/presentation/dto/CollegeUpdateDto.java create mode 100644 src/main/java/com/sequence/anonymous/college/domain/presentation/dto/DepartmentUpdateDto.java create mode 100644 src/main/java/com/sequence/anonymous/common/BaseTimeEntity.java create mode 100644 src/main/java/com/sequence/anonymous/invite/presentation/dto/InviteUpdateDto.java create mode 100644 src/main/java/com/sequence/anonymous/matchPost/domain/MatchPost.java create mode 100644 src/main/java/com/sequence/anonymous/matchPost/domain/MatchPostStatus.java create mode 100644 src/main/java/com/sequence/anonymous/matchPost/presentation/dto/MatchPostUpdateDto.java create mode 100644 src/main/java/com/sequence/anonymous/relation/presentation/dto/RelationUpdateDto.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 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..e5131b8 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/chat/domain/Chat.java @@ -0,0 +1,32 @@ +package com.sequence.anonymous.chat.domain; + +import com.google.common.base.Preconditions; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import java.util.UUID; +import lombok.Getter; + +@Entity +@Getter +public class Chat { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, unique = true) + private UUID chatIdentifier; + + protected Chat() { + } + + public Chat(UUID chatIdentifier) { + Preconditions.checkArgument(chatIdentifier != null, "chatIdentifier must be provided"); + + this.id = null; + this.chatIdentifier = 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 index c38a3f7..9a85205 100644 --- a/src/main/java/com/sequence/anonymous/college/domain/College.java +++ b/src/main/java/com/sequence/anonymous/college/domain/College.java @@ -1,6 +1,7 @@ package com.sequence.anonymous.college.domain; import com.google.common.base.Preconditions; +import com.sequence.anonymous.college.domain.presentation.dto.CollegeUpdateDto; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -34,9 +35,8 @@ public College(String name, Point location) { this.location = location; } - public void updateName(String name) { - Preconditions.checkArgument(name != null, "name must be provided"); - - this.name = name; + public void updateName(CollegeUpdateDto dto) { + this.name = dto.getName(); + this.location = dto.getLocation(); } } 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 381bea9..543b4ab 100644 --- a/src/main/java/com/sequence/anonymous/college/domain/Department.java +++ b/src/main/java/com/sequence/anonymous/college/domain/Department.java @@ -1,6 +1,7 @@ package com.sequence.anonymous.college.domain; import com.google.common.base.Preconditions; +import com.sequence.anonymous.college.domain.presentation.dto.DepartmentUpdateDto; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -37,9 +38,7 @@ public Department(String name, College college) { this.college = college; } - public void updateName(String name) { - Preconditions.checkArgument(name != null, "name must be provided"); - - this.name = name; + public void updateName(DepartmentUpdateDto dto) { + this.name = dto.getName(); } } diff --git a/src/main/java/com/sequence/anonymous/college/domain/presentation/dto/CollegeUpdateDto.java b/src/main/java/com/sequence/anonymous/college/domain/presentation/dto/CollegeUpdateDto.java new file mode 100644 index 0000000..939d272 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/college/domain/presentation/dto/CollegeUpdateDto.java @@ -0,0 +1,12 @@ +package com.sequence.anonymous.college.domain.presentation.dto; + +import lombok.Getter; +import org.springframework.data.geo.Point; + +@Getter +public class CollegeUpdateDto { + + private String name; + + private Point location; +} diff --git a/src/main/java/com/sequence/anonymous/college/domain/presentation/dto/DepartmentUpdateDto.java b/src/main/java/com/sequence/anonymous/college/domain/presentation/dto/DepartmentUpdateDto.java new file mode 100644 index 0000000..5bceb1d --- /dev/null +++ b/src/main/java/com/sequence/anonymous/college/domain/presentation/dto/DepartmentUpdateDto.java @@ -0,0 +1,10 @@ +package com.sequence.anonymous.college.domain.presentation.dto; + +import java.awt.Point; +import lombok.Getter; + +@Getter +public class DepartmentUpdateDto { + + private String name; +} diff --git a/src/main/java/com/sequence/anonymous/common/BaseTimeEntity.java b/src/main/java/com/sequence/anonymous/common/BaseTimeEntity.java new file mode 100644 index 0000000..1eca679 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/common/BaseTimeEntity.java @@ -0,0 +1,26 @@ +package com.sequence.anonymous.common; + +import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import java.time.LocalDate; +import java.time.LocalDateTime; +import lombok.Getter; +import org.springframework.context.event.EventListener; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedBy; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +@Getter +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +public abstract class BaseTimeEntity{ + + @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 index a116ae5..2f38a86 100644 --- a/src/main/java/com/sequence/anonymous/invite/domain/Invite.java +++ b/src/main/java/com/sequence/anonymous/invite/domain/Invite.java @@ -1,6 +1,7 @@ package com.sequence.anonymous.invite.domain; import com.google.common.base.Preconditions; +import com.sequence.anonymous.invite.presentation.dto.InviteUpdateDto; import com.sequence.anonymous.user.domain.User; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -52,9 +53,7 @@ private Invite(User inviter, User invitee, InviteKind kind, InviteStatus status) this.status = status; } - public void updateStatus(InviteStatus status) { - Preconditions.checkArgument(status != null, "status must be provided"); - - this.status = status; + public void updateStatus(InviteUpdateDto dto) { + this.status = dto.getStatus(); } } diff --git a/src/main/java/com/sequence/anonymous/invite/presentation/dto/InviteUpdateDto.java b/src/main/java/com/sequence/anonymous/invite/presentation/dto/InviteUpdateDto.java new file mode 100644 index 0000000..b2aca45 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/invite/presentation/dto/InviteUpdateDto.java @@ -0,0 +1,10 @@ +package com.sequence.anonymous.invite.presentation.dto; + +import com.sequence.anonymous.invite.domain.InviteStatus; +import lombok.Getter; + +@Getter +public class InviteUpdateDto { + + private InviteStatus status; +} diff --git a/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPost.java b/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPost.java new file mode 100644 index 0000000..a522704 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPost.java @@ -0,0 +1,64 @@ +package com.sequence.anonymous.matchPost.domain; + +import com.fasterxml.jackson.databind.deser.DataFormatReaders.Match; +import com.google.common.base.Preconditions; +import com.sequence.anonymous.common.BaseTimeEntity; +import com.sequence.anonymous.matchPost.presentation.dto.MatchPostUpdateDto; +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 lombok.Getter; + +@Entity +@Getter +public class MatchPost extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private String title; + + @Column(columnDefinition = "TEXT", nullable = false) + private String introduce; + + private String appeal; + + @Enumerated(EnumType.STRING) + private MatchPostStatus status; + + protected MatchPost() { + } + + public MatchPost(String title, String introduce) { + this(title, introduce, "No Data"); + } + + public MatchPost(String title, String introduce, String appeal) { + this(null, title, introduce, appeal, MatchPostStatus.RECRUIT); + } + + protected 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"); + + this.id = id; + this.title = title; + this.introduce = introduce; + this.appeal = appeal; + this.status = status; + } + + public void updateMatchPost(MatchPostUpdateDto dto) { + this.title = dto.getTitle(); + this.introduce = dto.getIntroduce(); + this.appeal = dto.getAppeal(); + this.status = dto.getStatus(); + } +} diff --git a/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPostStatus.java b/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPostStatus.java new file mode 100644 index 0000000..611ba34 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPostStatus.java @@ -0,0 +1,5 @@ +package com.sequence.anonymous.matchPost.domain; + +public enum MatchPostStatus { + RECRUIT, DONE +} diff --git a/src/main/java/com/sequence/anonymous/matchPost/presentation/dto/MatchPostUpdateDto.java b/src/main/java/com/sequence/anonymous/matchPost/presentation/dto/MatchPostUpdateDto.java new file mode 100644 index 0000000..d3be095 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/matchPost/presentation/dto/MatchPostUpdateDto.java @@ -0,0 +1,16 @@ +package com.sequence.anonymous.matchPost.presentation.dto; + +import com.sequence.anonymous.matchPost.domain.MatchPostStatus; +import lombok.Getter; + +@Getter +public class MatchPostUpdateDto { + + private String title; + + private String introduce; + + private String appeal; + + private MatchPostStatus status; +} 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 7100f44..3fd840d 100644 --- a/src/main/java/com/sequence/anonymous/relation/domain/Relation.java +++ b/src/main/java/com/sequence/anonymous/relation/domain/Relation.java @@ -2,6 +2,7 @@ import com.google.common.base.Preconditions; import com.sequence.anonymous.invite.domain.InviteStatus; +import com.sequence.anonymous.relation.presentation.dto.RelationUpdateDto; import com.sequence.anonymous.user.domain.User; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -45,9 +46,7 @@ public Relation(User user1, User user2, RelationStatus status) { this.status = status; } - public void updateStatus(RelationStatus status) { - Preconditions.checkArgument(status != null, "status must be provided"); - - this.status = status; + public void updateStatus(RelationUpdateDto dto) { + this.status = dto.getStatus(); } } diff --git a/src/main/java/com/sequence/anonymous/relation/presentation/dto/RelationUpdateDto.java b/src/main/java/com/sequence/anonymous/relation/presentation/dto/RelationUpdateDto.java new file mode 100644 index 0000000..a72d425 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/relation/presentation/dto/RelationUpdateDto.java @@ -0,0 +1,10 @@ +package com.sequence.anonymous.relation.presentation.dto; + +import com.sequence.anonymous.relation.domain.RelationStatus; +import lombok.Getter; + +@Getter +public class RelationUpdateDto { + + private RelationStatus status; +} 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..f6b9fea --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/domain/Gender.java @@ -0,0 +1,5 @@ +package com.sequence.anonymous.user.domain; + +public enum Gender { + MALE, FEMALE +} 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..554dc24 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/User.java +++ b/src/main/java/com/sequence/anonymous/user/domain/User.java @@ -1,6 +1,9 @@ package com.sequence.anonymous.user.domain; import com.google.common.base.Preconditions; +import com.sequence.anonymous.college.domain.College; +import com.sequence.anonymous.college.domain.Department; +import com.sequence.anonymous.common.BaseTimeEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -8,12 +11,14 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import jakarta.validation.constraints.Email; import lombok.Getter; @Entity @Getter -public class User { +public class User extends BaseTimeEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -25,21 +30,42 @@ public class User { @Enumerated(EnumType.STRING) private OAuth2Provider provider; - @Column(length = 40) + @Column(length = 10, nullable = false) + private String name; + + @Column(nullable = false) + private int age; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private Gender gender; + + @ManyToOne + @JoinColumn(name = "college_id") + private College college; + + @ManyToOne + @JoinColumn(name = "department_id") + private Department department; + + @Column(length = 40, unique = true) private String email; @Column(length = 15) @Enumerated(EnumType.STRING) private Role role; + private boolean withdrawal; + protected User() { } public User(String providerId, OAuth2Provider provider, String email) { - this(null, providerId, provider, email, Role.ROLE_USER); + this(null, providerId, provider, email, Role.ROLE_USER, false); } - private User(Long id, String providerId, OAuth2Provider provider, String email, Role role) { + private User(Long id, String providerId, OAuth2Provider provider, String email, Role role, + Boolean withdrawal) { Preconditions.checkArgument(providerId != null, "providerId must be provided."); Preconditions.checkArgument(provider != null, "provider must be provided."); Preconditions.checkArgument(email != null, "email must be provided."); @@ -50,5 +76,19 @@ private User(Long id, String providerId, OAuth2Provider provider, String email, this.provider = provider; this.email = email; this.role = role; + this.withdrawal = withdrawal; + } + + public void initializeProfile(String name, int age, Gender gender, College college, Department department) { + Preconditions.checkArgument(name != null, "name must be provided."); + Preconditions.checkArgument(gender != null, "gender must be provided."); + Preconditions.checkArgument(college != null, "college must be provided."); + Preconditions.checkArgument(department != null, "department must be provided."); + + this.name = name; + this.age = age; + this.gender = gender; + this.college = college; + this.department = department; } } 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..27dd064 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/domain/UserChat.java @@ -0,0 +1,40 @@ +package com.sequence.anonymous.user.domain; + +import com.google.common.base.Preconditions; +import com.sequence.anonymous.chat.domain.Chat; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import lombok.Getter; + +@Entity +@Getter +public class UserChat { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne + @JoinColumn(name = "chat_id") + private Chat chat; + + protected UserChat() { + } + + public UserChat(User user, Chat chat) { + Preconditions.checkArgument(user != null, "user must be provided"); + Preconditions.checkArgument(chat != null, "chat must be provided"); + + this.id = null; + this.user = user; + this.chat = chat; + } +} 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..9cbff63 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/domain/UserMatchPost.java @@ -0,0 +1,48 @@ +package com.sequence.anonymous.user.domain; + +import com.google.common.base.Preconditions; +import com.sequence.anonymous.matchPost.domain.MatchPost; +import com.sequence.anonymous.user.domain.User; +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.JoinColumn; +import jakarta.persistence.ManyToOne; +import lombok.Getter; +import org.springframework.data.mongodb.core.aggregation.PrefixingDelegatingAggregationOperationContext; + +@Entity +@Getter +public class UserMatchPost { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne + @JoinColumn(name = "matchPost_id") + private MatchPost matchPost; + + @ManyToOne + @JoinColumn(name = "user_id") + private User user; + + @Enumerated(EnumType.STRING) + private UserMatchPostRole role; + + protected UserMatchPost() { + } + + public UserMatchPost(MatchPost matchPost, User user, UserMatchPostRole role) { + Preconditions.checkArgument(matchPost != null, "matchPost must be provided"); + Preconditions.checkArgument(user != null, "user must be provided"); + Preconditions.checkArgument(role != null, "role must be provided"); + + this.user = user; + this.matchPost = matchPost; + this.role = 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..320f2d5 --- /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, PARTICIPANT, MATCHED_USER +} From 45b31eb6f19c248a29f4a11431ba1889e33132f5 Mon Sep 17 00:00:00 2001 From: mk3058 Date: Wed, 23 Aug 2023 11:15:59 +0900 Subject: [PATCH 03/19] =?UTF-8?q?refactor:=20=EC=9D=BC=EB=B6=80=20?= =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95.=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80/=ED=81=B4=EB=9E=98=EC=8A=A4=20=EC=9D=B4=EB=A6=84=20?= =?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/college/domain/College.java | 4 ++-- .../anonymous/college/domain/Department.java | 2 +- .../presentation/dto/DepartmentUpdateDto.java | 2 +- .../dto/UpdateDto.java} | 4 ++-- .../sequence/anonymous/invite/domain/Invite.java | 14 +++++++------- .../invite/domain/{InviteKind.java => Kind.java} | 2 +- .../domain/{InviteStatus.java => Status.java} | 2 +- .../invite/presentation/dto/InviteUpdateDto.java | 10 ---------- .../invite/presentation/dto/UpdateDto.java | 10 ++++++++++ .../anonymous/matchPost/domain/MatchPost.java | 13 ++++++------- .../matchPost/domain/MatchPostStatus.java | 5 ----- .../anonymous/matchPost/domain/Status.java | 5 +++++ .../presentation/dto/MatchPostUpdateDto.java | 16 ---------------- .../matchPost/presentation/dto/UpdateDto.java | 16 ++++++++++++++++ .../anonymous/relation/domain/Relation.java | 9 ++++----- .../domain/{RelationStatus.java => Status.java} | 2 +- .../presentation/dto/RelationUpdateDto.java | 10 ---------- .../relation/presentation/dto/UpdateDto.java | 10 ++++++++++ ...UserMatchPostRole.java => MatchPostRole.java} | 2 +- .../anonymous/user/domain/UserMatchPost.java | 8 +++----- 20 files changed, 71 insertions(+), 75 deletions(-) rename src/main/java/com/sequence/anonymous/college/{domain => }/presentation/dto/DepartmentUpdateDto.java (64%) rename src/main/java/com/sequence/anonymous/college/{domain/presentation/dto/CollegeUpdateDto.java => presentation/dto/UpdateDto.java} (57%) rename src/main/java/com/sequence/anonymous/invite/domain/{InviteKind.java => Kind.java} (73%) rename src/main/java/com/sequence/anonymous/invite/domain/{InviteStatus.java => Status.java} (69%) delete mode 100644 src/main/java/com/sequence/anonymous/invite/presentation/dto/InviteUpdateDto.java create mode 100644 src/main/java/com/sequence/anonymous/invite/presentation/dto/UpdateDto.java delete mode 100644 src/main/java/com/sequence/anonymous/matchPost/domain/MatchPostStatus.java create mode 100644 src/main/java/com/sequence/anonymous/matchPost/domain/Status.java delete mode 100644 src/main/java/com/sequence/anonymous/matchPost/presentation/dto/MatchPostUpdateDto.java create mode 100644 src/main/java/com/sequence/anonymous/matchPost/presentation/dto/UpdateDto.java rename src/main/java/com/sequence/anonymous/relation/domain/{RelationStatus.java => Status.java} (69%) delete mode 100644 src/main/java/com/sequence/anonymous/relation/presentation/dto/RelationUpdateDto.java create mode 100644 src/main/java/com/sequence/anonymous/relation/presentation/dto/UpdateDto.java rename src/main/java/com/sequence/anonymous/user/domain/{UserMatchPostRole.java => MatchPostRole.java} (71%) 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 9a85205..990b6bd 100644 --- a/src/main/java/com/sequence/anonymous/college/domain/College.java +++ b/src/main/java/com/sequence/anonymous/college/domain/College.java @@ -1,7 +1,7 @@ package com.sequence.anonymous.college.domain; import com.google.common.base.Preconditions; -import com.sequence.anonymous.college.domain.presentation.dto.CollegeUpdateDto; +import com.sequence.anonymous.college.presentation.dto.UpdateDto; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -35,7 +35,7 @@ public College(String name, Point location) { this.location = location; } - public void updateName(CollegeUpdateDto dto) { + public void updateName(UpdateDto dto) { this.name = dto.getName(); this.location = dto.getLocation(); } 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 543b4ab..17c9cf6 100644 --- a/src/main/java/com/sequence/anonymous/college/domain/Department.java +++ b/src/main/java/com/sequence/anonymous/college/domain/Department.java @@ -1,7 +1,7 @@ package com.sequence.anonymous.college.domain; import com.google.common.base.Preconditions; -import com.sequence.anonymous.college.domain.presentation.dto.DepartmentUpdateDto; +import com.sequence.anonymous.college.presentation.dto.DepartmentUpdateDto; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/sequence/anonymous/college/domain/presentation/dto/DepartmentUpdateDto.java b/src/main/java/com/sequence/anonymous/college/presentation/dto/DepartmentUpdateDto.java similarity index 64% rename from src/main/java/com/sequence/anonymous/college/domain/presentation/dto/DepartmentUpdateDto.java rename to src/main/java/com/sequence/anonymous/college/presentation/dto/DepartmentUpdateDto.java index 5bceb1d..43d374a 100644 --- a/src/main/java/com/sequence/anonymous/college/domain/presentation/dto/DepartmentUpdateDto.java +++ b/src/main/java/com/sequence/anonymous/college/presentation/dto/DepartmentUpdateDto.java @@ -1,4 +1,4 @@ -package com.sequence.anonymous.college.domain.presentation.dto; +package com.sequence.anonymous.college.presentation.dto; import java.awt.Point; import lombok.Getter; diff --git a/src/main/java/com/sequence/anonymous/college/domain/presentation/dto/CollegeUpdateDto.java b/src/main/java/com/sequence/anonymous/college/presentation/dto/UpdateDto.java similarity index 57% rename from src/main/java/com/sequence/anonymous/college/domain/presentation/dto/CollegeUpdateDto.java rename to src/main/java/com/sequence/anonymous/college/presentation/dto/UpdateDto.java index 939d272..5d99063 100644 --- a/src/main/java/com/sequence/anonymous/college/domain/presentation/dto/CollegeUpdateDto.java +++ b/src/main/java/com/sequence/anonymous/college/presentation/dto/UpdateDto.java @@ -1,10 +1,10 @@ -package com.sequence.anonymous.college.domain.presentation.dto; +package com.sequence.anonymous.college.presentation.dto; import lombok.Getter; import org.springframework.data.geo.Point; @Getter -public class CollegeUpdateDto { +public class UpdateDto { 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 2f38a86..8ffb50b 100644 --- a/src/main/java/com/sequence/anonymous/invite/domain/Invite.java +++ b/src/main/java/com/sequence/anonymous/invite/domain/Invite.java @@ -1,7 +1,7 @@ package com.sequence.anonymous.invite.domain; import com.google.common.base.Preconditions; -import com.sequence.anonymous.invite.presentation.dto.InviteUpdateDto; +import com.sequence.anonymous.invite.presentation.dto.UpdateDto; import com.sequence.anonymous.user.domain.User; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -30,19 +30,19 @@ public class Invite { private User invitee; @Enumerated(EnumType.STRING) - private InviteStatus status; + private Status status; @Enumerated(EnumType.STRING) - private InviteKind kind; + private Kind kind; protected Invite() { } - public Invite(User inviter, User invitee, InviteKind kind) { - this(inviter, invitee, kind, InviteStatus.WAIT); + public Invite(User inviter, User invitee, Kind kind) { + this(inviter, invitee, kind, Status.WAIT); } - private Invite(User inviter, User invitee, InviteKind kind, InviteStatus status) { + private Invite(User inviter, User invitee, Kind kind, Status status) { Preconditions.checkArgument(inviter != null, "inviter must be provided"); Preconditions.checkArgument(invitee != null, "invitee must be provided"); Preconditions.checkArgument(kind != null, "kind must be provided"); @@ -53,7 +53,7 @@ private Invite(User inviter, User invitee, InviteKind kind, InviteStatus status) this.status = status; } - public void updateStatus(InviteUpdateDto dto) { + public void updateStatus(UpdateDto dto) { this.status = dto.getStatus(); } } diff --git a/src/main/java/com/sequence/anonymous/invite/domain/InviteKind.java b/src/main/java/com/sequence/anonymous/invite/domain/Kind.java similarity index 73% rename from src/main/java/com/sequence/anonymous/invite/domain/InviteKind.java rename to src/main/java/com/sequence/anonymous/invite/domain/Kind.java index 1a0209f..fce7fd3 100644 --- a/src/main/java/com/sequence/anonymous/invite/domain/InviteKind.java +++ b/src/main/java/com/sequence/anonymous/invite/domain/Kind.java @@ -1,5 +1,5 @@ package com.sequence.anonymous.invite.domain; -public enum InviteKind { +public enum Kind { 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/Status.java similarity index 69% rename from src/main/java/com/sequence/anonymous/invite/domain/InviteStatus.java rename to src/main/java/com/sequence/anonymous/invite/domain/Status.java index a04a99b..91c2eab 100644 --- a/src/main/java/com/sequence/anonymous/invite/domain/InviteStatus.java +++ b/src/main/java/com/sequence/anonymous/invite/domain/Status.java @@ -1,5 +1,5 @@ package com.sequence.anonymous.invite.domain; -public enum InviteStatus { +public enum Status { WAIT, DONE } diff --git a/src/main/java/com/sequence/anonymous/invite/presentation/dto/InviteUpdateDto.java b/src/main/java/com/sequence/anonymous/invite/presentation/dto/InviteUpdateDto.java deleted file mode 100644 index b2aca45..0000000 --- a/src/main/java/com/sequence/anonymous/invite/presentation/dto/InviteUpdateDto.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.sequence.anonymous.invite.presentation.dto; - -import com.sequence.anonymous.invite.domain.InviteStatus; -import lombok.Getter; - -@Getter -public class InviteUpdateDto { - - private InviteStatus status; -} diff --git a/src/main/java/com/sequence/anonymous/invite/presentation/dto/UpdateDto.java b/src/main/java/com/sequence/anonymous/invite/presentation/dto/UpdateDto.java new file mode 100644 index 0000000..82c02d2 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/invite/presentation/dto/UpdateDto.java @@ -0,0 +1,10 @@ +package com.sequence.anonymous.invite.presentation.dto; + +import com.sequence.anonymous.invite.domain.Status; +import lombok.Getter; + +@Getter +public class UpdateDto { + + private Status status; +} diff --git a/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPost.java b/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPost.java index a522704..d379fa7 100644 --- a/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPost.java +++ b/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPost.java @@ -1,9 +1,8 @@ -package com.sequence.anonymous.matchPost.domain; +package com.sequence.anonymous.matchpost.domain; -import com.fasterxml.jackson.databind.deser.DataFormatReaders.Match; import com.google.common.base.Preconditions; import com.sequence.anonymous.common.BaseTimeEntity; -import com.sequence.anonymous.matchPost.presentation.dto.MatchPostUpdateDto; +import com.sequence.anonymous.matchpost.presentation.dto.UpdateDto; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -30,7 +29,7 @@ public class MatchPost extends BaseTimeEntity { private String appeal; @Enumerated(EnumType.STRING) - private MatchPostStatus status; + private Status status; protected MatchPost() { } @@ -40,11 +39,11 @@ public MatchPost(String title, String introduce) { } public MatchPost(String title, String introduce, String appeal) { - this(null, title, introduce, appeal, MatchPostStatus.RECRUIT); + this(null, title, introduce, appeal, Status.RECRUIT); } protected MatchPost(Long id, String title, String introduce, String appeal, - MatchPostStatus status) { + Status status) { Preconditions.checkArgument(title != null, "title must be provided"); Preconditions.checkArgument(introduce != null, "introduce must be provided"); @@ -55,7 +54,7 @@ protected MatchPost(Long id, String title, String introduce, String appeal, this.status = status; } - public void updateMatchPost(MatchPostUpdateDto dto) { + public void updateMatchPost(UpdateDto dto) { this.title = dto.getTitle(); this.introduce = dto.getIntroduce(); this.appeal = dto.getAppeal(); diff --git a/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPostStatus.java b/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPostStatus.java deleted file mode 100644 index 611ba34..0000000 --- a/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPostStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.sequence.anonymous.matchPost.domain; - -public enum MatchPostStatus { - RECRUIT, DONE -} diff --git a/src/main/java/com/sequence/anonymous/matchPost/domain/Status.java b/src/main/java/com/sequence/anonymous/matchPost/domain/Status.java new file mode 100644 index 0000000..e1fd02b --- /dev/null +++ b/src/main/java/com/sequence/anonymous/matchPost/domain/Status.java @@ -0,0 +1,5 @@ +package com.sequence.anonymous.matchpost.domain; + +public enum Status { + RECRUIT, DONE +} diff --git a/src/main/java/com/sequence/anonymous/matchPost/presentation/dto/MatchPostUpdateDto.java b/src/main/java/com/sequence/anonymous/matchPost/presentation/dto/MatchPostUpdateDto.java deleted file mode 100644 index d3be095..0000000 --- a/src/main/java/com/sequence/anonymous/matchPost/presentation/dto/MatchPostUpdateDto.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.sequence.anonymous.matchPost.presentation.dto; - -import com.sequence.anonymous.matchPost.domain.MatchPostStatus; -import lombok.Getter; - -@Getter -public class MatchPostUpdateDto { - - private String title; - - private String introduce; - - private String appeal; - - private MatchPostStatus status; -} diff --git a/src/main/java/com/sequence/anonymous/matchPost/presentation/dto/UpdateDto.java b/src/main/java/com/sequence/anonymous/matchPost/presentation/dto/UpdateDto.java new file mode 100644 index 0000000..1330c6a --- /dev/null +++ b/src/main/java/com/sequence/anonymous/matchPost/presentation/dto/UpdateDto.java @@ -0,0 +1,16 @@ +package com.sequence.anonymous.matchpost.presentation.dto; + +import com.sequence.anonymous.matchpost.domain.Status; +import lombok.Getter; + +@Getter +public class UpdateDto { + + private String title; + + private String introduce; + + private String appeal; + + private Status status; +} 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 3fd840d..7e71811 100644 --- a/src/main/java/com/sequence/anonymous/relation/domain/Relation.java +++ b/src/main/java/com/sequence/anonymous/relation/domain/Relation.java @@ -1,8 +1,7 @@ package com.sequence.anonymous.relation.domain; import com.google.common.base.Preconditions; -import com.sequence.anonymous.invite.domain.InviteStatus; -import com.sequence.anonymous.relation.presentation.dto.RelationUpdateDto; +import com.sequence.anonymous.relation.presentation.dto.UpdateDto; import com.sequence.anonymous.user.domain.User; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -31,12 +30,12 @@ public class Relation { private User user2; @Enumerated(EnumType.STRING) - private RelationStatus status; + private Status status; protected Relation() { } - public Relation(User user1, User user2, RelationStatus status) { + public Relation(User user1, User user2, Status status) { Preconditions.checkArgument(user1 != null, "user1 must be provided"); Preconditions.checkArgument(user2 != null, "user2 must be provided"); Preconditions.checkArgument(status != null, "status must be provided"); @@ -46,7 +45,7 @@ public Relation(User user1, User user2, RelationStatus status) { this.status = status; } - public void updateStatus(RelationUpdateDto dto) { + public void updateStatus(UpdateDto dto) { this.status = dto.getStatus(); } } diff --git a/src/main/java/com/sequence/anonymous/relation/domain/RelationStatus.java b/src/main/java/com/sequence/anonymous/relation/domain/Status.java similarity index 69% rename from src/main/java/com/sequence/anonymous/relation/domain/RelationStatus.java rename to src/main/java/com/sequence/anonymous/relation/domain/Status.java index e09cfe0..796bdab 100644 --- a/src/main/java/com/sequence/anonymous/relation/domain/RelationStatus.java +++ b/src/main/java/com/sequence/anonymous/relation/domain/Status.java @@ -1,5 +1,5 @@ package com.sequence.anonymous.relation.domain; -public enum RelationStatus { +public enum Status { BAN, FRIEND } diff --git a/src/main/java/com/sequence/anonymous/relation/presentation/dto/RelationUpdateDto.java b/src/main/java/com/sequence/anonymous/relation/presentation/dto/RelationUpdateDto.java deleted file mode 100644 index a72d425..0000000 --- a/src/main/java/com/sequence/anonymous/relation/presentation/dto/RelationUpdateDto.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.sequence.anonymous.relation.presentation.dto; - -import com.sequence.anonymous.relation.domain.RelationStatus; -import lombok.Getter; - -@Getter -public class RelationUpdateDto { - - private RelationStatus status; -} diff --git a/src/main/java/com/sequence/anonymous/relation/presentation/dto/UpdateDto.java b/src/main/java/com/sequence/anonymous/relation/presentation/dto/UpdateDto.java new file mode 100644 index 0000000..54bef94 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/relation/presentation/dto/UpdateDto.java @@ -0,0 +1,10 @@ +package com.sequence.anonymous.relation.presentation.dto; + +import com.sequence.anonymous.relation.domain.Status; +import lombok.Getter; + +@Getter +public class UpdateDto { + + private Status status; +} diff --git a/src/main/java/com/sequence/anonymous/user/domain/UserMatchPostRole.java b/src/main/java/com/sequence/anonymous/user/domain/MatchPostRole.java similarity index 71% rename from src/main/java/com/sequence/anonymous/user/domain/UserMatchPostRole.java rename to src/main/java/com/sequence/anonymous/user/domain/MatchPostRole.java index 320f2d5..bee3e2e 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/UserMatchPostRole.java +++ b/src/main/java/com/sequence/anonymous/user/domain/MatchPostRole.java @@ -1,5 +1,5 @@ package com.sequence.anonymous.user.domain; -public enum UserMatchPostRole { +public enum MatchPostRole { OWNER, PARTICIPANT, MATCHED_USER } 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 9cbff63..ad741c1 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/UserMatchPost.java +++ b/src/main/java/com/sequence/anonymous/user/domain/UserMatchPost.java @@ -1,8 +1,7 @@ package com.sequence.anonymous.user.domain; import com.google.common.base.Preconditions; -import com.sequence.anonymous.matchPost.domain.MatchPost; -import com.sequence.anonymous.user.domain.User; +import com.sequence.anonymous.matchpost.domain.MatchPost; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -12,7 +11,6 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import lombok.Getter; -import org.springframework.data.mongodb.core.aggregation.PrefixingDelegatingAggregationOperationContext; @Entity @Getter @@ -31,12 +29,12 @@ public class UserMatchPost { private User user; @Enumerated(EnumType.STRING) - private UserMatchPostRole role; + private MatchPostRole role; protected UserMatchPost() { } - public UserMatchPost(MatchPost matchPost, User user, UserMatchPostRole role) { + public UserMatchPost(MatchPost matchPost, User user, MatchPostRole role) { Preconditions.checkArgument(matchPost != null, "matchPost must be provided"); Preconditions.checkArgument(user != null, "user must be provided"); Preconditions.checkArgument(role != null, "role must be provided"); From ffc3874d5d5d0c98761070cc293f802482b8fec9 Mon Sep 17 00:00:00 2001 From: mk3058 Date: Wed, 23 Aug 2023 11:48:52 +0900 Subject: [PATCH 04/19] =?UTF-8?q?refactor(entity):=20=EB=AC=B8=EC=9E=90?= =?UTF-8?q?=EC=97=B4=20=EC=BB=AC=EB=9F=BC=20=EA=B8=B8=EC=9D=B4=20=EC=A7=80?= =?UTF-8?q?=EC=A0=95,=20=EC=9D=BC=EB=B6=80=20=EC=83=9D=EC=84=B1=EC=9E=90?= =?UTF-8?q?=20=EA=B0=92=20=EA=B2=80=EC=A6=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sequence/anonymous/college/domain/College.java | 2 +- .../com/sequence/anonymous/college/domain/Department.java | 2 +- .../java/com/sequence/anonymous/invite/domain/Invite.java | 5 +++++ .../com/sequence/anonymous/matchPost/domain/MatchPost.java | 6 +++++- .../com/sequence/anonymous/relation/domain/Relation.java | 2 ++ src/main/java/com/sequence/anonymous/tag/domain/Tag.java | 2 +- .../java/com/sequence/anonymous/user/domain/Attachment.java | 2 +- src/main/java/com/sequence/anonymous/user/domain/User.java | 4 +++- .../com/sequence/anonymous/user/domain/UserMatchPost.java | 2 ++ 9 files changed, 21 insertions(+), 6 deletions(-) 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 990b6bd..a2fc307 100644 --- a/src/main/java/com/sequence/anonymous/college/domain/College.java +++ b/src/main/java/com/sequence/anonymous/college/domain/College.java @@ -18,7 +18,7 @@ public class College { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(nullable = false, unique = true) + @Column(length = 20, nullable = false, unique = true) private String name; private Point location; 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 17c9cf6..9c9ba31 100644 --- a/src/main/java/com/sequence/anonymous/college/domain/Department.java +++ b/src/main/java/com/sequence/anonymous/college/domain/Department.java @@ -19,7 +19,7 @@ public class Department { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(nullable = false) + @Column(length = 30, nullable = false) private String name; @ManyToOne 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 8ffb50b..cb57151 100644 --- a/src/main/java/com/sequence/anonymous/invite/domain/Invite.java +++ b/src/main/java/com/sequence/anonymous/invite/domain/Invite.java @@ -3,6 +3,7 @@ import com.google.common.base.Preconditions; import com.sequence.anonymous.invite.presentation.dto.UpdateDto; import com.sequence.anonymous.user.domain.User; +import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -29,9 +30,12 @@ public class Invite { @JoinColumn(name = "invitee_id") private User invitee; + @Column(length = 10) @Enumerated(EnumType.STRING) private Status status; + + @Column(length = 15) @Enumerated(EnumType.STRING) private Kind kind; @@ -46,6 +50,7 @@ private Invite(User inviter, User invitee, Kind kind, Status status) { Preconditions.checkArgument(inviter != null, "inviter must be provided"); Preconditions.checkArgument(invitee != null, "invitee must be provided"); Preconditions.checkArgument(kind != null, "kind must be provided"); + Preconditions.checkArgument(status != null, "status must be provided"); this.inviter = inviter; this.invitee = invitee; diff --git a/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPost.java b/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPost.java index d379fa7..ac3a545 100644 --- a/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPost.java +++ b/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPost.java @@ -20,14 +20,16 @@ public class MatchPost extends BaseTimeEntity { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(nullable = false) + @Column(length = 40, nullable = false) private String title; @Column(columnDefinition = "TEXT", nullable = false) private String introduce; + @Column(length = 50) private String appeal; + @Column(length = 10) @Enumerated(EnumType.STRING) private Status status; @@ -46,6 +48,8 @@ protected MatchPost(Long id, String title, String introduce, String appeal, Status 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"); + Preconditions.checkArgument(status != null, "status must be provided"); this.id = id; this.title = title; 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 7e71811..e506602 100644 --- a/src/main/java/com/sequence/anonymous/relation/domain/Relation.java +++ b/src/main/java/com/sequence/anonymous/relation/domain/Relation.java @@ -3,6 +3,7 @@ import com.google.common.base.Preconditions; import com.sequence.anonymous.relation.presentation.dto.UpdateDto; import com.sequence.anonymous.user.domain.User; +import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -29,6 +30,7 @@ public class Relation { @JoinColumn(name = "user2_id") private User user2; + @Column(length = 10) @Enumerated(EnumType.STRING) private Status status; 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 36fe6bd..f2529c8 100644 --- a/src/main/java/com/sequence/anonymous/tag/domain/Tag.java +++ b/src/main/java/com/sequence/anonymous/tag/domain/Tag.java @@ -16,7 +16,7 @@ public class Tag { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(nullable = false, unique = true) + @Column(length = 15, nullable = false, unique = true) private String name; protected Tag() { 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 39e45c0..039cc73 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,6 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import java.io.File; import java.util.UUID; import lombok.Getter; @@ -29,6 +28,7 @@ public class Attachment { @JoinColumn(name = "user_id") private User user; + @Column(length = 10) @Enumerated(EnumType.STRING) private FileType type; 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 554dc24..df5680e 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/User.java +++ b/src/main/java/com/sequence/anonymous/user/domain/User.java @@ -37,7 +37,7 @@ public class User extends BaseTimeEntity { private int age; @Enumerated(EnumType.STRING) - @Column(nullable = false) + @Column(length = 10, nullable = false) private Gender gender; @ManyToOne @@ -70,6 +70,7 @@ private User(Long id, String providerId, OAuth2Provider provider, String email, 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, "initial value of withdrawal field must be false."); this.id = id; this.providerId = providerId; @@ -84,6 +85,7 @@ public void initializeProfile(String name, int age, Gender gender, College colle Preconditions.checkArgument(gender != null, "gender must be provided."); Preconditions.checkArgument(college != null, "college must be provided."); Preconditions.checkArgument(department != null, "department must be provided."); + Preconditions.checkArgument(age >= 20, "age must be at least 20"); this.name = name; this.age = age; 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 ad741c1..e023e8c 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/UserMatchPost.java +++ b/src/main/java/com/sequence/anonymous/user/domain/UserMatchPost.java @@ -2,6 +2,7 @@ import com.google.common.base.Preconditions; import com.sequence.anonymous.matchpost.domain.MatchPost; +import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -28,6 +29,7 @@ public class UserMatchPost { @JoinColumn(name = "user_id") private User user; + @Column(length = 15) @Enumerated(EnumType.STRING) private MatchPostRole role; From 3b13bbaddd3009eb3b8ab4028304704b3c5f0bd4 Mon Sep 17 00:00:00 2001 From: mk3058 Date: Sat, 26 Aug 2023 11:50:55 +0900 Subject: [PATCH 05/19] =?UTF-8?q?refactor(dto):=20Request=20Dto=20protecte?= =?UTF-8?q?d=20=EC=83=9D=EC=84=B1=EC=9E=90=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../college/presentation/dto/DepartmentUpdateDto.java | 4 +++- .../anonymous/college/presentation/dto/UpdateDto.java | 3 +++ .../java/com/sequence/anonymous/common/BaseTimeEntity.java | 5 +---- .../anonymous/invite/presentation/dto/UpdateDto.java | 3 +++ .../anonymous/matchPost/presentation/dto/UpdateDto.java | 3 +++ .../anonymous/relation/presentation/dto/UpdateDto.java | 3 +++ src/main/java/com/sequence/anonymous/user/domain/User.java | 4 ++-- 7 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/sequence/anonymous/college/presentation/dto/DepartmentUpdateDto.java b/src/main/java/com/sequence/anonymous/college/presentation/dto/DepartmentUpdateDto.java index 43d374a..805bbfd 100644 --- a/src/main/java/com/sequence/anonymous/college/presentation/dto/DepartmentUpdateDto.java +++ b/src/main/java/com/sequence/anonymous/college/presentation/dto/DepartmentUpdateDto.java @@ -1,10 +1,12 @@ package com.sequence.anonymous.college.presentation.dto; -import java.awt.Point; import lombok.Getter; @Getter public class DepartmentUpdateDto { private String name; + + protected DepartmentUpdateDto() { + } } diff --git a/src/main/java/com/sequence/anonymous/college/presentation/dto/UpdateDto.java b/src/main/java/com/sequence/anonymous/college/presentation/dto/UpdateDto.java index 5d99063..03ace08 100644 --- a/src/main/java/com/sequence/anonymous/college/presentation/dto/UpdateDto.java +++ b/src/main/java/com/sequence/anonymous/college/presentation/dto/UpdateDto.java @@ -9,4 +9,7 @@ public class UpdateDto { private String name; private Point location; + + protected UpdateDto() { + } } diff --git a/src/main/java/com/sequence/anonymous/common/BaseTimeEntity.java b/src/main/java/com/sequence/anonymous/common/BaseTimeEntity.java index 1eca679..30e9088 100644 --- a/src/main/java/com/sequence/anonymous/common/BaseTimeEntity.java +++ b/src/main/java/com/sequence/anonymous/common/BaseTimeEntity.java @@ -3,19 +3,16 @@ import jakarta.persistence.Column; import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; -import java.time.LocalDate; import java.time.LocalDateTime; import lombok.Getter; -import org.springframework.context.event.EventListener; import org.springframework.data.annotation.CreatedDate; -import org.springframework.data.annotation.LastModifiedBy; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; @Getter @MappedSuperclass @EntityListeners(AuditingEntityListener.class) -public abstract class BaseTimeEntity{ +public abstract class BaseTimeEntity { @CreatedDate @Column(updatable = false) diff --git a/src/main/java/com/sequence/anonymous/invite/presentation/dto/UpdateDto.java b/src/main/java/com/sequence/anonymous/invite/presentation/dto/UpdateDto.java index 82c02d2..162f714 100644 --- a/src/main/java/com/sequence/anonymous/invite/presentation/dto/UpdateDto.java +++ b/src/main/java/com/sequence/anonymous/invite/presentation/dto/UpdateDto.java @@ -7,4 +7,7 @@ public class UpdateDto { private Status status; + + protected UpdateDto() { + } } diff --git a/src/main/java/com/sequence/anonymous/matchPost/presentation/dto/UpdateDto.java b/src/main/java/com/sequence/anonymous/matchPost/presentation/dto/UpdateDto.java index 1330c6a..2894bd6 100644 --- a/src/main/java/com/sequence/anonymous/matchPost/presentation/dto/UpdateDto.java +++ b/src/main/java/com/sequence/anonymous/matchPost/presentation/dto/UpdateDto.java @@ -13,4 +13,7 @@ public class UpdateDto { private String appeal; private Status status; + + protected UpdateDto() { + } } diff --git a/src/main/java/com/sequence/anonymous/relation/presentation/dto/UpdateDto.java b/src/main/java/com/sequence/anonymous/relation/presentation/dto/UpdateDto.java index 54bef94..e570bd2 100644 --- a/src/main/java/com/sequence/anonymous/relation/presentation/dto/UpdateDto.java +++ b/src/main/java/com/sequence/anonymous/relation/presentation/dto/UpdateDto.java @@ -7,4 +7,7 @@ public class UpdateDto { private Status status; + + protected UpdateDto() { + } } 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 df5680e..82e59e2 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/User.java +++ b/src/main/java/com/sequence/anonymous/user/domain/User.java @@ -13,7 +13,6 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import jakarta.validation.constraints.Email; import lombok.Getter; @Entity @@ -80,7 +79,8 @@ private User(Long id, String providerId, OAuth2Provider provider, String email, this.withdrawal = withdrawal; } - public void initializeProfile(String name, int age, Gender gender, College college, Department department) { + public void initializeProfile(String name, int age, Gender gender, College college, + Department department) { Preconditions.checkArgument(name != null, "name must be provided."); Preconditions.checkArgument(gender != null, "gender must be provided."); Preconditions.checkArgument(college != null, "college must be provided."); From deb121446e8ca37a0cc3a081534cd2a826685212 Mon Sep 17 00:00:00 2001 From: mk3058 Date: Sat, 26 Aug 2023 12:53:34 +0900 Subject: [PATCH 06/19] =?UTF-8?q?refactor:=20domain=EA=B3=84=EC=B8=B5?= =?UTF-8?q?=EC=9D=B4=20presentation=EA=B3=84=EC=B8=B5=EC=97=90=20=EC=9D=98?= =?UTF-8?q?=EC=A1=B4=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sequence/anonymous/college/domain/College.java | 8 ++++---- .../anonymous/college/domain/Department.java | 6 +++--- .../com/sequence/anonymous/invite/domain/Invite.java | 6 +++--- .../anonymous/matchPost/domain/MatchPost.java | 12 ++++++------ .../sequence/anonymous/relation/domain/Relation.java | 6 +++--- .../com/sequence/anonymous/user/domain/User.java | 4 ++++ 6 files changed, 23 insertions(+), 19 deletions(-) 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 a2fc307..b68e8fa 100644 --- a/src/main/java/com/sequence/anonymous/college/domain/College.java +++ b/src/main/java/com/sequence/anonymous/college/domain/College.java @@ -1,13 +1,13 @@ package com.sequence.anonymous.college.domain; import com.google.common.base.Preconditions; -import com.sequence.anonymous.college.presentation.dto.UpdateDto; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import lombok.Getter; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.data.geo.Point; @Entity @@ -35,8 +35,8 @@ public College(String name, Point location) { this.location = location; } - public void updateName(UpdateDto dto) { - this.name = dto.getName(); - this.location = dto.getLocation(); + public void update(String name, Point location) { + this.name = ObjectUtils.defaultIfNull(name, this.name); + this.location = ObjectUtils.defaultIfNull(location, this.location); } } 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 9c9ba31..9e8bfdb 100644 --- a/src/main/java/com/sequence/anonymous/college/domain/Department.java +++ b/src/main/java/com/sequence/anonymous/college/domain/Department.java @@ -1,7 +1,6 @@ package com.sequence.anonymous.college.domain; import com.google.common.base.Preconditions; -import com.sequence.anonymous.college.presentation.dto.DepartmentUpdateDto; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -10,6 +9,7 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import lombok.Getter; +import org.apache.commons.lang3.ObjectUtils; @Entity @Getter @@ -38,7 +38,7 @@ public Department(String name, College college) { this.college = college; } - public void updateName(DepartmentUpdateDto dto) { - this.name = dto.getName(); + public void update(String name) { + this.name = ObjectUtils.defaultIfNull(name, this.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 cb57151..e3c9c0c 100644 --- a/src/main/java/com/sequence/anonymous/invite/domain/Invite.java +++ b/src/main/java/com/sequence/anonymous/invite/domain/Invite.java @@ -1,7 +1,6 @@ package com.sequence.anonymous.invite.domain; import com.google.common.base.Preconditions; -import com.sequence.anonymous.invite.presentation.dto.UpdateDto; import com.sequence.anonymous.user.domain.User; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -13,6 +12,7 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import lombok.Getter; +import org.apache.commons.lang3.ObjectUtils; @Entity @Getter @@ -58,7 +58,7 @@ private Invite(User inviter, User invitee, Kind kind, Status status) { this.status = status; } - public void updateStatus(UpdateDto dto) { - this.status = dto.getStatus(); + public void update(Status status) { + this.status = ObjectUtils.defaultIfNull(status, this.status); } } diff --git a/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPost.java b/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPost.java index ac3a545..277ab1f 100644 --- a/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPost.java +++ b/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPost.java @@ -2,7 +2,6 @@ import com.google.common.base.Preconditions; import com.sequence.anonymous.common.BaseTimeEntity; -import com.sequence.anonymous.matchpost.presentation.dto.UpdateDto; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -11,6 +10,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import lombok.Getter; +import org.apache.commons.lang3.ObjectUtils; @Entity @Getter @@ -58,10 +58,10 @@ protected MatchPost(Long id, String title, String introduce, String appeal, this.status = status; } - public void updateMatchPost(UpdateDto dto) { - this.title = dto.getTitle(); - this.introduce = dto.getIntroduce(); - this.appeal = dto.getAppeal(); - this.status = dto.getStatus(); + public void update(String title, String introduce, String appeal, Status status) { + this.title = ObjectUtils.defaultIfNull(title, this.title); + this.introduce = ObjectUtils.defaultIfNull(introduce, this.introduce); + this.appeal = ObjectUtils.defaultIfNull(appeal, this.appeal); + this.status = ObjectUtils.defaultIfNull(status, this.status); } } 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 e506602..cd64468 100644 --- a/src/main/java/com/sequence/anonymous/relation/domain/Relation.java +++ b/src/main/java/com/sequence/anonymous/relation/domain/Relation.java @@ -1,7 +1,6 @@ package com.sequence.anonymous.relation.domain; import com.google.common.base.Preconditions; -import com.sequence.anonymous.relation.presentation.dto.UpdateDto; import com.sequence.anonymous.user.domain.User; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -13,6 +12,7 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import lombok.Getter; +import org.apache.commons.lang3.ObjectUtils; @Entity @Getter @@ -47,7 +47,7 @@ public Relation(User user1, User user2, Status status) { this.status = status; } - public void updateStatus(UpdateDto dto) { - this.status = dto.getStatus(); + public void update(Status status) { + this.status = ObjectUtils.defaultIfNull(status, this.status); } } 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 82e59e2..db9f52b 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/User.java +++ b/src/main/java/com/sequence/anonymous/user/domain/User.java @@ -93,4 +93,8 @@ public void initializeProfile(String name, int age, Gender gender, College colle this.college = college; this.department = department; } + + public void withdrawal() { + this.withdrawal = true; + } } From a241e1a235922e79deaf94cb3db03d67427c5e28 Mon Sep 17 00:00:00 2001 From: mk3058 Date: Sun, 27 Aug 2023 12:21:07 +0900 Subject: [PATCH 07/19] =?UTF-8?q?fix(user):=20=EC=9C=A0=EC=A0=80=EC=9D=98?= =?UTF-8?q?=20=EB=82=98=EC=9D=B4=EA=B0=80=2020-30=20=EB=B2=94=EC=9C=84?= =?UTF-8?q?=EB=A1=9C=20=EC=A0=9C=ED=95=9C=EB=90=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sequence/anonymous/user/domain/User.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 db9f52b..5d94458 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/User.java +++ b/src/main/java/com/sequence/anonymous/user/domain/User.java @@ -85,7 +85,7 @@ public void initializeProfile(String name, int age, Gender gender, College colle Preconditions.checkArgument(gender != null, "gender must be provided."); Preconditions.checkArgument(college != null, "college must be provided."); Preconditions.checkArgument(department != null, "department must be provided."); - Preconditions.checkArgument(age >= 20, "age must be at least 20"); + Preconditions.checkArgument(!(20 <= age && age <= 30), "age must be between 20-30"); this.name = name; this.age = age; From b650a6e10162336549742d8117d4fcc57f5ab683 Mon Sep 17 00:00:00 2001 From: mk3058 Date: Sun, 27 Aug 2023 12:37:50 +0900 Subject: [PATCH 08/19] =?UTF-8?q?refactor(dto):=20dto=20=EC=9D=B4=EB=A6=84?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...partmentUpdateDto.java => DepartmentUpdateRequestDto.java} | 4 ++-- .../dto/{UpdateDto.java => UpdateRequestDto.java} | 4 ++-- .../dto/{UpdateDto.java => UpdateRequestDto.java} | 4 ++-- .../dto/{UpdateDto.java => UpdateRequestDto.java} | 4 ++-- .../dto/{UpdateDto.java => UpdateRequestDto.java} | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename src/main/java/com/sequence/anonymous/college/presentation/dto/{DepartmentUpdateDto.java => DepartmentUpdateRequestDto.java} (58%) rename src/main/java/com/sequence/anonymous/college/presentation/dto/{UpdateDto.java => UpdateRequestDto.java} (74%) rename src/main/java/com/sequence/anonymous/invite/presentation/dto/{UpdateDto.java => UpdateRequestDto.java} (72%) rename src/main/java/com/sequence/anonymous/matchPost/presentation/dto/{UpdateDto.java => UpdateRequestDto.java} (79%) rename src/main/java/com/sequence/anonymous/relation/presentation/dto/{UpdateDto.java => UpdateRequestDto.java} (73%) diff --git a/src/main/java/com/sequence/anonymous/college/presentation/dto/DepartmentUpdateDto.java b/src/main/java/com/sequence/anonymous/college/presentation/dto/DepartmentUpdateRequestDto.java similarity index 58% rename from src/main/java/com/sequence/anonymous/college/presentation/dto/DepartmentUpdateDto.java rename to src/main/java/com/sequence/anonymous/college/presentation/dto/DepartmentUpdateRequestDto.java index 805bbfd..ae23f6f 100644 --- a/src/main/java/com/sequence/anonymous/college/presentation/dto/DepartmentUpdateDto.java +++ b/src/main/java/com/sequence/anonymous/college/presentation/dto/DepartmentUpdateRequestDto.java @@ -3,10 +3,10 @@ import lombok.Getter; @Getter -public class DepartmentUpdateDto { +public class DepartmentUpdateRequestDto { private String name; - protected DepartmentUpdateDto() { + protected DepartmentUpdateRequestDto() { } } diff --git a/src/main/java/com/sequence/anonymous/college/presentation/dto/UpdateDto.java b/src/main/java/com/sequence/anonymous/college/presentation/dto/UpdateRequestDto.java similarity index 74% rename from src/main/java/com/sequence/anonymous/college/presentation/dto/UpdateDto.java rename to src/main/java/com/sequence/anonymous/college/presentation/dto/UpdateRequestDto.java index 03ace08..4b43301 100644 --- a/src/main/java/com/sequence/anonymous/college/presentation/dto/UpdateDto.java +++ b/src/main/java/com/sequence/anonymous/college/presentation/dto/UpdateRequestDto.java @@ -4,12 +4,12 @@ import org.springframework.data.geo.Point; @Getter -public class UpdateDto { +public class UpdateRequestDto { private String name; private Point location; - protected UpdateDto() { + protected UpdateRequestDto() { } } diff --git a/src/main/java/com/sequence/anonymous/invite/presentation/dto/UpdateDto.java b/src/main/java/com/sequence/anonymous/invite/presentation/dto/UpdateRequestDto.java similarity index 72% rename from src/main/java/com/sequence/anonymous/invite/presentation/dto/UpdateDto.java rename to src/main/java/com/sequence/anonymous/invite/presentation/dto/UpdateRequestDto.java index 162f714..19db05c 100644 --- a/src/main/java/com/sequence/anonymous/invite/presentation/dto/UpdateDto.java +++ b/src/main/java/com/sequence/anonymous/invite/presentation/dto/UpdateRequestDto.java @@ -4,10 +4,10 @@ import lombok.Getter; @Getter -public class UpdateDto { +public class UpdateRequestDto { private Status status; - protected UpdateDto() { + protected UpdateRequestDto() { } } diff --git a/src/main/java/com/sequence/anonymous/matchPost/presentation/dto/UpdateDto.java b/src/main/java/com/sequence/anonymous/matchPost/presentation/dto/UpdateRequestDto.java similarity index 79% rename from src/main/java/com/sequence/anonymous/matchPost/presentation/dto/UpdateDto.java rename to src/main/java/com/sequence/anonymous/matchPost/presentation/dto/UpdateRequestDto.java index 2894bd6..9a23af0 100644 --- a/src/main/java/com/sequence/anonymous/matchPost/presentation/dto/UpdateDto.java +++ b/src/main/java/com/sequence/anonymous/matchPost/presentation/dto/UpdateRequestDto.java @@ -4,7 +4,7 @@ import lombok.Getter; @Getter -public class UpdateDto { +public class UpdateRequestDto { private String title; @@ -14,6 +14,6 @@ public class UpdateDto { private Status status; - protected UpdateDto() { + protected UpdateRequestDto() { } } diff --git a/src/main/java/com/sequence/anonymous/relation/presentation/dto/UpdateDto.java b/src/main/java/com/sequence/anonymous/relation/presentation/dto/UpdateRequestDto.java similarity index 73% rename from src/main/java/com/sequence/anonymous/relation/presentation/dto/UpdateDto.java rename to src/main/java/com/sequence/anonymous/relation/presentation/dto/UpdateRequestDto.java index e570bd2..15776b0 100644 --- a/src/main/java/com/sequence/anonymous/relation/presentation/dto/UpdateDto.java +++ b/src/main/java/com/sequence/anonymous/relation/presentation/dto/UpdateRequestDto.java @@ -4,10 +4,10 @@ import lombok.Getter; @Getter -public class UpdateDto { +public class UpdateRequestDto { private Status status; - protected UpdateDto() { + protected UpdateRequestDto() { } } From da540710a40c4b9fa25ab414021248eed719a588 Mon Sep 17 00:00:00 2001 From: mk3058 Date: Sun, 27 Aug 2023 12:54:41 +0900 Subject: [PATCH 09/19] =?UTF-8?q?fix(User):=20=EC=B0=B8=EC=A1=B0=20?= =?UTF-8?q?=ED=83=80=EC=9E=85=EC=97=90=20=EB=8C=80=ED=95=9C=20=EA=B0=92=20?= =?UTF-8?q?=EA=B2=80=EC=A6=9D=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/sequence/anonymous/user/domain/User.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 5d94458..a7c6990 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/User.java +++ b/src/main/java/com/sequence/anonymous/user/domain/User.java @@ -69,6 +69,7 @@ private User(Long id, String providerId, OAuth2Provider provider, String email, 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(withdrawal, "initial value of withdrawal field must be false."); this.id = id; @@ -79,12 +80,13 @@ private User(Long id, String providerId, OAuth2Provider provider, String email, this.withdrawal = withdrawal; } - public void initializeProfile(String name, int age, Gender gender, College college, + public void initializeProfile(String name, Integer age, Gender gender, College college, Department department) { Preconditions.checkArgument(name != null, "name must be provided."); Preconditions.checkArgument(gender != null, "gender must be provided."); Preconditions.checkArgument(college != null, "college must be provided."); Preconditions.checkArgument(department != null, "department must be provided."); + Preconditions.checkArgument(age != null, "age must be provided."); Preconditions.checkArgument(!(20 <= age && age <= 30), "age must be between 20-30"); this.name = name; From 34ce3d81349bd8af7b6141b3c9eb6d1845aa06ae Mon Sep 17 00:00:00 2001 From: mk3058 Date: Sun, 27 Aug 2023 12:58:53 +0900 Subject: [PATCH 10/19] =?UTF-8?q?refactor(matchpost):=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=20=EC=9D=B4=EB=A6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anonymous/{matchPost => matchpost}/domain/MatchPost.java | 0 .../anonymous/{matchPost => matchpost}/domain/Status.java | 0 .../presentation/dto/UpdateRequestDto.java | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename src/main/java/com/sequence/anonymous/{matchPost => matchpost}/domain/MatchPost.java (100%) rename src/main/java/com/sequence/anonymous/{matchPost => matchpost}/domain/Status.java (100%) rename src/main/java/com/sequence/anonymous/{matchPost => matchpost}/presentation/dto/UpdateRequestDto.java (100%) diff --git a/src/main/java/com/sequence/anonymous/matchPost/domain/MatchPost.java b/src/main/java/com/sequence/anonymous/matchpost/domain/MatchPost.java similarity index 100% rename from src/main/java/com/sequence/anonymous/matchPost/domain/MatchPost.java rename to src/main/java/com/sequence/anonymous/matchpost/domain/MatchPost.java diff --git a/src/main/java/com/sequence/anonymous/matchPost/domain/Status.java b/src/main/java/com/sequence/anonymous/matchpost/domain/Status.java similarity index 100% rename from src/main/java/com/sequence/anonymous/matchPost/domain/Status.java rename to src/main/java/com/sequence/anonymous/matchpost/domain/Status.java diff --git a/src/main/java/com/sequence/anonymous/matchPost/presentation/dto/UpdateRequestDto.java b/src/main/java/com/sequence/anonymous/matchpost/presentation/dto/UpdateRequestDto.java similarity index 100% rename from src/main/java/com/sequence/anonymous/matchPost/presentation/dto/UpdateRequestDto.java rename to src/main/java/com/sequence/anonymous/matchpost/presentation/dto/UpdateRequestDto.java From 37bfa4e386cce2e4462cb442c8cbb0cd5b153c86 Mon Sep 17 00:00:00 2001 From: mk3058 Date: Sun, 27 Aug 2023 13:04:35 +0900 Subject: [PATCH 11/19] =?UTF-8?q?fix(User):=20=EB=82=98=EC=9D=B4=20?= =?UTF-8?q?=EA=B2=80=EC=A6=9D=20=EC=A1=B0=EA=B1=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sequence/anonymous/user/domain/User.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a7c6990..ad9c8c7 100644 --- a/src/main/java/com/sequence/anonymous/user/domain/User.java +++ b/src/main/java/com/sequence/anonymous/user/domain/User.java @@ -87,7 +87,7 @@ public void initializeProfile(String name, Integer age, Gender gender, College c Preconditions.checkArgument(college != null, "college must be provided."); Preconditions.checkArgument(department != null, "department must be provided."); Preconditions.checkArgument(age != null, "age must be provided."); - Preconditions.checkArgument(!(20 <= age && age <= 30), "age must be between 20-30"); + Preconditions.checkArgument((20 <= age && age <= 30), "age must be between 20-30"); this.name = name; this.age = age; From 65fdd5ca47efca87c72cb85ed348a133f0d7c00b Mon Sep 17 00:00:00 2001 From: mk3058 Date: Mon, 4 Sep 2023 12:57:30 +0900 Subject: [PATCH 12/19] =?UTF-8?q?feat(chat):=20=EA=B8=B0=EB=B3=B8=20?= =?UTF-8?q?=ED=81=B4=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 --- .../anonymous/chat/application/ChatService.java | 12 ++++++++++++ .../chat/domain/repository/ChatRepository.java | 10 ++++++++++ .../anonymous/chat/presentation/ChatController.java | 13 +++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 src/main/java/com/sequence/anonymous/chat/application/ChatService.java create mode 100644 src/main/java/com/sequence/anonymous/chat/domain/repository/ChatRepository.java create mode 100644 src/main/java/com/sequence/anonymous/chat/presentation/ChatController.java diff --git a/src/main/java/com/sequence/anonymous/chat/application/ChatService.java b/src/main/java/com/sequence/anonymous/chat/application/ChatService.java new file mode 100644 index 0000000..d55859b --- /dev/null +++ b/src/main/java/com/sequence/anonymous/chat/application/ChatService.java @@ -0,0 +1,12 @@ +package com.sequence.anonymous.chat.application; + +import com.sequence.anonymous.chat.domain.repository.ChatRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ChatService { + + private final ChatRepository chatRepository; +} diff --git a/src/main/java/com/sequence/anonymous/chat/domain/repository/ChatRepository.java b/src/main/java/com/sequence/anonymous/chat/domain/repository/ChatRepository.java new file mode 100644 index 0000000..8544b9a --- /dev/null +++ b/src/main/java/com/sequence/anonymous/chat/domain/repository/ChatRepository.java @@ -0,0 +1,10 @@ +package com.sequence.anonymous.chat.domain.repository; + +import com.sequence.anonymous.chat.domain.Chat; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ChatRepository extends JpaRepository { + +} diff --git a/src/main/java/com/sequence/anonymous/chat/presentation/ChatController.java b/src/main/java/com/sequence/anonymous/chat/presentation/ChatController.java new file mode 100644 index 0000000..71e08ea --- /dev/null +++ b/src/main/java/com/sequence/anonymous/chat/presentation/ChatController.java @@ -0,0 +1,13 @@ +package com.sequence.anonymous.chat.presentation; + +import com.sequence.anonymous.chat.application.ChatService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequiredArgsConstructor +@RequestMapping("/chat") +public class ChatController { + private final ChatService chatService; +} From 574653491b2bab64df80f633258b99060abb0c34 Mon Sep 17 00:00:00 2001 From: mk3058 Date: Mon, 4 Sep 2023 13:08:09 +0900 Subject: [PATCH 13/19] =?UTF-8?q?feat(college):=20=EA=B8=B0=EB=B3=B8=20?= =?UTF-8?q?=ED=81=B4=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 --- .../anonymous/chat/presentation/ChatController.java | 2 +- .../college/application/CollegeService.java | 11 +++++++++++ .../college/application/DepartmentService.java | 11 +++++++++++ .../domain/repository/CollegeRepository.java | 10 ++++++++++ .../domain/repository/DepartmentRepository.java | 10 ++++++++++ .../college/presentation/CollegeController.java | 13 +++++++++++++ .../college/presentation/DepartmentController.java | 13 +++++++++++++ 7 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/sequence/anonymous/college/application/CollegeService.java create mode 100644 src/main/java/com/sequence/anonymous/college/application/DepartmentService.java create mode 100644 src/main/java/com/sequence/anonymous/college/domain/repository/CollegeRepository.java create mode 100644 src/main/java/com/sequence/anonymous/college/domain/repository/DepartmentRepository.java create mode 100644 src/main/java/com/sequence/anonymous/college/presentation/CollegeController.java create mode 100644 src/main/java/com/sequence/anonymous/college/presentation/DepartmentController.java diff --git a/src/main/java/com/sequence/anonymous/chat/presentation/ChatController.java b/src/main/java/com/sequence/anonymous/chat/presentation/ChatController.java index 71e08ea..72538d6 100644 --- a/src/main/java/com/sequence/anonymous/chat/presentation/ChatController.java +++ b/src/main/java/com/sequence/anonymous/chat/presentation/ChatController.java @@ -7,7 +7,7 @@ @Controller @RequiredArgsConstructor -@RequestMapping("/chat") +@RequestMapping("/chats") public class ChatController { private final ChatService chatService; } diff --git a/src/main/java/com/sequence/anonymous/college/application/CollegeService.java b/src/main/java/com/sequence/anonymous/college/application/CollegeService.java new file mode 100644 index 0000000..a0713f5 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/college/application/CollegeService.java @@ -0,0 +1,11 @@ +package com.sequence.anonymous.college.application; + +import com.sequence.anonymous.college.domain.repository.CollegeRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class CollegeService { + private final CollegeRepository collegeRepository; +} diff --git a/src/main/java/com/sequence/anonymous/college/application/DepartmentService.java b/src/main/java/com/sequence/anonymous/college/application/DepartmentService.java new file mode 100644 index 0000000..b25dbde --- /dev/null +++ b/src/main/java/com/sequence/anonymous/college/application/DepartmentService.java @@ -0,0 +1,11 @@ +package com.sequence.anonymous.college.application; + +import com.sequence.anonymous.college.domain.repository.DepartmentRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class DepartmentService { + private final DepartmentRepository departmentRepository; +} diff --git a/src/main/java/com/sequence/anonymous/college/domain/repository/CollegeRepository.java b/src/main/java/com/sequence/anonymous/college/domain/repository/CollegeRepository.java new file mode 100644 index 0000000..5854f04 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/college/domain/repository/CollegeRepository.java @@ -0,0 +1,10 @@ +package com.sequence.anonymous.college.domain.repository; + +import com.sequence.anonymous.college.domain.College; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface CollegeRepository extends JpaRepository { + +} diff --git a/src/main/java/com/sequence/anonymous/college/domain/repository/DepartmentRepository.java b/src/main/java/com/sequence/anonymous/college/domain/repository/DepartmentRepository.java new file mode 100644 index 0000000..1381680 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/college/domain/repository/DepartmentRepository.java @@ -0,0 +1,10 @@ +package com.sequence.anonymous.college.domain.repository; + +import com.sequence.anonymous.college.domain.Department; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface DepartmentRepository extends JpaRepository { + +} diff --git a/src/main/java/com/sequence/anonymous/college/presentation/CollegeController.java b/src/main/java/com/sequence/anonymous/college/presentation/CollegeController.java new file mode 100644 index 0000000..28150a5 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/college/presentation/CollegeController.java @@ -0,0 +1,13 @@ +package com.sequence.anonymous.college.presentation; + +import com.sequence.anonymous.college.application.CollegeService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/colleges") +public class CollegeController { + private final CollegeService collegeService; +} diff --git a/src/main/java/com/sequence/anonymous/college/presentation/DepartmentController.java b/src/main/java/com/sequence/anonymous/college/presentation/DepartmentController.java new file mode 100644 index 0000000..b530d57 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/college/presentation/DepartmentController.java @@ -0,0 +1,13 @@ +package com.sequence.anonymous.college.presentation; + +import com.sequence.anonymous.college.application.DepartmentService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/departments") +public class DepartmentController { + private final DepartmentService departmentService; +} From 6205617096cb00a0fb2be7347979f745627cb69c Mon Sep 17 00:00:00 2001 From: mk3058 Date: Mon, 4 Sep 2023 13:11:40 +0900 Subject: [PATCH 14/19] =?UTF-8?q?feat(invite):=20=EA=B8=B0=EB=B3=B8=20?= =?UTF-8?q?=ED=81=B4=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 --- .../anonymous/invite/application/InviteService.java | 11 +++++++++++ .../invite/domain/repository/InviteRepository.java | 11 +++++++++++ .../invite/presentation/InviteController.java | 13 +++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 src/main/java/com/sequence/anonymous/invite/application/InviteService.java create mode 100644 src/main/java/com/sequence/anonymous/invite/domain/repository/InviteRepository.java create mode 100644 src/main/java/com/sequence/anonymous/invite/presentation/InviteController.java diff --git a/src/main/java/com/sequence/anonymous/invite/application/InviteService.java b/src/main/java/com/sequence/anonymous/invite/application/InviteService.java new file mode 100644 index 0000000..0fcfe17 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/invite/application/InviteService.java @@ -0,0 +1,11 @@ +package com.sequence.anonymous.invite.application; + +import com.sequence.anonymous.invite.domain.repository.InviteRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class InviteService { + private final InviteRepository inviteRepository; +} diff --git a/src/main/java/com/sequence/anonymous/invite/domain/repository/InviteRepository.java b/src/main/java/com/sequence/anonymous/invite/domain/repository/InviteRepository.java new file mode 100644 index 0000000..aeceef1 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/invite/domain/repository/InviteRepository.java @@ -0,0 +1,11 @@ +package com.sequence.anonymous.invite.domain.repository; + +import com.sequence.anonymous.invite.domain.Invite; +import lombok.RequiredArgsConstructor; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface InviteRepository extends JpaRepository { + +} diff --git a/src/main/java/com/sequence/anonymous/invite/presentation/InviteController.java b/src/main/java/com/sequence/anonymous/invite/presentation/InviteController.java new file mode 100644 index 0000000..653c8eb --- /dev/null +++ b/src/main/java/com/sequence/anonymous/invite/presentation/InviteController.java @@ -0,0 +1,13 @@ +package com.sequence.anonymous.invite.presentation; + +import com.sequence.anonymous.invite.application.InviteService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/invites") +public class InviteController { + private final InviteService inviteService; +} From 2a734f1493f3ab03a84cf3a327dc5b700ce45134 Mon Sep 17 00:00:00 2001 From: mk3058 Date: Mon, 4 Sep 2023 13:15:01 +0900 Subject: [PATCH 15/19] =?UTF-8?q?feat(matchPost):=20=EA=B8=B0=EB=B3=B8=20?= =?UTF-8?q?=ED=81=B4=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 --- .../matchpost/application/MatchPostService.java | 10 ++++++++++ .../domain/repository/MatchPostRepository.java | 10 ++++++++++ .../presentation/MatchPostController.java | 14 ++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 src/main/java/com/sequence/anonymous/matchpost/application/MatchPostService.java create mode 100644 src/main/java/com/sequence/anonymous/matchpost/domain/repository/MatchPostRepository.java create mode 100644 src/main/java/com/sequence/anonymous/matchpost/presentation/MatchPostController.java diff --git a/src/main/java/com/sequence/anonymous/matchpost/application/MatchPostService.java b/src/main/java/com/sequence/anonymous/matchpost/application/MatchPostService.java new file mode 100644 index 0000000..c9e8a36 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/matchpost/application/MatchPostService.java @@ -0,0 +1,10 @@ +package com.sequence.anonymous.matchpost.application; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class MatchPostService { + private final MatchPostService matchPostService; +} diff --git a/src/main/java/com/sequence/anonymous/matchpost/domain/repository/MatchPostRepository.java b/src/main/java/com/sequence/anonymous/matchpost/domain/repository/MatchPostRepository.java new file mode 100644 index 0000000..ecf77ee --- /dev/null +++ b/src/main/java/com/sequence/anonymous/matchpost/domain/repository/MatchPostRepository.java @@ -0,0 +1,10 @@ +package com.sequence.anonymous.matchpost.domain.repository; + +import com.sequence.anonymous.matchpost.domain.MatchPost; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface MatchPostRepository extends JpaRepository { + +} diff --git a/src/main/java/com/sequence/anonymous/matchpost/presentation/MatchPostController.java b/src/main/java/com/sequence/anonymous/matchpost/presentation/MatchPostController.java new file mode 100644 index 0000000..5aca440 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/matchpost/presentation/MatchPostController.java @@ -0,0 +1,14 @@ +package com.sequence.anonymous.matchpost.presentation; + +import com.sequence.anonymous.matchpost.application.MatchPostService; +import com.sequence.anonymous.matchpost.domain.repository.MatchPostRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/match-posts") +public class MatchPostController { + private final MatchPostService matchPostService; +} From 2e41c43c1b82f0f2b42c48386d5508f3d8985bd7 Mon Sep 17 00:00:00 2001 From: mk3058 Date: Mon, 4 Sep 2023 13:18:57 +0900 Subject: [PATCH 16/19] =?UTF-8?q?feat(relation):=20=EA=B8=B0=EB=B3=B8=20?= =?UTF-8?q?=ED=81=B4=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 --- .../relation/application/RelationService.java | 11 +++++++++++ .../domain/repository/RelationRepository.java | 10 ++++++++++ .../relation/presentation/RelationController.java | 12 ++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 src/main/java/com/sequence/anonymous/relation/application/RelationService.java create mode 100644 src/main/java/com/sequence/anonymous/relation/domain/repository/RelationRepository.java create mode 100644 src/main/java/com/sequence/anonymous/relation/presentation/RelationController.java diff --git a/src/main/java/com/sequence/anonymous/relation/application/RelationService.java b/src/main/java/com/sequence/anonymous/relation/application/RelationService.java new file mode 100644 index 0000000..0803202 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/relation/application/RelationService.java @@ -0,0 +1,11 @@ +package com.sequence.anonymous.relation.application; + +import com.sequence.anonymous.relation.domain.repository.RelationRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class RelationService { + private final RelationRepository relationRepository; +} diff --git a/src/main/java/com/sequence/anonymous/relation/domain/repository/RelationRepository.java b/src/main/java/com/sequence/anonymous/relation/domain/repository/RelationRepository.java new file mode 100644 index 0000000..f5f1b55 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/relation/domain/repository/RelationRepository.java @@ -0,0 +1,10 @@ +package com.sequence.anonymous.relation.domain.repository; + +import com.sequence.anonymous.relation.domain.Relation; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface RelationRepository extends JpaRepository { + +} diff --git a/src/main/java/com/sequence/anonymous/relation/presentation/RelationController.java b/src/main/java/com/sequence/anonymous/relation/presentation/RelationController.java new file mode 100644 index 0000000..d9e0f7e --- /dev/null +++ b/src/main/java/com/sequence/anonymous/relation/presentation/RelationController.java @@ -0,0 +1,12 @@ +package com.sequence.anonymous.relation.presentation; + +import com.sequence.anonymous.relation.application.RelationService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +@RestController +@RequiredArgsConstructor +@RequestMapping("/relations") +public class RelationController { +private final RelationService relationService; +} From 26a257c58acbfeae61f969836001e2fd227f0961 Mon Sep 17 00:00:00 2001 From: mk3058 Date: Mon, 4 Sep 2023 13:22:46 +0900 Subject: [PATCH 17/19] =?UTF-8?q?fix(matchPost):=20MatchServicePost=20?= =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=EB=A5=BC=20=EC=88=9C=ED=99=98=20?= =?UTF-8?q?=EC=B0=B8=EC=A1=B0=ED=95=98=EB=8D=98=20=EB=AC=B8=EC=A0=9C=20?= =?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/matchpost/application/MatchPostService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sequence/anonymous/matchpost/application/MatchPostService.java b/src/main/java/com/sequence/anonymous/matchpost/application/MatchPostService.java index c9e8a36..6fb2250 100644 --- a/src/main/java/com/sequence/anonymous/matchpost/application/MatchPostService.java +++ b/src/main/java/com/sequence/anonymous/matchpost/application/MatchPostService.java @@ -1,10 +1,11 @@ package com.sequence.anonymous.matchpost.application; +import com.sequence.anonymous.matchpost.domain.repository.MatchPostRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor public class MatchPostService { - private final MatchPostService matchPostService; + private final MatchPostRepository matchPostRepository; } From 426437bf60002928a3df43b71f7ca9da6e66df9d Mon Sep 17 00:00:00 2001 From: mk3058 Date: Mon, 4 Sep 2023 13:40:28 +0900 Subject: [PATCH 18/19] =?UTF-8?q?feat(tag):=20=EA=B8=B0=EB=B3=B8=20?= =?UTF-8?q?=ED=81=B4=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 --- .../anonymous/tag/application/TagService.java | 11 +++++++++++ .../tag/domain/repository/TagRepository.java | 10 ++++++++++ .../anonymous/tag/presentation/TagController.java | 13 +++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 src/main/java/com/sequence/anonymous/tag/application/TagService.java create mode 100644 src/main/java/com/sequence/anonymous/tag/domain/repository/TagRepository.java create mode 100644 src/main/java/com/sequence/anonymous/tag/presentation/TagController.java diff --git a/src/main/java/com/sequence/anonymous/tag/application/TagService.java b/src/main/java/com/sequence/anonymous/tag/application/TagService.java new file mode 100644 index 0000000..2138ed0 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/tag/application/TagService.java @@ -0,0 +1,11 @@ +package com.sequence.anonymous.tag.application; + +import com.sequence.anonymous.tag.domain.repository.TagRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class TagService { + private final TagRepository tagRepository; +} diff --git a/src/main/java/com/sequence/anonymous/tag/domain/repository/TagRepository.java b/src/main/java/com/sequence/anonymous/tag/domain/repository/TagRepository.java new file mode 100644 index 0000000..11a0034 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/tag/domain/repository/TagRepository.java @@ -0,0 +1,10 @@ +package com.sequence.anonymous.tag.domain.repository; + +import com.sequence.anonymous.tag.domain.Tag; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface TagRepository extends JpaRepository { + +} diff --git a/src/main/java/com/sequence/anonymous/tag/presentation/TagController.java b/src/main/java/com/sequence/anonymous/tag/presentation/TagController.java new file mode 100644 index 0000000..4b37728 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/tag/presentation/TagController.java @@ -0,0 +1,13 @@ +package com.sequence.anonymous.tag.presentation; + +import com.sequence.anonymous.tag.application.TagService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/tags") +public class TagController { + private final TagService tagService; +} From bffdf80affc2473376408d9afddba7fe60c5492e Mon Sep 17 00:00:00 2001 From: mk3058 Date: Mon, 4 Sep 2023 15:08:45 +0900 Subject: [PATCH 19/19] =?UTF-8?q?feat(user):=20=EA=B8=B0=EB=B3=B8=20?= =?UTF-8?q?=ED=81=B4=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 --- .../presentation/MatchPostController.java | 1 + .../user/application/AttachmentService.java | 11 +++++++++++ .../user/application/UserChatService.java | 11 +++++++++++ .../user/application/UserMatchPostService.java | 11 +++++++++++ .../anonymous/user/application/UserService.java | 11 +++++++++++ .../anonymous/user/application/UserTagService.java | 11 +++++++++++ .../domain/repository/AttachmentRepository.java | 10 ++++++++++ .../user/domain/repository/UserChatRepository.java | 10 ++++++++++ .../domain/repository/UserMatchPostRepository.java | 10 ++++++++++ .../user/domain/repository/UserTagRepository.java | 10 ++++++++++ .../user/presentation/AttachmentController.java | 14 ++++++++++++++ .../user/presentation/UserChatController.java | 13 +++++++++++++ .../user/presentation/UserController.java | 14 ++++++++++++++ .../user/presentation/UserMatchPostController.java | 13 +++++++++++++ .../user/presentation/UserTagController.java | 13 +++++++++++++ 15 files changed, 163 insertions(+) create mode 100644 src/main/java/com/sequence/anonymous/user/application/AttachmentService.java create mode 100644 src/main/java/com/sequence/anonymous/user/application/UserChatService.java create mode 100644 src/main/java/com/sequence/anonymous/user/application/UserMatchPostService.java create mode 100644 src/main/java/com/sequence/anonymous/user/application/UserService.java create mode 100644 src/main/java/com/sequence/anonymous/user/application/UserTagService.java create mode 100644 src/main/java/com/sequence/anonymous/user/domain/repository/AttachmentRepository.java create mode 100644 src/main/java/com/sequence/anonymous/user/domain/repository/UserChatRepository.java create mode 100644 src/main/java/com/sequence/anonymous/user/domain/repository/UserMatchPostRepository.java create mode 100644 src/main/java/com/sequence/anonymous/user/domain/repository/UserTagRepository.java create mode 100644 src/main/java/com/sequence/anonymous/user/presentation/AttachmentController.java create mode 100644 src/main/java/com/sequence/anonymous/user/presentation/UserChatController.java create mode 100644 src/main/java/com/sequence/anonymous/user/presentation/UserController.java create mode 100644 src/main/java/com/sequence/anonymous/user/presentation/UserMatchPostController.java create mode 100644 src/main/java/com/sequence/anonymous/user/presentation/UserTagController.java diff --git a/src/main/java/com/sequence/anonymous/matchpost/presentation/MatchPostController.java b/src/main/java/com/sequence/anonymous/matchpost/presentation/MatchPostController.java index 5aca440..102c30c 100644 --- a/src/main/java/com/sequence/anonymous/matchpost/presentation/MatchPostController.java +++ b/src/main/java/com/sequence/anonymous/matchpost/presentation/MatchPostController.java @@ -3,6 +3,7 @@ import com.sequence.anonymous.matchpost.application.MatchPostService; import com.sequence.anonymous.matchpost.domain.repository.MatchPostRepository; import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/sequence/anonymous/user/application/AttachmentService.java b/src/main/java/com/sequence/anonymous/user/application/AttachmentService.java new file mode 100644 index 0000000..b6f983a --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/application/AttachmentService.java @@ -0,0 +1,11 @@ +package com.sequence.anonymous.user.application; + +import com.sequence.anonymous.user.domain.repository.AttachmentRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class AttachmentService { + private final AttachmentRepository attachmentRepository; +} diff --git a/src/main/java/com/sequence/anonymous/user/application/UserChatService.java b/src/main/java/com/sequence/anonymous/user/application/UserChatService.java new file mode 100644 index 0000000..2348329 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/application/UserChatService.java @@ -0,0 +1,11 @@ +package com.sequence.anonymous.user.application; + +import com.sequence.anonymous.user.domain.repository.UserChatRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class UserChatService { + private final UserChatRepository userChatRepository; +} diff --git a/src/main/java/com/sequence/anonymous/user/application/UserMatchPostService.java b/src/main/java/com/sequence/anonymous/user/application/UserMatchPostService.java new file mode 100644 index 0000000..896f5c1 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/application/UserMatchPostService.java @@ -0,0 +1,11 @@ +package com.sequence.anonymous.user.application; + +import com.sequence.anonymous.user.domain.repository.UserMatchPostRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class UserMatchPostService { + private final UserMatchPostRepository userMatchPostRepository; +} diff --git a/src/main/java/com/sequence/anonymous/user/application/UserService.java b/src/main/java/com/sequence/anonymous/user/application/UserService.java new file mode 100644 index 0000000..a678835 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/application/UserService.java @@ -0,0 +1,11 @@ +package com.sequence.anonymous.user.application; + +import com.sequence.anonymous.user.domain.repository.UserRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class UserService { + private final UserRepository userRepository; +} diff --git a/src/main/java/com/sequence/anonymous/user/application/UserTagService.java b/src/main/java/com/sequence/anonymous/user/application/UserTagService.java new file mode 100644 index 0000000..01abb57 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/application/UserTagService.java @@ -0,0 +1,11 @@ +package com.sequence.anonymous.user.application; + +import com.sequence.anonymous.user.domain.repository.UserTagRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class UserTagService { + private final UserTagRepository userTagRepository; +} diff --git a/src/main/java/com/sequence/anonymous/user/domain/repository/AttachmentRepository.java b/src/main/java/com/sequence/anonymous/user/domain/repository/AttachmentRepository.java new file mode 100644 index 0000000..6563594 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/domain/repository/AttachmentRepository.java @@ -0,0 +1,10 @@ +package com.sequence.anonymous.user.domain.repository; + +import com.sequence.anonymous.user.domain.Attachment; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface AttachmentRepository extends JpaRepository { + +} diff --git a/src/main/java/com/sequence/anonymous/user/domain/repository/UserChatRepository.java b/src/main/java/com/sequence/anonymous/user/domain/repository/UserChatRepository.java new file mode 100644 index 0000000..901d61e --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/domain/repository/UserChatRepository.java @@ -0,0 +1,10 @@ +package com.sequence.anonymous.user.domain.repository; + +import com.sequence.anonymous.user.domain.UserChat; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface UserChatRepository extends JpaRepository { + +} diff --git a/src/main/java/com/sequence/anonymous/user/domain/repository/UserMatchPostRepository.java b/src/main/java/com/sequence/anonymous/user/domain/repository/UserMatchPostRepository.java new file mode 100644 index 0000000..a1aca9f --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/domain/repository/UserMatchPostRepository.java @@ -0,0 +1,10 @@ +package com.sequence.anonymous.user.domain.repository; + +import com.sequence.anonymous.user.domain.UserMatchPost; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface UserMatchPostRepository extends JpaRepository { + +} diff --git a/src/main/java/com/sequence/anonymous/user/domain/repository/UserTagRepository.java b/src/main/java/com/sequence/anonymous/user/domain/repository/UserTagRepository.java new file mode 100644 index 0000000..d4178b0 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/domain/repository/UserTagRepository.java @@ -0,0 +1,10 @@ +package com.sequence.anonymous.user.domain.repository; + +import com.sequence.anonymous.user.domain.UserTag; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface UserTagRepository extends JpaRepository { + +} diff --git a/src/main/java/com/sequence/anonymous/user/presentation/AttachmentController.java b/src/main/java/com/sequence/anonymous/user/presentation/AttachmentController.java new file mode 100644 index 0000000..4e50bd0 --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/presentation/AttachmentController.java @@ -0,0 +1,14 @@ +package com.sequence.anonymous.user.presentation; + +import com.sequence.anonymous.user.application.AttachmentService; +import com.sequence.anonymous.user.domain.repository.AttachmentRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/attachments") +public class AttachmentController { + private final AttachmentService attachmentService; +} diff --git a/src/main/java/com/sequence/anonymous/user/presentation/UserChatController.java b/src/main/java/com/sequence/anonymous/user/presentation/UserChatController.java new file mode 100644 index 0000000..2b9879e --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/presentation/UserChatController.java @@ -0,0 +1,13 @@ +package com.sequence.anonymous.user.presentation; + +import com.sequence.anonymous.user.application.UserChatService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/user-chats") +public class UserChatController { + private final UserChatService userChatService; +} diff --git a/src/main/java/com/sequence/anonymous/user/presentation/UserController.java b/src/main/java/com/sequence/anonymous/user/presentation/UserController.java new file mode 100644 index 0000000..f0f07be --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/presentation/UserController.java @@ -0,0 +1,14 @@ +package com.sequence.anonymous.user.presentation; + +import com.sequence.anonymous.user.application.UserService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/users") +public class UserController { + private final UserService userService; +} diff --git a/src/main/java/com/sequence/anonymous/user/presentation/UserMatchPostController.java b/src/main/java/com/sequence/anonymous/user/presentation/UserMatchPostController.java new file mode 100644 index 0000000..e5c52cc --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/presentation/UserMatchPostController.java @@ -0,0 +1,13 @@ +package com.sequence.anonymous.user.presentation; + +import com.sequence.anonymous.user.application.UserMatchPostService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/user-match-posts") +public class UserMatchPostController { + private final UserMatchPostService userMatchPostService; +} diff --git a/src/main/java/com/sequence/anonymous/user/presentation/UserTagController.java b/src/main/java/com/sequence/anonymous/user/presentation/UserTagController.java new file mode 100644 index 0000000..4de38eb --- /dev/null +++ b/src/main/java/com/sequence/anonymous/user/presentation/UserTagController.java @@ -0,0 +1,13 @@ +package com.sequence.anonymous.user.presentation; + +import com.sequence.anonymous.user.application.UserTagService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/user-tags") +public class UserTagController { + private final UserTagService userTagService; +}