Merge pull request #170 from martinP-Ghub/part1-박태식-sprint3

[박태식] sprint3

Author: JJong0416

build.gradle

@@ -1,25 +1,37 @@
 plugins {
     id 'groovy'
     id 'checkstyle'
+    id 'java'
+    id 'org.springframework.boot' version '3.4.2'
+    id 'io.spring.dependency-management' version '1.1.7'
 }
 
 group 'com.sprint.mission'
 version '1.0-SNAPSHOT'
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    implementation 'org.apache.groovy:groovy:4.0.14'
-    implementation 'org.projectlombok:lombok:1.18.30' // 최신 버전 사용
-    annotationProcessor 'org.projectlombok:lombok:1.18.30' // Lombok 애노테이션 프로세서 추가
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
-    // https://mvnrepository.com/artifact/com.google.guava/guava
-    implementation 'com.google.guava:guava:33.2.1-jre'
-    // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
+    implementation 'org.springframework.boot:spring-boot-starter-web' // Spring Web 추가
+    implementation 'org.springframework.boot:spring-boot-starter'
+
+    implementation 'org.projectlombok:lombok:1.18.30'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    annotationProcessor 'org.projectlombok:lombok:1.18.30'
+
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
+
+    implementation 'com.google.guava:guava:33.2.1-jre'
+
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 
 test {

config/channel.ser

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

config/message.ser

@@ -0,0 +1,5 @@
+package com.sprint.mission.discodeit.domain;
+
+public enum ChannelType {
+    Private, Public;
+}

config/user.ser

@@ -0,0 +1,5 @@
+package com.sprint.mission.discodeit.domain;
+
+public enum Mimetype {
+    User, Message;
+}

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,15 @@
+package com.sprint.mission.discodeit.dto;
+
+import com.sprint.mission.discodeit.domain.ChannelType;
+
+import java.util.List;
+import java.util.UUID;
+
+public record ChannelRequest(
+        String name,
+        String description,
+        List<UUID> member,
+        UUID owner,
+        ChannelType channelType
+) {
+}

src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java

@@ -0,0 +1,26 @@
+package com.sprint.mission.discodeit.dto;
+
+import com.sprint.mission.discodeit.domain.ChannelType;
+import com.sprint.mission.discodeit.entity.Channel;
+
+import javax.naming.directory.NoSuchAttributeException;
+import java.util.List;
+import java.util.UUID;
+
+public record ChannelResponse(
+        String name,
+        String description,
+        List<UUID> member,
+        UUID owner,
+        ChannelType channelType
+) {
+    public static ChannelResponse fromEntity(Channel channel){
+        return new ChannelResponse(
+            channel.getName(),
+            channel.getDescription(),
+            channel.getMember(),
+            channel.getOwner(),
+            channel.getChannelType()
+        );
+    }
+}

src/main/java/com/sprint/mission/discodeit/_DiscodeitApplication.java

@@ -0,0 +1,14 @@
+package com.sprint.mission.discodeit.dto;
+
+import java.util.UUID;
+
+public record MessageRequest(
+        String content,
+        UUID senderId,
+        UUID recipientId,
+        UUID channelId,
+        UUID attachedFileId
+) {
+
+
+}

src/main/java/com/sprint/mission/discodeit/domain/ChannelType.java

@@ -0,0 +1,21 @@
+package com.sprint.mission.discodeit.dto;
+
+import com.sprint.mission.discodeit.entity.Message;
+
+import java.util.UUID;
+
+public record MessageResponse(
+        String content,
+        UUID senderId,
+        UUID recipientId,
+        UUID channelId
+) {
+    public static MessageResponse fromEntity(Message message){
+        return new MessageResponse(
+                message.getContent(),
+                message.getSenderId(),
+                message.getRecipientId(),
+                message.getChannelId()
+        );
+    }
+}

src/main/java/com/sprint/mission/discodeit/domain/Mimetype.java

@@ -0,0 +1,13 @@
+package com.sprint.mission.discodeit.dto;
+
+import com.sprint.mission.discodeit.domain.ChannelType;
+
+import java.util.List;
+import java.util.UUID;
+
+public record PrivateChannelRequest(
+        List<UUID> member,
+        UUID owner,
+        ChannelType channelType
+) {
+}

src/main/java/com/sprint/mission/discodeit/dto/ChannelRequest.java

@@ -0,0 +1,14 @@
+package com.sprint.mission.discodeit.dto;
+
+import com.sprint.mission.discodeit.domain.ChannelType;
+
+import java.util.List;
+import java.util.UUID;
+
+public record PublicChannelRequest(
+        String name,
+        String description,
+        UUID owner,
+        ChannelType channelType
+) {
+}

src/main/java/com/sprint/mission/discodeit/dto/ChannelResponse.java

@@ -0,0 +1,13 @@
+package com.sprint.mission.discodeit.dto;
+
+import java.util.UUID;
+
+public record UserRequest(
+        String username,
+        String password,
+        String email,
+        String phoneNumber,
+        UUID profileImageId
+//        String profileImageName
+) {
+}

src/main/java/com/sprint/mission/discodeit/dto/MessageRequest.java

@@ -0,0 +1,17 @@
+package com.sprint.mission.discodeit.dto;
+
+import com.sprint.mission.discodeit.entity.User;
+
+import java.util.UUID;
+
+public record UserResponse(
+        UUID id,
+        String username,
+        String email,
+        String phoneNumber,
+        boolean isOnline
+) {
+    public static UserResponse fromEntity(User user, Boolean isOnline) {
+        return new UserResponse(user.getId(), user.getUsername(), user.getEmail(), user.getPhoneNumber(), isOnline);
+    }
+}

src/main/java/com/sprint/mission/discodeit/dto/MessageResponse.java

@@ -1,34 +1,30 @@
 package com.sprint.mission.discodeit.entity;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import lombok.Getter;
+
 import java.io.Serializable;
+import java.time.Instant;
 import java.util.UUID;
 
+//@Entity
+@Getter
 public abstract class BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
+//    @Id
     private UUID id;
-    private Long createdAt;
-    private Long updatedAt;
+    private Instant createdAt;
+    private Instant updatedAt;
 
     public BaseEntity(){
         this.id = id != null ? id : UUID.randomUUID();
 //        System.out.println("새로 생성된 UUID: " + this.id); // 로그 추가
-        this.createdAt = System.currentTimeMillis();
+        this.createdAt = Instant.ofEpochMilli(System.currentTimeMillis());
         this.updatedAt = createdAt;
     }
 
-    public UUID getId(){
-        return id;
-    }
-
-    public Long getCreatedAt(){
-        return createdAt;
-    }
-
-    public Long getUpdatedAt(){
-        return updatedAt;
-    }
-
     public void update(){
-        this.updatedAt = System.currentTimeMillis();
+        this.updatedAt = Instant.ofEpochMilli(System.currentTimeMillis());
     }
 }

