Merge pull request #131 from ASAP-Lettering/ASAP-456

tlarbals824 · web-flow · commit c6f9d5e57b51 · 2025-05-18T17:17:17.000+09:00
ASAP-456 비회원 이미지 업로드 로직 추가 및 테스트 보완
diff --git a/Application-Module/src/main/kotlin/com/asap/application/image/port/in/UploadImageUsecase.kt b/Application-Module/src/main/kotlin/com/asap/application/image/port/in/UploadImageUsecase.kt
@@ -9,10 +9,10 @@ interface UploadImageUsecase {
 
     data class Command(
         val image: FileMetaData,
-        val userId: String
+        val userId: String? = null
     )
 
     data class Response(
         val imageUrl: String
     )
-}
+}
diff --git a/Application-Module/src/main/kotlin/com/asap/application/image/service/ImageCommandService.kt b/Application-Module/src/main/kotlin/com/asap/application/image/service/ImageCommandService.kt
@@ -10,19 +10,20 @@ import org.springframework.stereotype.Service
 @Service
 class ImageCommandService(
     private val imageManagementPort: ImageManagementPort,
-    private val userManagementPort: UserManagementPort
+    private val userManagementPort: UserManagementPort,
 ) : UploadImageUsecase {
     override fun upload(command: UploadImageUsecase.Command): UploadImageUsecase.Response {
-        val user = userManagementPort.getUserNotNull(DomainId(command.userId))
+        val user = command.userId?.let { userManagementPort.getUserNotNull(DomainId(it)) }
 
-        val uploadedImage = imageManagementPort.save(
-            ImageMetadata(
-                owner = user.id.value,
-                fileMetaData = command.image
+        val uploadedImage =
+            imageManagementPort.save(
+                ImageMetadata(
+                    owner = user?.id?.value,
+                    fileMetaData = command.image,
+                ),
             )
-        )
         return UploadImageUsecase.Response(
-            imageUrl = uploadedImage.imageUrl
+            imageUrl = uploadedImage.imageUrl,
         )
     }
-}
+}
diff --git a/Application-Module/src/main/kotlin/com/asap/application/image/vo/ImageMetadata.kt b/Application-Module/src/main/kotlin/com/asap/application/image/vo/ImageMetadata.kt
@@ -3,7 +3,6 @@ package com.asap.application.image.vo
 import com.asap.common.file.FileMetaData
 
 data class ImageMetadata(
-    val owner: String,
-    val fileMetaData: FileMetaData
-) {
-}
+    val owner: String?,
+    val fileMetaData: FileMetaData,
+)
diff --git a/Application-Module/src/test/kotlin/com/asap/application/image/service/ImageCommandServiceTest.kt b/Application-Module/src/test/kotlin/com/asap/application/image/service/ImageCommandServiceTest.kt
@@ -6,14 +6,17 @@ import com.asap.application.image.vo.UploadedImage
 import com.asap.application.user.port.out.UserManagementPort
 import com.asap.common.file.FileMetaData
 import com.asap.domain.UserFixture
+import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.BehaviorSpec
 import io.kotest.matchers.nulls.shouldNotBeNull
 import io.mockk.every
 import io.mockk.mockk
+import io.mockk.verify
 import java.io.InputStream
 
 class ImageCommandServiceTest :
     BehaviorSpec({
+        isolationMode = IsolationMode.InstancePerLeaf
 
         val mockImageManagementPort = mockk<ImageManagementPort>(relaxed = true)
         val mockUserManagementPort = mockk<UserManagementPort>(relaxed = true)
@@ -56,4 +59,36 @@ class ImageCommandServiceTest :
                 }
             }
         }
