✨ 검색 파라미터 검증 추가

herbaccara · Mar 30, 2023 · 77e72de · 77e72de
1 parent df6e88e
commit 77e72de
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 31 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ plugins {
 }
 
 group = 'herbaccara'
-version = '0.0.6'
+version = '0.0.7'
 sourceCompatibility = '1.8'
 
 publishing {

diff --git a/src/main/kotlin/herbaccara/jusokr/JusoKrService.kt b/src/main/kotlin/herbaccara/jusokr/JusoKrService.kt
@@ -77,17 +77,17 @@ class JusoKrService(
         admCd: String,
         rnMgtSn: String,
         udrtYn: String,
-        buldMnnm: String,
-        buldSlno: String
+        buldMnnm: Int,
+        buldSlno: Int
     ): AddrCoordApiResult {
         val url = "/addrlink/addrCoordApi.do"
 
         val endpoint = UriComponentsBuilder
             .fromHttpUrl("${properties.rootUri}$url")
             .queryParam("confmKey", properties.coordConfmKey)
-            .queryParam("admCd", admCd)
-            .queryParam("rnMgtSn", rnMgtSn)
-            .queryParam("udrtYn", udrtYn)
+            .queryParam("admCd", admCd.filter { it.isDigit() })
+            .queryParam("rnMgtSn", rnMgtSn.filter { it.isDigit() })
+            .queryParam("udrtYn", udrtYn.filter { it.isDigit() })
             .queryParam("buldMnnm", buldMnnm)
             .queryParam("buldSlno", buldSlno)
             .queryParam("resultType", "json")
@@ -105,8 +105,8 @@ class JusoKrService(
         admCd: String,
         rnMgtSn: String,
         udrtYn: String,
-        buldMnnm: String,
-        buldSlno: String,
+        buldMnnm: Int,
+        buldSlno: Int,
         searchType: SearchType? = null,
         dongNm: String? = null
     ): AddrDetailApiResult {
@@ -115,9 +115,9 @@ class JusoKrService(
         val endpoint = UriComponentsBuilder
             .fromHttpUrl("${properties.rootUri}$url")
             .queryParam("confmKey", properties.detailConfmKey)
-            .queryParam("admCd", admCd)
-            .queryParam("rnMgtSn", rnMgtSn)
-            .queryParam("udrtYn", udrtYn)
+            .queryParam("admCd", admCd.filter { it.isDigit() })
+            .queryParam("rnMgtSn", rnMgtSn.filter { it.isDigit() })
+            .queryParam("udrtYn", udrtYn.filter { it.isDigit() })
             .queryParam("buldMnnm", buldMnnm)
             .queryParam("buldSlno", buldSlno)
             .apply {

diff --git a/src/main/kotlin/herbaccara/jusokr/model/AddrCoordApiResult.kt b/src/main/kotlin/herbaccara/jusokr/model/AddrCoordApiResult.kt
@@ -12,8 +12,8 @@ data class AddrCoordApiResult(
         val rnMgtSn: String,
         val bdMgtSn: String,
         val udrtYn: String,
-        val buldMnnm: String,
-        val buldSlno: String,
+        val buldMnnm: Int,
+        val buldSlno: Int,
         val entX: String,
         val entY: String,
         val bdNm: String

diff --git a/src/main/kotlin/herbaccara/jusokr/model/AddrDetailApiResult.kt b/src/main/kotlin/herbaccara/jusokr/model/AddrDetailApiResult.kt
@@ -8,11 +8,13 @@ data class AddrDetailApiResult(
 ) : ApiResult<Juso> {
 
     data class Juso(
-        val buldMnnm: String,
-        val rnMgtSn: String,
-        val dongNm: String,
         val admCd: String,
-        val buldSlno: String,
-        val udrtYn: String
+        val rnMgtSn: String,
+        val udrtYn: String,
+        val buldMnnm: Int,
+        val buldSlno: Int,
+        val dongNm: String?,
+        val floorNm: String?,
+        val hoNm: String?
     )
 }
diff --git a/src/main/kotlin/herbaccara/jusokr/model/AddrEngApiResult.kt b/src/main/kotlin/herbaccara/jusokr/model/AddrEngApiResult.kt
@@ -8,23 +8,23 @@ data class AddrEngApiResult(
 ) : ApiResult<Juso> {
 
     data class Juso(
-        val zipNo: String,
-        val emdNm: String,
-        val rn: String,
+        val roadAddr: String,
         val jibunAddr: String,
-        val siNm: String,
-        val sggNm: String,
+        val zipNo: String,
         val admCd: String,
-        val udrtYn: String,
-        val lnbrMnnm: String,
-        val roadAddr: String,
-        val korAddr: String,
-        val lnbrSlno: String,
-        val buldMnnm: String,
-        val bdKdcd: String,
         val rnMgtSn: String,
+        val bdKdcd: String,
+        val siNm: String,
+        val sggNm: String,
+        val emdNm: String,
         val liNm: String,
+        val rn: String,
+        val udrtYn: String,
+        val buldMnnm: Int,
+        val buldSlno: Int,
         val mtYn: String,
-        val buldSlno: String
+        val lnbrMnnm: Int,
+        val lnbrSlno: Int,
+        val korAddr: String
     )
 }