fix: apply pr's comments

k-twitter · Nov 18, 2023 · 1a13745 · 1a13745
1 parent 6ee662b
commit 1a13745
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/sns_service/src/main/kotlin/joryu/sns_service/channel/entity/Channel.kt b/sns_service/src/main/kotlin/joryu/sns_service/channel/entity/Channel.kt
@@ -15,20 +15,21 @@ class Channel(
     val channelType: ChannelType = ChannelType.PERSONAL
 ) : Serializable {
     @Id
+    @Column(name = "channel_id")
     val id: String = UUID.randomUUID().toString()
 
     @OneToMany(mappedBy = "channel")
-    val channelUsers: MutableList<ChannelProfile> = mutableListOf()
+    val channelProfiles: MutableList<ChannelProfile> = mutableListOf()
 
     @Column(name = "channel_name")
     var channelName: String = channelName
         private set
 
-    fun changeChannelName(newName: String) {
+    fun updateChannelName(newName: String) {
         channelName = newName
     }
 
-    fun addUserToChannel(user: ChannelProfile) {
-        channelUsers.add(user)
+    fun addProfileToChannel(profile: ChannelProfile) {
+        channelProfiles.add(profile)
     }
 }
diff --git a/sns_service/src/main/kotlin/joryu/sns_service/channel/entity/ChannelProfile.kt b/sns_service/src/main/kotlin/joryu/sns_service/channel/entity/ChannelProfile.kt
@@ -9,13 +9,14 @@ import java.io.Serializable
 class ChannelProfile(
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "channel_id")
-    var channel: Channel? = null,
+    val channel: Channel = Channel(),
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "profile_id")
-    var profile: Profile? = null
+    val profile: Profile = Profile()
 ): Serializable {
     @Id
+    @Column(name = "channel_profile_id")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     val id: Long = 0
 }
diff --git a/sns_service/src/main/kotlin/joryu/sns_service/chat/controller/ChatMessageController.kt b/sns_service/src/main/kotlin/joryu/sns_service/chat/controller/ChatMessageController.kt
@@ -9,7 +9,6 @@ import org.springframework.stereotype.Controller
 class ChatMessageController(
     private val chatPublisher: ChatPublisher
 ) {
-
     /**
      * /pub/chat/message 로 들어오는 메시징을 처리한다.
      */

diff --git a/sns_service/src/main/kotlin/joryu/sns_service/chat/dto/ChatMessage.kt b/sns_service/src/main/kotlin/joryu/sns_service/chat/dto/ChatMessage.kt
@@ -2,6 +2,6 @@ package joryu.sns_service.chat.dto
 
 data class ChatMessage(
     val channelId: String,
-    val sender: String,
+    val senderProfileId: String,
     val content: String = "",
 )
diff --git a/sns_service/src/main/kotlin/joryu/sns_service/profile/entity/Profile.kt b/sns_service/src/main/kotlin/joryu/sns_service/profile/entity/Profile.kt
@@ -1,6 +1,7 @@
 package joryu.sns_service.profile.entity
 
 import jakarta.persistence.*
+import joryu.sns_service.channel.entity.Channel
 import joryu.sns_service.channel.entity.ChannelProfile
 import joryu.sns_service.common.entity.BaseEntity
 import joryu.sns_service.follow.entity.Follow
@@ -44,8 +45,8 @@ class Profile(
         this.followingNumber++
     }
 
-    fun addChannel(channelProfile: ChannelProfile) {
-        channelProfiles.add(channelProfile)
+    fun addChannel(channel: Channel) {
+        channelProfiles.add(ChannelProfile(channel, this))
     }
 }
 
diff --git a/sns_service/src/main/kotlin/joryu/sns_service/profile/service/ProfileService.kt b/sns_service/src/main/kotlin/joryu/sns_service/profile/service/ProfileService.kt
@@ -41,7 +41,7 @@ class ProfileService(
     @Transactional(readOnly = true)
     fun findAllByIdIn(ids: List<Long>): List<ProfileInfoResponse> {
         return profileRepository.findAllByIdIn(ids)
-            .map { p -> ProfileInfoResponse(p) }
+            .map { profile -> ProfileInfoResponse(profile) }
     }
 
     @Transactional
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ import org.springframework.stereotype.Controller @@
     class ChatMessageController(
         private val chatPublisher: ChatPublisher
     ) {
         /**
          * /pub/chat/message 로 들어오는 메시징을 처리한다.
          */
@@ Expand Down @@