+
+        given("userId가 null인 이미지 업로드 요청이 들어올 때") {
+            val command =
+                UploadImageUsecase.Command(
+                    userId = null,
+                    image =
+                        FileMetaData(
+                            name = "name",
+                            contentType = "contentType",
+                            size = 1L,
+                            inputStream = InputStream.nullInputStream(),
+                        ),
+                )
+            every {
+                mockImageManagementPort.save(any())
+            } returns
+                UploadedImage(
+                    imageUrl = "imageUrl",
+                )
+            `when`("이미지 업로드 요청을 처리하면") {
+                val response = imageCommandService.upload(command)
+                then("getUserNotNull 메서드가 호출되지 않아야 한다") {
+                    verify(exactly = 0) { mockUserManagementPort.getUserNotNull(any()) }
+                }
+                then("이미지가 저장되어야 한다") {
+                    response.imageUrl shouldNotBeNull {
+                        this.isNotBlank()
+                        this.isNotEmpty()
+                    }
+                }
+            }
+        }
     })
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/common/config/WebConfig.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/common/config/WebConfig.kt
@@ -8,11 +8,11 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
 
 @Configuration
 class WebConfig(
-    private val accessUserArgumentResolver: AccessUserArgumentResolver
+    private val accessUserArgumentResolver: AccessUserArgumentResolver,
 ) : WebMvcConfigurer {
-
     override fun addCorsMappings(registry: CorsRegistry) {
-        registry.addMapping("/**")
+        registry
+            .addMapping("/**")
             .allowedOrigins("*")
             .allowedMethods("GET", "POST", "PUT", "DELETE")
             .allowedHeaders("*")
@@ -21,4 +21,4 @@ class WebConfig(
     override fun addArgumentResolvers(resolvers: MutableList<HandlerMethodArgumentResolver>) {
         resolvers.add(accessUserArgumentResolver)
     }
-}
+}
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/common/security/annotation/AccessUserArgumentResolver.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/common/security/annotation/AccessUserArgumentResolver.kt
@@ -10,20 +10,17 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver
 import org.springframework.web.method.support.ModelAndViewContainer
 
 @Component
-class AccessUserArgumentResolver: HandlerMethodArgumentResolver {
-
-    override fun supportsParameter(parameter: MethodParameter): Boolean {
-        return parameter.hasParameterAnnotation(AccessUser::class.java)
-    }
+class AccessUserArgumentResolver : HandlerMethodArgumentResolver {
+    override fun supportsParameter(parameter: MethodParameter): Boolean = parameter.hasParameterAnnotation(AccessUser::class.java)
 
     override fun resolveArgument(
         parameter: MethodParameter,
         mavContainer: ModelAndViewContainer?,
         webRequest: NativeWebRequest,
-        binderFactory: WebDataBinderFactory?
+        binderFactory: WebDataBinderFactory?,
     ): Any? {
-        val userAuthentication = SecurityContextHolder.getContext().getAuthentication() as UserAuthentication
-        val userId = userAuthentication.getDetails()
-        return userId
+        val authentication = SecurityContextHolder.getContext()?.getAuthentication()
+        val userAuthentication = authentication as? UserAuthentication
+        return userAuthentication?.getDetails()
     }
-}
+}
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/image/api/ImageApi.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/image/api/ImageApi.kt
@@ -17,7 +17,7 @@ import org.springframework.web.multipart.MultipartFile
 interface ImageApi {
     @Operation(
         summary = "이미지 업로드",
-        description = "이미지를 업로드합니다.",
+        description = "이미지를 업로드합니다. 회원과 비회원 모두 이용 가능합니다.",
     )
     @PostMapping(consumes = ["multipart/form-data"])
     @ApiResponses(
@@ -28,8 +28,8 @@ interface ImageApi {
                 headers = [
                     Header(
                         name = "Authorization",
-                        description = "액세스 토큰",
-                        required = true,
+                        description = "액세스 토큰 (선택사항)",
+                        required = false,
                     ),
                 ],
             ),
@@ -41,6 +41,6 @@ interface ImageApi {
     )
     fun uploadImage(
         @RequestPart image: MultipartFile,
-        @AccessUser userId: String,
+        @AccessUser userId: String?,
     ): UploadImageResponse
 }
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/image/controller/ImageController.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/image/controller/ImageController.kt
@@ -14,7 +14,7 @@ class ImageController(
 ) : ImageApi {
     override fun uploadImage(
         image: MultipartFile,
-        userId: String,
+        userId: String?,
     ): UploadImageResponse {
         val response =
             uploadImageUsecase.upload(
diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/image/controller/ImageControllerTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/image/controller/ImageControllerTest.kt
@@ -54,4 +54,39 @@ class ImageControllerTest : AcceptanceSupporter() {
             }
         }
     }
+
+    @Test
+    fun uploadImageWithoutAuthentication() {
+        // given
+        val mockFile = MockMultipartFile("image", "test.jpg", "image/jpeg", "test".toByteArray())
+        val mockFileMetaData = FileMetaData("test.jpg", 4, "image/jpeg", mockFile.inputStream)
+        BDDMockito
+            .given(fileConverter.convert(mockFile))
+            .willReturn(mockFileMetaData)
+        BDDMockito
+            .given(
+                uploadImageUsecase.upload(
+                    UploadImageUsecase.Command(
+                        image = mockFileMetaData,
+                        userId = null,
+                    ),
+                ),
+            ).willReturn(UploadImageUsecase.Response("imageUrl"))
+        // when
+        val response =
+            mockMvc.multipart("/api/v1/images") {
+                file(mockFile)
+                contentType = MediaType.MULTIPART_FORM_DATA
+                // No Authorization header
+            }
+        // then
+        response.andExpect {
+            status { isOk() }
+            jsonPath("$.imageUrl") {
+                exists()
+                isString()
+                isNotEmpty()
+            }
+        }
+    }
 }
diff --git a/Common-Module/src/main/kotlin/com/asap/common/security/SecurityContextHolder.kt b/Common-Module/src/main/kotlin/com/asap/common/security/SecurityContextHolder.kt
@@ -4,9 +4,7 @@ class SecurityContextHolder {
     companion object {
         private val contextHolder = ThreadLocal<SecurityContext<*, *>>()
 
-        fun getContext(): SecurityContext<*, *> {
-            return contextHolder.get()
-        }
+        fun getContext(): SecurityContext<*, *>? = contextHolder.get()
 
         fun setContext(context: SecurityContext<*, *>) {
             contextHolder.set(context)
@@ -16,4 +14,4 @@ class SecurityContextHolder {
             contextHolder.remove()
         }
     }
-}
+}
diff --git a/Infrastructure-Module/AWS/src/main/kotlin/com/asap/aws/s3/S3ImageManagementAdapter.kt b/Infrastructure-Module/AWS/src/main/kotlin/com/asap/aws/s3/S3ImageManagementAdapter.kt
@@ -13,7 +13,9 @@ class S3ImageManagementAdapter(
     private val s3Template: S3Template,
 ) : ImageManagementPort {
     override fun save(image: ImageMetadata): UploadedImage {
-        val key = "${image.owner}/${UUID.randomUUID()}"
+        val owner = image.owner ?: ANONYMOUS_OWNER_ID
+
+        val key = "$owner/${UUID.randomUUID()}"
 
         val resource =
             s3Template.upload(
@@ -33,5 +35,6 @@ class S3ImageManagementAdapter(
 
     companion object {
         private const val BUCKET_NAME = "lettering-images"
+        private const val ANONYMOUS_OWNER_ID = "anonymous"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,10 @@ interface UploadImageUsecase {`
`9`	`9`
`10`	`10`	`data class Command(`
`11`	`11`	`val image: FileMetaData,`
`12`		`- val userId: String`
	`12`	`+ val userId: String? = null`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`data class Response(`
`16`	`16`	`val imageUrl: String`
`17`	`17`	`)`
`18`		`-}`
	`18`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,7 @@ class SecurityContextHolder {`
`4`	`4`	`companion object {`
`5`	`5`	`private val contextHolder = ThreadLocal<SecurityContext<, >>()`
`6`	`6`
`7`		`- fun getContext(): SecurityContext<, > {`
`8`		`- return contextHolder.get()`
`9`		`- }`
	`7`	`+ fun getContext(): SecurityContext<, >? = contextHolder.get()`
`10`	`8`
`11`	`9`	`fun setContext(context: SecurityContext<, >) {`
`12`	`10`	`contextHolder.set(context)`
`@@ -16,4 +14,4 @@ class SecurityContextHolder {`
`16`	`14`	`contextHolder.remove()`
`17`	`15`	`}`
`18`	`16`	`}`
`19`		`-}`
	`17`	`+}`