Merge pull request #424 from Team-Ampersand/refactor/member

refactor :: imageUpload refactor
Team-Ampersand · Sep 15, 2024 · 6f8a6dc · 6f8a6dc
2 parents 1865cd2 + 82d469b
commit 6f8a6dc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/src/main/kotlin/com/dotori/v2/domain/member/domain/entity/Member.kt b/src/main/kotlin/com/dotori/v2/domain/member/domain/entity/Member.kt
@@ -1,7 +1,9 @@
 package com.dotori.v2.domain.member.domain.entity
 
+import com.dotori.v2.domain.member.domain.entity.QMember.member
 import com.dotori.v2.domain.member.enums.*
 import com.dotori.v2.domain.rule.domain.entity.RuleViolation
+import com.dotori.v2.global.thirdparty.aws.s3.S3Service
 import com.dotori.v2.domain.student.presentation.data.req.ModifyStudentInfoRequest
 import com.dotori.v2.global.entity.BaseTimeEntity
 import java.time.LocalDateTime
@@ -102,10 +104,6 @@ class Member(
         this.selfStudyExpiredDate = localDateTime
     }
 
-    fun updateProfileImage(profileImage: String?) {
-        this.profileImage = profileImage
-    }
-
     fun graduate(period: String): Member {
         this.stuNum = period
         return this
@@ -117,4 +115,15 @@ class Member(
         this.gender = request.gender
         this.roles = Collections.singletonList(request.role)
     }
+
+    fun updateProfileImage(profileImage: String?): Member {
+        this.profileImage = profileImage
+        return this
+    }
+
+    fun isProfileImageExists(): Boolean {
+        return !this.profileImage.isNullOrEmpty()
+    }
+
+
 }
diff --git a/src/main/kotlin/com/dotori/v2/domain/member/service/impl/UpdateProfileImageServiceImpl.kt b/src/main/kotlin/com/dotori/v2/domain/member/service/impl/UpdateProfileImageServiceImpl.kt
@@ -16,6 +16,6 @@ class UpdateProfileImageServiceImpl(
 ): UpdateProfileImageService {
     override fun execute(multipartFiles: MultipartFile?) {
         val member: Member = userUtil.fetchCurrentUser()
-        profileImageService.imageUpload(member = member, multipartFiles = multipartFiles, isUpdate = true)
+        profileImageService.imageUpload(member = member, multipartFiles = multipartFiles)
     }
 }
diff --git a/src/main/kotlin/com/dotori/v2/global/util/ProfileImageService.kt b/src/main/kotlin/com/dotori/v2/global/util/ProfileImageService.kt
@@ -12,13 +12,15 @@ class ProfileImageService (
     private val s3Service: S3Service,
     private val redisCacheService: RedisCacheService
 ) {
-    fun imageUpload(member: Member, multipartFiles: MultipartFile?, isUpdate: Boolean = false) {
 
+    fun imageUpload(member: Member, multipartFiles: MultipartFile?) {
         validateExtension(multipartFiles)
 
-        val uploadFileUrl: String? = s3Service.uploadSingleFile(multipartFiles)
+        val uploadFileUrl = s3Service.uploadSingleFile(multipartFiles)
 
-        if (isUpdate) s3Service.deleteFile(member.profileImage!!)
+        if (member.isProfileImageExists()) {
+            s3Service.deleteFile(member.profileImage!!)
+        }
 
         member.updateProfileImage(uploadFileUrl)