Merge pull request #58 from Workout-Study/dev

Dev

src/main/kotlin/com/fitmate/myfit/adapter/in/event/dto/UserCreateMessageDto.kt

@@ -4,6 +4,7 @@ data class UserCreateMessageDto(
     val userId: Int,
     val nickname: String,
     val state: Boolean,
+    val imageUrl: String,
     val createdAt: String,
     val updatedAt: String
 )

src/main/kotlin/com/fitmate/myfit/adapter/in/event/mapper/UserForReadMapper.kt

@@ -54,6 +54,7 @@ class UserForReadMapper {
                 userCreateMessageDto.userId,
                 userCreateMessageDto.nickname,
                 userCreateMessageDto.state,
+                userCreateMessageDto.imageUrl,
                 eventPublisher
             )
 

src/main/kotlin/com/fitmate/myfit/adapter/out/persistence/entity/UserForReadEntity.kt

@@ -9,6 +9,7 @@ import java.time.Instant
 class UserForReadEntity(
     @Column(nullable = false) val userId: Int,
     @Column(nullable = false) var nickname: String,
+    @Column(nullable = true) var imageUrl: String,
     createUser: String
 ) : BaseEntity(GlobalStatus.PERSISTENCE_NOT_DELETED, Instant.now(), createUser) {
 
@@ -22,6 +23,7 @@ class UserForReadEntity(
             val userForReadEntity = UserForReadEntity(
                 domain.userId,
                 domain.nickname,
+                domain.imageUrl,
                 domain.createUser
             )
 

src/main/kotlin/com/fitmate/myfit/application/port/in/user/command/CreateUserForReadCommand.kt

@@ -7,6 +7,7 @@ data class CreateUserForReadCommand(
     val userId: Int,
     val nickname: String,
     val state: Boolean,
+    val imageUrl: String,
     @field:NotEmpty val eventPublisher: String
 ) : SelfValidating<CreateUserForReadCommand>() {
 }

src/main/kotlin/com/fitmate/myfit/application/service/dto/UserInfoResponseDto.kt

@@ -6,6 +6,7 @@ data class UserInfoResponseDto(
     val userId: Int,
     val nickname: String,
     val state: Boolean,
+    val imageUrl: String,
     val createdAt: Instant,
     val updatedAt: Instant
 )

src/main/kotlin/com/fitmate/myfit/domain/UserForRead.kt

@@ -11,6 +11,7 @@ class UserForRead(
     val id: Long?,
     val userId: Int,
     var nickname: String,
+    var imageUrl: String,
     createUser: String
 ) : BaseDomain(GlobalStatus.PERSISTENCE_NOT_DELETED, createdAt = Instant.now(), createUser = userId.toString()) {
     fun updateByUserInfo(userInfo: UserInfoResponseDto, saveUserForReadCommand: SaveUserForReadCommand) {
@@ -23,6 +24,7 @@ class UserForRead(
     fun updateByUserCommand(createUserForReadCommand: CreateUserForReadCommand) {
         this.nickname = createUserForReadCommand.nickname
         this.state = createUserForReadCommand.state
+        this.imageUrl = createUserForReadCommand.imageUrl
         this.updatedAt = Instant.now()
         this.updateUser = createUserForReadCommand.eventPublisher
     }
@@ -34,6 +36,7 @@ class UserForRead(
                 entity.id,
                 entity.userId,
                 entity.nickname,
+                entity.imageUrl,
                 entity.createUser
             )
 
@@ -50,6 +53,7 @@ class UserForRead(
                 null,
                 userInfo.userId,
                 userInfo.nickname,
+                userInfo.imageUrl,
                 saveUserForReadCommand.eventPublisher
             )
 
@@ -63,6 +67,7 @@ class UserForRead(
                 null,
                 command.userId,
                 command.nickname,
+                command.imageUrl,
                 command.eventPublisher
             )
 

src/main/resources/slack-properties.yml

@@ -0,0 +1 @@
+token: null