Merge pull request #221 from Runnect/#214-코스그리기및업로드

[Feat] #214 - 코스그리기 및 업로드 팝업 추가

Author: 513sojin

Runnect-iOS/Runnect-iOS/Global/UIComponents/CustomAlertVC.swift

@@ -37,7 +37,7 @@ final class CustomAlertVC: UIViewController {
     }
     private let contentsLabel: UILabel = UILabel().then {
         $0.text = "코스를 만들었어요!\n지정한 코스는 보관함에서 볼 수 있어요."
-        $0.font = .h5
+        $0.font = .b4
         $0.textColor = .g2
         $0.textAlignment = .center
         $0.numberOfLines = 2
@@ -55,7 +55,6 @@ final class CustomAlertVC: UIViewController {
         }
 
     // MARK: - View Life Cycle
-    
     override func viewDidLoad() {
         super.viewDidLoad()
         self.setUI()
@@ -119,6 +118,7 @@ extension CustomAlertVC {
 
     private func setLayout() {
         view.addSubviews(alertView)
+        
         alertView.addSubviews(alertImageView, contentsLabel, buttonStackView)
 
         alertView.snp.makeConstraints { make in
@@ -138,7 +138,6 @@ extension CustomAlertVC {
             make.leading.trailing.equalToSuperview().inset(10)
             make.centerX.equalToSuperview()
         }
-        
         buttonStackView.snp.makeConstraints { make in
             make.top.equalTo(contentsLabel.snp.bottom).offset(26)
             make.leading.trailing.equalToSuperview().inset(14)

Runnect-iOS/Runnect-iOS/Global/UIComponents/RNAlertVC.swift

@@ -10,11 +10,17 @@ import UIKit
 import SnapKit
 import Then
 
+enum AlertType {
+    case defaultType
+    case custom
+}
+
 final class RNAlertVC: UIViewController {
 
     // MARK: - Properties
-    
+    var leftButtonTapAction: (()-> Void)?
     var rightButtonTapAction: (() -> Void)?
+    var alertType: AlertType = .defaultType
 
     // MARK: - UI Components
 
@@ -69,8 +75,10 @@ final class RNAlertVC: UIViewController {
 extension RNAlertVC {
     override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesBegan(touches, with: event)
-        if let touch = touches.first, touch.view == self.view {
-            dismiss(animated: false)
+        if alertType == .defaultType {
+            if let touch = touches.first, touch.view == self.view {
+                dismiss(animated: false)
+            }
         }
     }
 
@@ -91,7 +99,8 @@ extension RNAlertVC {
 
 extension RNAlertVC {
     @objc private func touchUpNoButton() {
-        dismiss(animated: false)
+        alertType == .defaultType
+            ? dismiss(animated: false) : self.leftButtonTapAction? ()
     }
 
     @objc private func touchYesButton() {

Runnect-iOS/Runnect-iOS/Global/Utils/RNUtils/convertLocationObject.swift

@@ -28,7 +28,7 @@ extension NMGLatLng {
     }
 
     func toRNLocationModel() -> RNLocationModel {
-        return RNLocationModel(lat: self.lat, long: self.lng)
+        return RNLocationModel(latitude: self.lat, longitude: self.lng)
     }
 }
 

Runnect-iOS/Runnect-iOS/Network/Dto/CourseDrawingDto/RequestDto/CourseDrawingRequestDto.swift

@@ -11,9 +11,19 @@ import Foundation
 
 struct CourseDrawingRequestDto: Codable {
     let image: Data
-    let data: CourseDrawingRequestData
+    let path: [RNLocationModel]
+    let title: String
+    let distance: Float
+    let departureAddress, departureName: String
 }
 
+//"image" : 이미지 파일,
+//        "path" :  [{lat : 실수(double), long : 실수},{lat : 실수(double), long : 실수},{lat : 실수(double), long : 실수} ],
+//        "title" : "한강 공원 한 바퀴",
+//        "distance" : 4.4,
+//        "departureAddress" : "전북 익산시 삼성동 100",
+//        "departureName" : "보리의 집"
+
 // MARK: - CourseDrawingRequestData
 
 struct CourseDrawingRequestData: Codable {

Runnect-iOS/Runnect-iOS/Network/Dto/CourseDrawingDto/ResponseDto/CourseDrawingResponseData.swift

@@ -10,12 +10,6 @@ import Foundation
 // MARK: - DataClass
 
 struct CourseDrawingResponseData: Codable {
-    let course: CourseDrawingResponse
-}
-
-// MARK: - Course
-
-struct CourseDrawingResponse: Codable {
     let id: Int
     let createdAt: String
 }

Runnect-iOS/Runnect-iOS/Network/Model/CourseDrawingModel/RNLocationModel.swift

@@ -8,6 +8,6 @@
 import Foundation
 
 struct RNLocationModel: Codable {
-    let lat: Double
-    let long: Double
+    let latitude: Double
+    let longitude: Double
 }

Runnect-iOS/Runnect-iOS/Network/Router/CourseRouter.swift

@@ -29,7 +29,7 @@ extension CourseRouter: TargetType {
     var path: String {
         switch self {
         case .uploadCourseDrawing:
-            return "/course"
+            return "/course/v2"
         case .getAllPrivateCourse:
             return "/course/user"
         case .getPrivateCourseNotUploaded:
@@ -66,20 +66,22 @@ extension CourseRouter: TargetType {
             var content = [String: Any]()
 
             var path = [[String: Any]]()
+            var tempPath = String()
 
             do {
-                for location in param.data.path {
+                for location in param.path {
                     let locationData = try location.asParameter()
                     path.append(locationData)
                 }
-
+                
                 content["path"] = path
-                content["distance"] = param.data.distance
-                content["departureAddress"] = param.data.departureAddress
-                content["departureName"] = param.data.departureName
+                content["title"] = param.title
+                content["distance"] = param.distance
+                content["departureAddress"] = param.departureAddress
+                content["departureName"] = param.departureName
 
                 let jsonData = try JSONSerialization.data(withJSONObject: content)
-                let formData = MultipartFormData(provider: .data(jsonData), name: "data", mimeType: "application/json")
+                let formData = MultipartFormData(provider: .data(jsonData), name: "courseCreateRequestDto", mimeType: "application/json")
                 multipartFormData.append(formData)
             } catch {
                 print(error.localizedDescription)

Runnect-iOS/Runnect-iOS/Network/Service/NetworkProvider.swift

@@ -7,19 +7,15 @@
 
 import Moya
 
-enum ResponseResult<T> {
-    case success(T)
-}
-
 class NetworkProvider<Provider : TargetType> : MoyaProvider<Provider> {
-    func request<Model : Codable>(target : Provider, instance : Model.Type , vc: UIViewController, completion : @escaping(ResponseResult<Model>) -> ()){
+    func request<Model : Codable>(target : Provider, instance : Model.Type , vc: UIViewController, completion : @escaping(Model) -> ()){
         self.request(target) { result in
             switch result {
             /// 서버 통신 성공
             case .success(let response):
                 if (200..<300).contains(response.statusCode) {
                     if let decodeData = try? JSONDecoder().decode(instance, from: response.data) {
-                        completion(.success(decodeData))
+                        completion(decodeData)
                     } else{
                         /// decoding error
                         vc.showNetworkFailureToast()

Runnect-iOS/Runnect-iOS/Presentation/CourseDrawing/VC/CourseDrawingVC.swift

@@ -13,11 +13,8 @@ import Moya
 final class CourseDrawingVC: UIViewController {
 
     // MARK: - Properties
-    
-    private let courseProvider = Providers.courseProvider
-    private let departureSearchingProvider = Providers.departureSearchingProvider
-    
-    private let networkProvider = NetworkProvider<DepartureSearchingRouter>(withAuth: false)
+    private let departureSearchingProvider = NetworkProvider<DepartureSearchingRouter>(withAuth: false)
+    private let courseProvider = NetworkProvider<CourseRouter>(withAuth: true)
 
     private var departureLocationModel: DepartureLocationModel?
 
@@ -196,8 +193,8 @@ extension CourseDrawingVC {
 
         mapView.eventSubject.sink { [weak self] arr in
             guard let self = self else { return }
-//            self.searchLocationTmapAddress(latitude: arr[0], longitude: arr[1])
-            self.searchTest(latitude: arr[0], longitude: arr[1])
+            self.searchLocationTmapAddress(latitude: arr[0], longitude: arr[1])
+//            self.searchTest(latitude: arr[0], longitude: arr[1])
         }.store(in: cancelBag)
     }
 
@@ -434,13 +431,14 @@ extension CourseDrawingVC {
         guard let imageData = image.jpegData(compressionQuality: 1.0) else { return nil }
         guard let departureLocationModel = self.departureLocationModel else { return nil }
         let path = mapView.getMarkersLatLng().map { $0.toRNLocationModel() }
-        let courseDrawingRequestData = CourseDrawingRequestData(path: path,
-                                                                //                                                                title : self.courseName,
-                                                                distance: self.distance,
-                                                                departureAddress: departureLocationModel.departureAddress,
-                                                                departureName: departureLocationModel.departureName)
 
-        let courseDrawingRequestDto = CourseDrawingRequestDto(image: imageData, data: courseDrawingRequestData)
+        let courseDrawingRequestDto = CourseDrawingRequestDto(
+            image: imageData,
+            path: path,
+            title: self.courseName,
+            distance: self.distance,
+            departureAddress: departureLocationModel.departureAddress,
+            departureName: departureLocationModel.departureName)
 
         return courseDrawingRequestDto
     }
@@ -449,63 +447,16 @@ extension CourseDrawingVC {
         guard let requestDto = makecourseDrawingRequestDto() else { return }
         LoadingIndicator.showLoading()
 
-        courseProvider.request(.uploadCourseDrawing(param: requestDto)) {[weak self] response in
-            guard let self = self else { return }
+        courseProvider.request(target: .uploadCourseDrawing(param: requestDto), instance: BaseResponse<CourseDrawingResponseData>.self, vc: self) { response in
             LoadingIndicator.hideLoading()
-            switch response {
-            case .success(let result):
-                let status = result.statusCode
-                if 200..<300 ~= status {
-                    do {
-                        let responseDto = try result.map(BaseResponse<CourseDrawingResponseData>.self)
-                        guard let data = responseDto.data else { return }
-                        self.presentAlertVC(courseId: data.course.id)
-                    } catch {
-                        print(error.localizedDescription)
-                    }
-                }
-                if status >= 400 {
-                    print("400 error")
-                    self.showNetworkFailureToast()
-                }
-            case .failure(let error):
-                print(error.localizedDescription)
-                self.showNetworkFailureToast()
-            }
+            guard let data = response.data else { return }
+            self.presentAlertVC(courseId: data.id)
         }
     }
 
     private func searchLocationTmapAddress(latitude: Double, longitude: Double) {
-        departureSearchingProvider
-            .request(.getLocationTmapAddress(latitude: latitude, longitude: longitude)) { [weak self] response in
-                guard let self = self else { return }
-                switch response {
-                case .success(let result):
-                    let status = result.statusCode
-                    if 200..<300 ~= status {
-                        do {
-                            let responseDto = try result.map(TmapAddressSearchingResponseDto.self)
-                            self.updateData(model: responseDto.toDepartureLocationModel(latitude: latitude, longitude: longitude))
-                        } catch {
-                            print(error.localizedDescription)
-                        }
-                    }
-                    if status >= 400 {
-                        print("400 error")
-                    }
-                case .failure(let error):
-                    print(error.localizedDescription)
-                    self.showToast(message: "네트워크 통신 실패")
-                }
-            }
-    }
-    
-    private func searchTest(latitude: Double, longitude: Double) {
-        networkProvider.request(target: .getLocationTmapAddress(latitude: latitude, longitude: longitude), instance: TmapAddressSearchingResponseDto.self, vc: self) { result in
-            switch result {
-            case .success(let data):
+        departureSearchingProvider.request(target: .getLocationTmapAddress(latitude: latitude, longitude: longitude), instance: TmapAddressSearchingResponseDto.self, vc: self) { data in
                 self.updateData(model: data.toDepartureLocationModel(latitude: latitude, longitude: longitude))
-            }
         }
     }
 }