[Feat]: AI 서버 연동 로직 구현 (#35)

build.gradle.kts

@@ -1,5 +1,4 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import org.springframework.boot.gradle.tasks.bundling.BootJar
 
 plugins {
     kotlin("jvm")

clients/client/src/main/kotlin/org/mediscan/client/AiServiceApi.kt

@@ -0,0 +1,22 @@
+package org.mediscan.client
+
+import org.springframework.cloud.openfeign.FeignClient
+import org.springframework.http.MediaType
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestMethod
+import org.springframework.web.bind.annotation.RequestPart
+import org.springframework.web.multipart.MultipartFile
+
+@FeignClient(name = "ai-service", url = "127.0.0.1:8000")
+internal interface AiServiceApi {
+    @RequestMapping(
+        method = [RequestMethod.POST],
+        value = ["/predict"],
+        consumes = [MediaType.MULTIPART_FORM_DATA_VALUE],
+    )
+    fun predictPill(
+        @RequestPart frontImage: MultipartFile,
+        @RequestPart backImage: MultipartFile,
+        @RequestPart pillCsv: MultipartFile,
+    ): AiServiceResponseDto
+}

clients/client/src/main/kotlin/org/mediscan/client/AiServiceClient.kt

@@ -0,0 +1,18 @@
+package org.mediscan.client
+
+import org.mediscan.client.model.AiServiceClientResult
+import org.springframework.stereotype.Component
+import org.springframework.web.multipart.MultipartFile
+
+@Component
+class AiServiceClient internal constructor(
+    private val aiServiceApi: AiServiceApi,
+) {
+    fun predict(
+        pillCsv: MultipartFile,
+        frontImage: MultipartFile,
+        backImage: MultipartFile,
+    ): List<AiServiceClientResult> {
+        return aiServiceApi.predictPill(frontImage, backImage, pillCsv).result
+    }
+}

clients/client/src/main/kotlin/org/mediscan/client/AiServiceRequestDto.kt

@@ -0,0 +1,9 @@
+package org.mediscan.client
+
+import org.springframework.web.multipart.MultipartFile
+
+internal data class AiServiceRequestDto(
+    val frontImage: MultipartFile,
+    val backImage: MultipartFile,
+    val pillCsv: MultipartFile,
+)

clients/client/src/main/kotlin/org/mediscan/client/AiServiceResponseDto.kt

@@ -0,0 +1,7 @@
+package org.mediscan.client
+
+import org.mediscan.client.model.AiServiceClientResult
+
+internal data class AiServiceResponseDto(
+    val result: List<AiServiceClientResult>,
+)

clients/client-example/src/main/kotlin/org/mediscan/client/example/ExampleConfig.kt → clients/client/src/main/kotlin/org/mediscan/client/FeignConfig.kt

@@ -1,8 +1,8 @@
-package org.mediscan.client.example
+package org.mediscan.client
 
 import org.springframework.cloud.openfeign.EnableFeignClients
 import org.springframework.context.annotation.Configuration
 
 @EnableFeignClients
 @Configuration
-internal class ExampleConfig
+internal class FeignConfig

clients/client/src/main/kotlin/org/mediscan/client/model/AiServiceClientResult.kt

@@ -0,0 +1,7 @@
+package org.mediscan.client.model
+
+data class AiServiceClientResult(
+    val rank: Long,
+    val code: String,
+    val accuracy: Double,
+)

core/core-api/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
     implementation(project(":support:monitoring"))
     implementation(project(":support:logging"))
     implementation(project(":storage:db-core"))
-    implementation(project(":clients:client-example"))
+    implementation(project(":clients:client"))
 
     testImplementation(project(":tests:api-docs"))
 

core/core-api/src/main/kotlin/org/mediscan/core/api/controller/v1/response/PillIdentificationResponseDto.kt

@@ -2,6 +2,7 @@ package org.mediscan.core.api.controller.v1.response
 
 data class PillIdentificationResponseDto(
     val pillId: String,
+    val rank: Long,
     val pillName: String?,
     val itemImage: String?,
     val className: String?,

core/core-api/src/main/kotlin/org/mediscan/core/api/domain/PillManager.kt

@@ -2,27 +2,29 @@ package org.mediscan.core.api.domain
 
 import org.apache.commons.csv.CSVFormat
 import org.apache.commons.csv.CSVPrinter
-import org.apache.commons.io.output.ByteArrayOutputStream
 import org.springframework.stereotype.Component
-import java.io.OutputStreamWriter
+import java.io.File
+import java.io.FileWriter
 
 @Component
 class PillManager {
-    fun createCsvInMemory(pillShape: String, pillFrontMarking: String?, pillBackMarking: String?): ByteArray {
-        val outputStream = ByteArrayOutputStream()
-        val writer = OutputStreamWriter(outputStream)
+    fun createCsvFile(pillShape: String, pillFrontMarking: String?, pillBackMarking: String?, filePath: String) {
+        val file = File(filePath)
+        val parentDir = file.parentFile
+        if (!parentDir.exists()) {
+            parentDir.mkdirs()
+        }
+        val writer = FileWriter(file)
         val csvPrinter =
-            CSVPrinter(writer, CSVFormat.DEFAULT.builder().setHeader("shape", "f_text", "b_text", "drug_code").build())
+            CSVPrinter(writer, CSVFormat.DEFAULT.builder().setHeader("shape", "f_text", "b_text", "drug_code").setDelimiter('\t').build())
 
         csvPrinter.printRecord(
             pillShape,
-            pillFrontMarking.let { it ?: "none" },
-            pillBackMarking.let { it ?: "none" },
+            pillFrontMarking ?: "none",
+            pillBackMarking ?: "none",
             "none",
         )
         csvPrinter.flush()
         csvPrinter.close()
-
-        return outputStream.toByteArray()
     }
 }

core/core-api/src/main/kotlin/org/mediscan/core/api/domain/PillService.kt

@@ -1,38 +1,55 @@
 package org.mediscan.core.api.domain
 
+import org.mediscan.client.AiServiceClient
 import org.mediscan.core.api.controller.v1.response.PillDetailResponseDto
 import org.mediscan.core.api.controller.v1.response.PillIdentificationResponseDto
 import org.mediscan.core.api.controller.v1.response.PillSearchResponseDto
+import org.mediscan.core.api.support.utils.FileMultipartFile
 import org.mediscan.core.enums.Color
 import org.springframework.stereotype.Service
+import java.io.File
 
 @Service
 class PillService(
     private val pillManager: PillManager,
     private val pillReader: PillReader,
+    private val aiServiceClient: AiServiceClient,
 ) {
     fun identifyPill(
         pillIdentificationData: PillIdentificationData,
     ): List<PillIdentificationResponseDto> {
-        val createCsvInMemory = pillManager.createCsvInMemory(
+        val csvFileName = "./data/pill.csv"
+
+        pillManager.createCsvFile(
             pillIdentificationData.pillShape,
             pillIdentificationData.frontMarking,
             pillIdentificationData.backMarking,
+            csvFileName,
         )
-        var result: MutableList<PillIdentificationResponseDto> = mutableListOf()
-
-        val rank1: Pill = pillReader.readPill("198600161")
-        val rank2: Pill = pillReader.readPill("199301111")
-        val rank3: Pill = pillReader.readPill("199302061")
-        val rank4: Pill = pillReader.readPill("199501735")
-        val rank5: Pill = pillReader.readPill("199302671")
+        try {
+            val aiServiceClientResult = aiServiceClient.predict(
+                FileMultipartFile(File(csvFileName), "text/csv"),
+                pillIdentificationData.frontImage,
+                pillIdentificationData.backImage,
+            )
+            val responseDtoList = mutableListOf<PillIdentificationResponseDto>()
+            for (result in aiServiceClientResult) {
+                val pill = pillReader.readPill(result.code)
+                val responseDto = PillIdentificationResponseDto(
+                    pill.itemSeq,
+                    result.rank,
+                    pill.itemName,
+                    pill.itemImage,
+                    pill.className,
+                    (result.accuracy * 100).toLong(),
+                )
+                responseDtoList.add(responseDto)
+            }
 
-        result.add(PillIdentificationResponseDto(rank1.itemSeq, rank1.itemName, rank1.itemImage, rank1.className, 60))
-        result.add(PillIdentificationResponseDto(rank2.itemSeq, rank2.itemName, rank2.itemImage, rank2.className, 56))
-        result.add(PillIdentificationResponseDto(rank3.itemSeq, rank3.itemName, rank3.itemImage, rank3.className, 55))
-        result.add(PillIdentificationResponseDto(rank4.itemSeq, rank4.itemName, rank4.itemImage, rank4.className, 47))
-        result.add(PillIdentificationResponseDto(rank5.itemSeq, rank5.itemName, rank5.itemImage, rank5.className, 47))
-        return result
+            return responseDtoList
+        } finally {
+            File(csvFileName).delete()
+        }
     }
 
     fun searchPill(