Merge pull request #14 from MarketPlace-O2O-Platform/Refactor#12/MyPageView

[Refactor] 마이페이지 네트워크 코드를 추상화 & 쿠폰 Cell UI 수정

Author: blwxnhan

.DS_Store

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1620"
+   LastUpgradeVersion = "1630"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

MarketPlace.xcodeproj/project.pbxproj

@@ -11,7 +11,7 @@ enum MarketEndpoint: Endpoint {
     case fetchMarketsAll(lastPageIndex: Int?, category: String?, pageSize: Int?)
     case fetchMarket(marketId: Int)
     case fetchMarketsWithSearching(lastPageIndex: Int?, pageSize: Int?, content: String)
-    case fetchOwnFavoriteMarkets
+    case fetchOwnFavoriteMarkets(lastModifiedAt: String?, pageSize: Int?)
     case fetchMarketsForMap
     case postFavoriteMarket(marketId: Int)
 
@@ -49,7 +49,6 @@ enum MarketEndpoint: Endpoint {
             items.append(contentsOf: [
                 lastPageIndex.map { URLQueryItem(name: "lastPageIndex", value: String($0)) },
                 (category?.isEmpty == false ? URLQueryItem(name: "category", value: category!) : nil),
-//                category.map { URLQueryItem(name: "category", value: String($0)) },
                 pageSize.map { URLQueryItem(name: "pageSize", value: String($0)) }
             ].compactMap { $0 })
 
@@ -70,6 +69,17 @@ enum MarketEndpoint: Endpoint {
             var items: [URLQueryItem] = []
             items.append(URLQueryItem(name: "marketId", value: String(marketId)))
             return items
+            
+        case .fetchOwnFavoriteMarkets(let lastModifiedAt, let pageSize):
+            var items: [URLQueryItem] = []
+
+            items.append(contentsOf: [
+                lastModifiedAt.map { URLQueryItem(name: "lastModifiedAt", value: String($0)) },
+                pageSize.map { URLQueryItem(name: "pageSize", value: String($0)) }
+            ].compactMap { $0 })
+            
+            return items
+        
         default:
             return nil
         }

MarketPlace.xcodeproj/xcshareddata/xcschemes/MarketPlace.xcscheme

@@ -9,25 +9,52 @@ import Foundation
 
 enum MemberCouponEndpoint: Endpoint {
     case downloadCoupon(couponId: Int)
+    case fetchMemberCoupon(type: String, memberCouponId: Int?, size: Int?)
+    case useMemberCoupon(memberCouponId: Int)
 
     var baseURL: URL { URLManager.shared.baseURL }
 
     var path: String {
         switch self {
         case .downloadCoupon(let couponId): return "api/members/coupons/\(couponId)"
+        case .fetchMemberCoupon: return "api/members/coupons"
+        case .useMemberCoupon: return "api/members/coupons"
         }
     }
 
     var method: HTTPMethod {
         switch self {
-        case .downloadCoupon(_):
-                .post
+        case .downloadCoupon: .post
+        case .fetchMemberCoupon: .get
+        case .useMemberCoupon:.put
         }
     }
 
     var headers: [String : String]? { ["Content-Type": "application/json"] }
 
     var body: Data? { nil }
 
-    var queryItems: [URLQueryItem]? { nil }
+    var queryItems: [URLQueryItem]? {
+        switch self {
+        case .fetchMemberCoupon(let type, let memberCouponId, let size):
+            var items: [URLQueryItem] = []
+            
+            items.append(contentsOf: [
+                URLQueryItem(name: "type", value: type),
+                memberCouponId.map { URLQueryItem(name: "memberCouponId", value: String($0)) },
+                size.map { URLQueryItem(name: "size", value: String($0)) }
+            ].compactMap { $0 })
+            
+            return items
+            
+        case .useMemberCoupon(let memberCouponId):
+            var items: [URLQueryItem] = []
+            
+            items.append(URLQueryItem(name: "memberCouponId", value: String(memberCouponId)))
+            
+            return items
+            
+        default: return nil
+        }
+    }
 }

MarketPlace/API/Endpoint/MarketEndpoint.swift

@@ -10,19 +10,21 @@ import Foundation
 enum MemberEndPoint: Endpoint {
     case fetchMemberInfo
     case signIn
+    case fetchFavoriteMarket(lastPageIndex: Int?, category: String?, count: Int?)
 
     var baseURL: URL { URLManager.shared.baseURL }
 
     var path: String {
         switch self {
         case .fetchMemberInfo: return "api/members"
         case .signIn: return "api/members"
+        case .fetchFavoriteMarket: return "api/tempMarkets"
         }
     }
 
     var method: HTTPMethod {
         switch self {
-        case .fetchMemberInfo:
+        case .fetchMemberInfo, .fetchFavoriteMarket:
                 .get
         case .signIn:
                 .post
@@ -33,5 +35,20 @@ enum MemberEndPoint: Endpoint {
 
     var body: Data? { nil }
 
-    var queryItems: [URLQueryItem]? { nil }
+    var queryItems: [URLQueryItem]? {
+        switch self {
+        case .fetchFavoriteMarket(let lastPageIndex, let category, let count):
+            var items: [URLQueryItem] = []
+            
+            items.append(contentsOf: [
+                lastPageIndex.map { URLQueryItem(name: "lastPageIndex", value: String($0)) },
+                (category?.isEmpty == false ? URLQueryItem(name: "category", value: category!) : nil),
+                count.map { URLQueryItem(name: "count", value: String($0)) }
+            ].compactMap { $0 })
+            
+            return items
+            
+        default: return nil
+        }
+    }
 }

MarketPlace/API/Endpoint/MemberCouponEndpoint.swift

@@ -14,7 +14,8 @@ protocol NetworkServiceProtocol {
 final class NetworkService: NetworkServiceProtocol {
     func request<T: Decodable>(_ endpoint: Endpoint) async -> NetworkResult<T>  {
         var request = endpoint.urlRequest
-
+        print(request.url)
+        
         if let token = KeychainManager.getToken() {
             request.addValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
         } else {

MarketPlace/API/Endpoint/MemberEndPoint.swift

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "myCoupon_canuse.svg",
+      "filename" : "Component 2.png",
       "idiom" : "universal",
       "scale" : "1x"
     },