[Refactoring] entity 수정

Author: ARlegro

.idea/workspace.xml

@@ -1,25 +1,27 @@
 package com.sprint.mission.entity;
 
+import static lombok.AccessLevel.*;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
 import lombok.*;
 
 @Entity
 @EqualsAndHashCode(of = {"fileName", "contentType", "size"}, callSuper = true)
-@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
+@NoArgsConstructor(access = PROTECTED)
 @ToString(of = {"fileName", "size", "contentType"})
 @Getter
 @Schema(description = "바이너리 컨텐츠")
 @Table(name = "binary_contents")
 public class BinaryContent extends BaseEntity {
 
+  @Column(nullable = false)
   private String fileName;
+  @Column(nullable = false)
   private Long size;
+  @Column(length = 100, nullable = false)
   private String contentType;
 
-  @OneToOne(mappedBy = "profile")
-  private User user;
-
   public BinaryContent(String fileName, Long size, String contentType) {
     this.fileName = fileName;
     this.size = size;

src/main/java/com/sprint/mission/entity/BinaryContent.java

@@ -1,7 +1,10 @@
 package com.sprint.mission.entity;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 import lombok.*;
@@ -10,6 +13,7 @@
 import java.util.List;
 
 import static jakarta.persistence.CascadeType.*;
+import static jakarta.persistence.EnumType.*;
 
 @Entity
 @EqualsAndHashCode(of = {"channelType", "name"}, callSuper = true)
@@ -20,6 +24,8 @@
 @Table(name = "channels")
 public class Channel extends BaseUpdatableEntity {
 
+  @Enumerated(STRING)
+  @Column(nullable = false)
   private ChannelType channelType;
   private String name;
   private String description;

src/main/java/com/sprint/mission/entity/Channel.java

@@ -21,19 +21,18 @@
 @Table(name = "messages")
 public class Message extends BaseUpdatableEntity {
 
+  @Column(columnDefinition = "text", nullable = false)
   private String content;
 
-  @ManyToOne(fetch = LAZY, cascade = REMOVE)
-  @JoinColumn(name = "channel_id", nullable = false)
+  @ManyToOne(fetch = LAZY, optional = false)
+  @JoinColumn(name = "channel_id", columnDefinition = "uuid")
   private Channel channel;
 
-  @ManyToOne(fetch = LAZY)
+  @ManyToOne(fetch = LAZY, optional = false)
+  @JoinColumn(name = "author_id", columnDefinition = "uuid")
   @OnDelete(action = OnDeleteAction.SET_NULL)
   private User author;
 
-  // 설계도에서 OneToMany 관계를 JoinTable로 설계하도록 되어있어서...
-  // 이런 구조에서 Message삭제 시 binaryContent자동 삭제는 구현 못했습니다(수동으로 메서드 만들어서 해야될까요)
-  // MessageCascadeTest 파일에서 테스트 실패
   @OneToMany(fetch = LAZY, cascade = REMOVE, orphanRemoval = true)
   @JoinTable(
       name = "message_attachments",
@@ -49,13 +48,11 @@ public Message update(String newContent) {
     return this;
   }
 
-  public Message(String content, Channel channel, User author) {
+  public Message(String content, Channel channel, User author, List<BinaryContent> messageAttachments) {
     this.content = content;
     this.channel = channel;
     this.author = author;
+    this.messageAttachments = messageAttachments;
   }
 
-  public void addAttachment(BinaryContent attachment) {
-    messageAttachments.add(attachment);
-  }
 }

src/main/java/com/sprint/mission/entity/Message.java

@@ -18,15 +18,15 @@
 @Table(name = "read_statuses")
 public class ReadStatus extends BaseUpdatableEntity {
 
-  @ManyToOne(fetch = LAZY)
-  @JoinColumn(name = "user_id", unique = true)
+  @ManyToOne(fetch = LAZY, optional = false)
+  @JoinColumn(name = "user_id", columnDefinition = "uuid", unique = true)
   private User user;
 
-  @ManyToOne(fetch = LAZY)
-  @JoinColumn(name = "channel_id", unique = true)
+  @ManyToOne(fetch = LAZY, optional = false)
+  @JoinColumn(name = "channel_id", columnDefinition = "uuid", unique = true)
   private Channel channel;
 
-  @NotNull
+  @Column(nullable = false, columnDefinition = "timestamp with time zone")
   private Instant lastReadAt;
 
   public void update(Instant newLastReadAt) {

src/main/java/com/sprint/mission/entity/ReadStatus.java

@@ -19,16 +19,23 @@
 @Getter //@Builder
 @NoArgsConstructor(access = PROTECTED)
 @Schema(description = "유저")
-@Table(name = "users")
+@Table(
+    name = "users",
+    uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"username", "email"})
+    }
+)
 public class User extends BaseUpdatableEntity {
 
+  @Column(length = 50, nullable = false, unique = true)
   private String username;
+  @Column(length = 100, nullable = false, unique = true)
   private String email;
+  @Column(length = 60, nullable = false)
   private String password;
 
-  @OneToOne(fetch = LAZY)
-  @JoinColumn(name = "profile_id")
-  @OnDelete(action = OnDeleteAction.SET_NULL) // profile이 삭제되면 user의 profile은 null로 변경
+  @OneToOne(fetch = LAZY, cascade = ALL, orphanRemoval = true)
+  @JoinColumn(name = "profile_id", columnDefinition = "uuid")
   private BinaryContent profile;
 
   @OneToOne(mappedBy = "user", cascade = REMOVE)

src/main/java/com/sprint/mission/entity/User.java

@@ -20,10 +20,11 @@
 @Table(name = "user_statuses")
 public class UserStatus extends BaseUpdatableEntity {
 
-  @OneToOne(fetch = LAZY)
+  @OneToOne(fetch = LAZY, optional = false)
   @JoinColumn(name = "user_id", nullable = false, unique = true)
   private User user;
 
+  @Column(columnDefinition = "timestamp with the zone", nullable = false)
   private Instant lastActiveAt;
 
   public UserStatus(User user) {
@@ -38,8 +39,8 @@ public void update() {
   public boolean isOnline() {
     if (lastActiveAt == null) {
       return false;
-    } else {
-      return Duration.between(lastActiveAt, Instant.now()).toMinutes() < 5;
     }
+
+    return Duration.between(lastActiveAt, Instant.now()).toMinutes() < 5;
   }
 }

src/main/java/com/sprint/mission/entity/UserStatus.java

@@ -16,6 +16,7 @@ spring:
 ---
 logging:
   level:
-    org.hibernate.sql: warn
+    com.sprint.mission: debug
+    org.hibernate.sql: debug
     org.hibernate.orm.jdbc.bind: trace
 

src/main/resources/application-dev.yml

@@ -12,4 +12,5 @@ spring:
 ---
 logging:
   level:
+    com.sprint.mission: info
     org.hibernate.sql: info

src/main/resources/application-prod.yml

@@ -58,4 +58,6 @@ springdoc:
     enabled: false
   swagger-ui:
     enabled: false
-
+logging:
+  level:
+    root: info

src/main/resources/application.yml

@@ -0,0 +1,116 @@
+CREATE TABLE users
+(
+    id         uuid PRIMARY KEY,
+    created_at timestamptz  NOT NULL,
+    updated_at timestamptz,
+    username   varchar(50)  NOT NULL,
+    email      varchar(100) NOT NULL,
+    password   varchar(60)  NOT NULL,
+    profile_id uuid,
+    UNIQUE (username, email)
+);
+
+CREATE TABLE binary_contents
+(
+    id           uuid PRIMARY KEY,
+    created_at   timestamptz  NOT NULL,
+    file_name    varchar(255) NOT NULL,
+    size         bigint       NOT NULL,
+    content_type varchar(100) NOT NULL,
+    bytes        bytea        NOT NULL
+);
+
+
+CREATE TABLE channels
+(
+    id          uuid PRIMARY KEY,
+    created_at  timestamptz NOT NULL,
+    updated_at  timestamptz,
+    name        varchar(100),
+    description varchar(500),
+    type        varchar(10) NOT NULL
+--     CONSTRAINT channels_pkey PRIMARY KEY (id),
+--     CONSTRAINT channels_type_check
+--         CHECK (type::text = ANY
+--                (ARRAY ['PUBLIC'::character varying, 'PRIVATE'::character varying]::text[]))
+);
+
+CREATE TABLE messages
+(
+    id         uuid PRIMARY KEY,
+    created_at timestamptz NOT NULL,
+    updated_at timestamptz NOT NULL,
+    content    text,
+    channel_id uuid        NOT NULL,
+    author_id  uuid
+--     CONSTRAINT messages_pkey PRIMARY KEY (id),
+--     CONSTRAINT fk_author FOREIGN KEY (author_id)
+--         REFERENCES public.users (id) MATCH SIMPLE
+--         ON UPDATE NO ACTION
+--         ON DELETE SET NULL,
+--     CONSTRAINT fk_channel FOREIGN KEY (channel_id)
+--         REFERENCES public.channels (id) MATCH SIMPLE
+--         ON UPDATE NO ACTION
+--         ON DELETE CASCADE
+);
+
+CREATE TABLE read_statuses
+(
+    id           uuid PRIMARY KEY,
+    created_at   timestamptz NOT NULL,
+    updated_at   timestamptz,
+    user_id      uuid        NOT NULL,
+    last_read_at timestamptz NOT NULL,
+    channel_id   uuid        NOT NULL,
+    UNIQUE (user_id, channel_id)
+--     CONSTRAINT read_statuses_pkey PRIMARY KEY (id),
+--     CONSTRAINT read_statuses_channel_id_key UNIQUE (channel_id),
+--     CONSTRAINT unique_user_id UNIQUE (user_id),
+--     CONSTRAINT fk_channel_id FOREIGN KEY (channel_id)
+--         REFERENCES public.channels (id) MATCH SIMPLE
+--         ON UPDATE NO ACTION
+--         ON DELETE CASCADE,
+--     CONSTRAINT fk_user_id FOREIGN KEY (user_id)
+--         REFERENCES public.users (id) MATCH SIMPLE
+--         ON UPDATE NO ACTION
+--         ON DELETE CASCADE
+);
+
+
+CREATE TABLE user_statuses
+(
+    id             uuid PRIMARY KEY,
+    created_at     timestamptz NOT NULL,
+    updated_at     timestamptz,
+    user_id        uuid UNIQUE NOT NULL,
+    last_active_at timestamptz NOT NULL
+--     CONSTRAINT user_statuses_pkey PRIMARY KEY (id),
+--     CONSTRAINT user_statuses_user_id_key UNIQUE (user_id),
+--     CONSTRAINT user_statuses_user_id_fkey FOREIGN KEY (user_id)
+--         REFERENCES public.users (id) MATCH SIMPLE
+--         ON UPDATE NO ACTION
+--         ON DELETE CASCADE
+);
+
+
+
+CREATE TABLE message_attachments
+(
+    message_id    uuid,
+    attachment_id uuid,
+    PRIMARY KEY (message_id, attachment_id)
+--     CONSTRAINT fk_attachment FOREIGN KEY (attachment_id)
+--         REFERENCES public.binary_contents (id) MATCH SIMPLE
+--         ON UPDATE NO ACTION
+--         ON DELETE CASCADE,
+--     CONSTRAINT fk_message FOREIGN KEY (message_id)
+--         REFERENCES public.messages (id) MATCH SIMPLE
+--         ON UPDATE NO ACTION
+--         ON DELETE CASCADE
+);
+
+ALTER TABLE users
+    ADD CONSTRAINT fk_user_binary_content
+        FOREIGN KEY (profile_id)
+            REFERENCES binary_content (id)
+            ON DELETE SET NULL