Merge pull request #97 from wafflestudio/feat/profile-image-oci

Feat/profile image oci

Author: ohsuhyeon0119

hangsha/src/main/kotlin/com/team1/hangsha/common/upload/LocalUploadService.kt

@@ -4,7 +4,5 @@ import org.springframework.boot.context.properties.ConfigurationProperties
 
 @ConfigurationProperties(prefix = "upload")
 data class UploadProperties(
-    val dir: String,
-    val publicBaseUrl: String,
     val maxSizeBytes: Long = 10 * 1024 * 1024,
-)
+)

hangsha/src/main/kotlin/com/team1/hangsha/common/upload/UploadProperties.kt

@@ -1,7 +1,6 @@
 package com.team1.hangsha.config
 
 import com.team1.hangsha.user.UserArgumentResolver
-import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.Configuration
 import org.springframework.web.method.support.HandlerMethodArgumentResolver
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
@@ -10,7 +9,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
 @Configuration
 class WebConfig(
     private val userArgumentResolver: UserArgumentResolver,
-    @Value("\${upload.dir}") private val uploadDir: String
 ) : WebMvcConfigurer {
 
     override fun addArgumentResolvers(resolvers: MutableList<HandlerMethodArgumentResolver>) {
@@ -19,6 +17,6 @@ class WebConfig(
 
     override fun addResourceHandlers(registry: ResourceHandlerRegistry) {
         registry.addResourceHandler("/static/**")
-            .addResourceLocations("file:$uploadDir/", "classpath:/static/")
+            .addResourceLocations("classpath:/static/")
     }
-}
+}

hangsha/src/main/kotlin/com/team1/hangsha/common/upload/UploadWebConfig.kt

@@ -1,7 +1,6 @@
 package com.team1.hangsha.user.controller
 
 import com.fasterxml.jackson.databind.JsonNode
-import com.team1.hangsha.common.upload.LocalUploadService
 import com.team1.hangsha.common.upload.dto.UploadResponse
 import com.team1.hangsha.user.LoggedInUser
 import com.team1.hangsha.user.model.User
@@ -21,7 +20,6 @@ import io.swagger.v3.oas.annotations.media.Schema
 @RequestMapping("/api/v1/users/me")
 class UserController(
     private val userService: UserService,
-    private val localUploadService: LocalUploadService,
 ) {
     @GetMapping
     fun getMe(
@@ -115,8 +113,8 @@ class UserController(
         @Parameter(hidden = true) @LoggedInUser user: User,
         @RequestPart("file") file: MultipartFile,
     ): ResponseEntity<UploadResponse> {
-        val url = localUploadService.uploadProfileImage(user.id!!, file)
+        val url = userService.uploadProfile(user.id!!, file)
         userService.updateProfileImageUrl(user.id!!, url)
         return ResponseEntity.ok(UploadResponse(url = url))
     }
-}
+}

hangsha/src/main/kotlin/com/team1/hangsha/config/WebConfig.kt

@@ -17,7 +17,9 @@ data class UserDto(
         id = user.id!!,
         username = user.username,
         email = user.email,
-        profileImageUrl = user.profileImageUrl ?: "https://hangsha.site/static/default-profile.png",
+        profileImageUrl = user.profileImageUrl ?: "https://objectstorage.ap-chuncheon-1.oraclecloud.com/n/ax1dvc8vmenm/b/hangsha-asset/o/default/43513b43-2f84-4f0f-8de8-7d61120fe3aa.png",
+        // default-profile.png는 oci에 업로드 해 두었음.
+
         interestCategories = interestCategories
     )
-}
+}

hangsha/src/main/kotlin/com/team1/hangsha/user/controller/UserController.kt

@@ -11,6 +11,7 @@ import com.team1.hangsha.user.repository.UserIdentityRepository
 import com.team1.hangsha.user.model.AuthProvider
 import com.team1.hangsha.user.dto.IssuedTokens
 import com.team1.hangsha.user.repository.RefreshTokenRepository
+import com.team1.hangsha.common.upload.OciUploadService
 import org.springframework.beans.factory.annotation.Value
 import com.team1.hangsha.user.AuthCookieSupport
 import com.team1.hangsha.user.model.RefreshToken
@@ -23,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional
 import org.slf4j.LoggerFactory
 import java.net.URI
 import java.time.Instant
+import org.springframework.web.multipart.MultipartFile
 
 @Service
 class UserService(
@@ -33,6 +35,7 @@ class UserService(
     private val tokenHasher: TokenHasher,
     private val cookieSupport: AuthCookieSupport,
     private val userPreferenceService: UserPreferenceService,
+    private val ociUploadService: OciUploadService,
     @Value("\${jwt.refresh-expiration-ms}") private val refreshExpirationMs: Long,
 ) {
 
@@ -276,4 +279,16 @@ class UserService(
         user.profileImageUrl = profileImageUrl
         userRepository.save(user)
     }
-}
+
+    fun uploadProfile(userId: Long, file: MultipartFile): String {
+        val contentType = file.contentType ?: ""
+        if (!contentType.startsWith("image/")) {
+            throw DomainException(ErrorCode.UPLOAD_UNSUPPORTED_MEDIA_TYPE, "이미지 파일만 업로드할 수 있습니다")
+        }
+
+        return ociUploadService.uploadFile(
+            prefix = "uploads/users/$userId",
+            file = file,
+        )
+    }
+}

hangsha/src/main/kotlin/com/team1/hangsha/user/dto/core/UserDto.kt

@@ -85,10 +85,7 @@ springdoc:
     path: /api-docs
 
 
-# TODO : 삭제 예정. 이미지 업로드는 외부 스토리지로 모두 마이그레이션 할 것.
 upload:
-  dir: /data/uploads
-  public-base-url: "https://hangsha.site/static"
   max-size-bytes: 10485760
 
 # TODO: 프로퍼티 정상 주입 확인 목적. 배포 완료 시 내리기.