Merge pull request #64 from gdsc-konkuk/develop

[Fix] Local Image Store (#63)

src/main/kotlin/gdsc/plantory/common/config/WebMvcConfiguration.kt

@@ -1,16 +1,26 @@
 package gdsc.plantory.common.config
 
 import gdsc.plantory.common.support.DeviceUserResolver
+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.CorsRegistry
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
 
 @Configuration
 class WebMvcConfiguration(
+    @Value("\${local.image.root}")
+    val imageRoot: String,
+
     val deviceUserResolver: DeviceUserResolver,
 ) : WebMvcConfigurer {
 
+    override fun addResourceHandlers(registry: ResourceHandlerRegistry) {
+        registry.addResourceHandler("/**")
+            .addResourceLocations("file:${imageRoot}/")
+    }
+
     override fun addArgumentResolvers(resolvers: MutableList<HandlerMethodArgumentResolver>) {
         resolvers.add(deviceUserResolver)
     }

src/main/kotlin/gdsc/plantory/common/support/photo/PhotoLocalManager.kt

@@ -10,6 +10,8 @@ private const val SLASH = "/"
 
 @Component
 class PhotoLocalManager(
+    @Value("\${local.url}")
+    private val serverURL: String,
     @Value("\${local.image.root}")
     private val localPath: String,
     @Value("\${companionPlant.image.directory}")
@@ -30,6 +32,7 @@ class PhotoLocalManager(
             uploadFileInLocal(multipartFile, uploadPath)
 
             StringBuilder()
+                .append(serverURL)
                 .append(SLASH)
                 .append(workingDirectory)
                 .append(SLASH)

src/main/kotlin/gdsc/plantory/plant/presentation/dto/CompanionPlantCreateRequest.kt

@@ -18,10 +18,8 @@ data class CompanionPlantCreateRequest(
     @DateTimeFormat(pattern = "yyyy-MM-dd") val lastWaterDate: LocalDate,
 ) {
     fun toEntity(imagePath: String, memberId: Long, waterCycle: Int, plantInformationId: Long): CompanionPlant {
-        // TODO : Cloud 환경으로 이전 후 제거, 로컬 사진 저장 테스트 용도
-        val baseUrl = "https://nongsaro.go.kr/"
         return CompanionPlant(
-            _imageUrl = baseUrl + imagePath,
+            _imageUrl = imagePath,
             _shortDescription = this.shortDescription,
             _nickname = this.nickname,
             nextWaterDate = this.lastWaterDate.plusDays(waterCycle.toLong()),

src/main/kotlin/gdsc/plantory/plant/service/PlantService.kt

@@ -90,9 +90,7 @@ class PlantService(
             companionPlantRepository.findByIdAndMemberIdOrThrow(companionPlantId, findMember.getId)
         val imagePath: String = saveImageAndGetPath(image, findCompanionPlant.getImageUrl)
 
-        // TODO : Cloud 환경으로 이전 후 제거, 로컬 사진 저장 테스트 용도
-        val baseUrl = "https://nongsaro.go.kr/"
-        findCompanionPlant.saveRecord(request.comment, baseUrl + imagePath)
+        findCompanionPlant.saveRecord(request.comment, imagePath)
     }
 
     @Transactional(readOnly = true)

src/main/resources/application.yml

@@ -27,6 +27,7 @@ spring:
       max-request-size: 25MB
 
 local:
+  url: ${SERVER_URL}
   image:
     root: resources
 

src/test/resources/application.yml

@@ -20,6 +20,7 @@ spring:
       max-request-size: 25MB
 
 local:
+  url: http://127.0.0.1:8080
   image:
     root: src/test/resources