src/main/java/com/sprint/mission/discodeit/dto/PrivateChannelRequest.java

@@ -0,0 +1,26 @@
+package com.sprint.mission.discodeit.entity;
+
+import com.sprint.mission.discodeit.domain.Mimetype;
+import lombok.Getter;
+
+import java.io.Serializable;
+import java.time.Instant;
+import java.util.UUID;
+
+@Getter
+public class BinaryContent implements Serializable {
+    private static final long getSerialVersionUID = 1L;
+    private UUID id;
+    private final Instant createdAt;
+    private final UUID typeId;
+//    private final byte[] content;
+    private final Mimetype mimetype;
+
+    public BinaryContent(UUID typeId, Mimetype mimetype) {
+        this.id = id != null ? id : UUID.randomUUID();
+        this.createdAt = Instant.ofEpochMilli(System.currentTimeMillis());
+        this.typeId = typeId;
+//        this.content = content;
+        this.mimetype = mimetype;
+    }
+}

src/main/java/com/sprint/mission/discodeit/dto/PublicChannelRequest.java

@@ -1,24 +1,39 @@
 package com.sprint.mission.discodeit.entity;
 
+import com.sprint.mission.discodeit.domain.ChannelType;
 import lombok.Getter;
-import lombok.Setter;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.UUID;
 
-@Getter @Setter
+@Getter
 public class Channel extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
     private String name;
     private String description;
-    private List<User> member;
-    private User owner;
+    private List<UUID> member;
+    private UUID owner;
+    private ChannelType channelType;
 
-    public Channel(String name, String description, List<User> member, User owner){
+    public Channel(String name, String description, List<UUID> member, UUID owner, ChannelType channelType){
         super();
         this.name = name;
         this.description = description;
         this.member = member;
         this.owner = owner;
+        this.channelType = channelType;
+    }
+
+    public void setName(String name){
+        this.name = name;
+    }
+
+    public void setDescription(String description){
+        this.description = description;
+    }
+
+    public boolean isPrivate(){
+        return this.channelType == ChannelType.Private;
     }
 }

src/main/java/com/sprint/mission/discodeit/dto/UserRequest.java

@@ -1,30 +1,28 @@
 package com.sprint.mission.discodeit.entity;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.util.UUID;
+
 
 @Getter @Setter
 public class Message extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
     private String content;
-    private User sender;
-    private User recipient;
-    private Channel channel;
-
-
-    public Message(String content, User sender, Channel channel) {
-        super();
-        this.content = content;
-        this.sender = sender;
-        this.channel = channel;
-    }
+    private UUID senderId;
+    private UUID recipientId;
+    private UUID channelId;
+    private BinaryContent attachedFileId;
 
-    public Message(String content, User sender, User recipient) {
+    public Message(String content, UUID senderId, UUID recipientId, UUID channelId) {
         super();
         this.content = content;
-        this.sender = sender;
-        this.recipient = recipient;
+        this.senderId = senderId;
+        this.recipientId = recipientId;
+        this.channelId = channelId;
     }
 }

src/main/java/com/sprint/mission/discodeit/dto/UserResponse.java

@@ -0,0 +1,26 @@
+package com.sprint.mission.discodeit.entity;
+
+import lombok.Getter;
+
+import java.io.Serializable;
+import java.time.Instant;
+
+@Getter
+public class ReadStatus extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private final String userId;
+    private final String channelId;
+    private Instant lastReadAt;
+
+    public ReadStatus(String userId, String channelId, Instant lastReadAt) {
+        super();
+        this.userId = userId;
+        this.channelId = channelId;
+        this.lastReadAt = lastReadAt;
+    }
+
+    public void updateLastRead(Instant timestamp) {
+        this.lastReadAt = timestamp;
+        update();
+    }
+}