#9 [Add] 신규 Public API 추가 완료, 매핑 예정

src/main/java/com/mpnp/baechelin/api/controller/PublicApiController.java

@@ -2,15 +2,14 @@
 
 import com.mpnp.baechelin.api.dto.PublicApiRequestDto;
 import com.mpnp.baechelin.api.dto.PublicApiResponseDto;
+import com.mpnp.baechelin.api.model.PublicApiForm;
 import com.mpnp.baechelin.api.service.PublicApiService;
+import com.mpnp.baechelin.api.service.PublicNewApiService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Flux;
 
 import java.io.IOException;
@@ -22,7 +21,7 @@
 @Slf4j
 public class PublicApiController {
     private final PublicApiService publicApiService;
-
+    private final PublicNewApiService publicNewApiService;
     @PostMapping("/api")
     public ResponseEntity<String> findPublicApi(@RequestBody PublicApiRequestDto publicApiRequestDto) throws IOException {
         long start = currentTimeMillis();
@@ -31,4 +30,13 @@ public ResponseEntity<String> findPublicApi(@RequestBody PublicApiRequestDto pub
         log.info("Elapsed Time : {}", currentTimeMillis() - start);
         return ResponseEntity.ok("공공 API 저장 완료");
     }
+    //TODO 정리하기
+    @GetMapping("/new-api")
+    public ResponseEntity<PublicApiForm> findNewPublicApi(@RequestParam String serviceKey,
+                                                          @RequestParam int rslSize,
+                                                          @RequestParam String siDoNm){
+        PublicApiForm publicApiForm = publicNewApiService.processNewApi(serviceKey, rslSize, siDoNm);
+        return ResponseEntity.ok(publicApiForm);
+    }
+
 }

src/main/java/com/mpnp/baechelin/api/model/PublicApiCategoryForm.java

@@ -0,0 +1,27 @@
+package com.mpnp.baechelin.api.model;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
+
+@NoArgsConstructor
+@Getter @Setter
+@XmlRootElement(name = "facInfoList")
+public class PublicApiCategoryForm {
+    private String resultCode;
+    private String resultMessage;
+    private List<ServList> servList;
+
+    @NoArgsConstructor
+    @Getter @Setter
+    @XmlRootElement(name = "servList")
+    public static class ServList{
+        private String evalInfo;
+        private String faclNm;
+        private String wfcltId;
+    }
+}

src/main/java/com/mpnp/baechelin/api/model/PublicApiForm.java

@@ -0,0 +1,49 @@
+package com.mpnp.baechelin.api.model;
+
+import com.mpnp.baechelin.store.domain.Store;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+@NoArgsConstructor
+@Getter @Setter
+@XmlRootElement(name = "facInfoList")
+public class PublicApiForm {
+    private int totalCount;
+    private int resultCode;
+    private String resultMessage;
+    private ServList[] servList;
+    @NoArgsConstructor
+    @Getter @Setter
+    @XmlRootElement(name = "servList")
+    public static class ServList{
+        private String estbDate;
+        private String faclInfId;
+        private String faclLat;
+        private String faclLng;
+        private String faclRprnNm;
+        private String faclTyCd;
+        private String lcMnad;
+        private String salStaDivCd;
+        private String salStaNm;
+        private String wfcltDivCd;
+        private String wfcltId;
+    }
+
+    public List<Store> ApiFormToStore(PublicApiForm publicApiForm){
+        List<Store> mappingResult = new ArrayList<>();
+        for (ServList serv : publicApiForm.getServList()) {
+            mappingResult.add(Store.builder()
+                    .address(serv.getLcMnad())
+                    .latitude(new BigDecimal(serv.faclLat))
+                    .longitude(new BigDecimal(serv.faclLng))
+                    .build());
+        }
+        return mappingResult;
+    }
+}

src/main/java/com/mpnp/baechelin/api/service/PublicNewApiService.java

@@ -0,0 +1,121 @@
+package com.mpnp.baechelin.api.service;
+
+import com.mpnp.baechelin.api.dto.PublicApiRequestDto;
+import com.mpnp.baechelin.api.dto.PublicApiResponseDto;
+import com.mpnp.baechelin.api.model.PublicApiCategoryForm;
+import com.mpnp.baechelin.api.model.PublicApiForm;
+import com.mpnp.baechelin.store.domain.Store;
+import com.mpnp.baechelin.store.service.StoreService;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.*;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import java.net.URI;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@RequiredArgsConstructor
+@Slf4j
+@Service
+public class PublicNewApiService {
+    private final StoreService storeService;
+
+    public PublicApiForm processNewApi(String key, int requestSize, String siDoNm) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_XML);
+        headers.setAccept(List.of(MediaType.APPLICATION_XML));
+        URI uri = UriComponentsBuilder
+                .fromUriString("http://apis.data.go.kr/B554287/DisabledPersonConvenientFacility/getDisConvFaclList")
+                .queryParam("serviceKey", key)
+                .queryParam("numOfRows", requestSize)
+                .queryParam("siDoNm", siDoNm)
+                .queryParam("faclTyCd", "UC0B01")
+                .build()
+                .encode()
+                .toUri();
+
+        RestTemplate restTemplate = new RestTemplate();
+        log.warn(uri.toString());
+        ResponseEntity<PublicApiForm> resultRe = restTemplate.exchange(
+                uri, HttpMethod.GET, new HttpEntity<>(headers), PublicApiForm.class
+        );
+        PublicApiForm result = resultRe.getBody();
+        if (result == null) return null;
+        List<Store> storeList = new ArrayList<>();
+        for (PublicApiForm.ServList servList : result.getServList()) {
+            // servList + Barrier Free Tag 합치기
+            List<String> barrierTagList = processNewApiSecondStage(key, servList.getWfcltId());
+            log.info("barrierlist : {}", barrierTagList.toString());
+//            storeService.addNewPublicApiObj(servList, barrierTagList);
+        }
+        return result;
+    }
+
+    public List<String> processNewApiSecondStage(String key, String sisulNum) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_XML);
+        headers.setAccept(List.of(MediaType.APPLICATION_XML));
+        URI uri = UriComponentsBuilder
+                .fromUriString("http://apis.data.go.kr/B554287/DisabledPersonConvenientFacility/getFacInfoOpenApiJpEvalInfoList")
+                .queryParam("serviceKey", key)
+                .queryParam("wfcltId", sisulNum)
+                .build()
+                .encode()
+                .toUri();
+
+        RestTemplate restTemplate = new RestTemplate();
+        log.warn(uri.toString());
+        ResponseEntity<PublicApiCategoryForm> resultRe = restTemplate.exchange(
+                uri, HttpMethod.GET, new HttpEntity<>(headers), PublicApiCategoryForm.class
+        );
+        PublicApiCategoryForm result = resultRe.getBody();
+        List<String> barrierTagResult = new ArrayList<>(); // 태그 결과들을 담을 리스트
+        if (result == null || result.getServList() == null) {
+            return barrierTagResult;
+        } else {
+            PublicApiCategoryForm.ServList first = result.getServList().stream().findFirst().orElse(null);
+            // Input 한 개당 하나의 배리어 프리 정보가 생성되므로 하나만 찾는다
+            if (first != null && first.getEvalInfo() != null) { // 결과가 존재할 떄
+                String[] splitInput = first.getEvalInfo().split(",");
+                return Arrays.stream(splitInput)
+                        .map(BarrierCode::getColumnFromDesc)
+                        .filter(code -> code != null && !code.equals(""))
+                        .collect(Collectors.toList());
+            }
+        }
+        return barrierTagResult;
+    }
+
+    /*
+     *계단 또는 승강설비,대변기,복도,소변기,일반사항,장애인전용주차구역,주출입구 높이차이 제거,주출입구 접근로,출입구(문),해당시설 층수
+     *  */
+    @Getter
+    protected enum BarrierCode {
+        ELEVATOR("계단 또는 승강설비", "elevator"),
+        TOILET_A("소변기", "toilet"),
+        TOILET_B("대변기", "toilet"),
+        PARKING("장애인전용주차구역", "parking"),
+        HEIGHT_DIFFERENCE("주출입구 높이차이 제거", "height_different"),
+        APPROACH("주출입구 접근로", "approach"),
+        ETC("", null);
+        private final String desc;
+        private final String columnName;
+
+        BarrierCode(String desc, String columnName) {
+            this.desc = desc;
+            this.columnName = columnName;
+        }
+
+        private static String getColumnFromDesc(String desc) {
+            BarrierCode barrierCode = Arrays.stream(BarrierCode.values())
+                    .filter(b -> b.getDesc().equals(desc)).findFirst().orElse(ETC);
+            return barrierCode.getColumnName();
+        }
+
+    }
+
+}