[#73] 끌어올리기 구현중

spon-us · Feb 18, 2024 · c7b1756 · c7b1756
1 parent e5348e7
commit c7b1756
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 259 deletions.
diff --git a/Spon-us/Helper/AsyncImageView.swift b/Spon-us/Helper/AsyncImageView.swift
@@ -34,7 +34,6 @@ struct AsyncImageView: View {
             if let image = loader.image {
                 Image(uiImage: image)
                     .resizable()
-                    .scaledToFit()
             } else {
                 ProgressView()
             }

diff --git a/Spon-us/Helper/Extension.swift b/Spon-us/Helper/Extension.swift
@@ -130,7 +130,8 @@ func changeToKorean(category: String? = nil, type: String? = nil) -> String? {
 }
 
 final class AuthInterceptor: RequestInterceptor {
-
+    static var currentRetryCount = 0
+    static var maximumRetryCount = 1
     static let shared = AuthInterceptor()
     let provider = MoyaProvider<SponusAPI>(plugins: [NetworkLoggerPlugin()])
     private init() {}
@@ -159,7 +160,11 @@ final class AuthInterceptor: RequestInterceptor {
             completion(.doNotRetryWithError(error))
             return
         }
-        print("a")
+        guard AuthInterceptor.currentRetryCount < AuthInterceptor.maximumRetryCount else {
+            AuthInterceptor.currentRetryCount = 0
+            completion(.doNotRetry)
+            return
+        }
         provider.request(.getRenewToken) { result in
             switch result {
             case let .success(response):
@@ -178,6 +183,7 @@ final class AuthInterceptor: RequestInterceptor {
                     print("token renew error")
                     print(response.statusCode)
                     print(response.data)
+                    completion(.doNotRetry)
                 }
             case let .failure(response):
                 print("failure")

diff --git a/Spon-us/Model/Portfolio/MyAnnouncementsViewModel.swift b/Spon-us/Model/Portfolio/MyAnnouncementsViewModel.swift
@@ -93,4 +93,20 @@ class MyAnnouncementsViewModel: ObservableObject {
         }
     }
 
+    func pullUp(announcementID: Int, completion: @escaping (Bool) -> Void) {
+        provider.request(.patchPullUp(announcementID: announcementID)) { result in
+            switch result {
+            case .success(let response):
+                do {
+                    let responseBody = try response.map(LogoutModel400.self)
+                    print("pullup responseBody : \(responseBody)")
+                } catch {
+                    print("pullup json parsing error")
+                }
+            case .failure(let error):
+                print("pullup failure error")
+            }
+        }
+    }
+
 }
diff --git a/Spon-us/Model/Portfolio/PortfolioOfferViewModel.swift b/Spon-us/Model/Portfolio/PortfolioOfferViewModel.swift
@@ -52,8 +52,8 @@ class PortfolioOfferViewModel: ObservableObject {
     }
 
     func getOffers(completion: @escaping (Bool) -> Void) {
-        for aID in announcementIDs {
-            provider.request(.getReceived(announcementId: aID)) { result in
+
+            provider.request(.getMyOffer) { result in
                 switch result {
                 case let .success(response):
                     do {
@@ -71,7 +71,7 @@ class PortfolioOfferViewModel: ObservableObject {
                     completion(false)
                 }
             }
-        }
+
     }
     func getProposes() {
         for elem in offerContents {
@@ -80,8 +80,13 @@ class PortfolioOfferViewModel: ObservableObject {
                 myProposes.append(prop)
             }
         }
-        myProposes = Array(Set(myProposes))
-        myProposes.sort { $0.createdDate > $1.createdDate }
+//        myProposes = Array(Set(myProposes))
+//        myProposes.sort { $0.createdDate > $1.createdDate }
+//        for content in myProposes {
+//            if content.status == "SUSPENDED" || content.status == "COMPLETED" {
+//                
+//            }
+//        }
         self.isLoading = false
     }
 

diff --git a/Spon-us/SponusAPI.swift b/Spon-us/SponusAPI.swift
@@ -33,6 +33,8 @@ enum SponusAPI {
     //MARK: 검색
     case searchOrganization(keyword: String)
     case searchAnnouncement(keyword: String)
+    case getMyOffer
+    case patchPullUp(announcementID: Int)
 }
 
 extension SponusAPI: TargetType {
@@ -85,6 +87,10 @@ extension SponusAPI: TargetType {
             return "/api/v1/organizations"
         case .searchAnnouncement(keyword: let keyword):
             return "/api/v1/announcements"
+        case .getMyOffer:
+            return "/api/v1/proposes/received"
+        case .patchPullUp(let announcementID):
+            return "/api/v1/announcements/\(announcementID)/pullUp"
         }
     }
 
@@ -133,6 +139,10 @@ extension SponusAPI: TargetType {
             return .get
         case .searchAnnouncement(keyword: let keyword):
             return .get
+        case .getMyOffer:
+            return .get
+        case .patchPullUp:
+            return .patch
         }
     }
 
@@ -211,6 +221,10 @@ extension SponusAPI: TargetType {
             return Data()
         case .searchAnnouncement(keyword: let keyword):
             return Data()
+        case .getMyOffer:
+            return Data()
+        case .patchPullUp:
+            return Data()
         }
     }
 
@@ -328,6 +342,10 @@ extension SponusAPI: TargetType {
             return .requestParameters(parameters: ["search": keyword], encoding: URLEncoding.queryString)
         case .searchAnnouncement(keyword: let keyword):
             return .requestParameters(parameters: ["search": keyword], encoding: URLEncoding.queryString)
+        case .getMyOffer:
+            return .requestPlain
+        case .patchPullUp:
+            return .requestPlain
         }
     }
 
@@ -380,6 +398,10 @@ extension SponusAPI: TargetType {
             return ["Authorization": "Bearer \(loadAccessToken(userID: UserDefaults.standard.string(forKey: "loginAccount") ?? "loadAccessToken Error"))"]
         case .searchAnnouncement(keyword: let keyword):
             return ["Authorization": "Bearer \(loadAccessToken(userID: UserDefaults.standard.string(forKey: "loginAccount") ?? "loadAccessToken Error"))"]
+        case .getMyOffer:
+            return ["Authorization": "Bearer \(loadAccessToken(userID: UserDefaults.standard.string(forKey: "loginAccount") ?? "loadAccessToken Error"))"]
+        case .patchPullUp:
+            return ["Authorization": "Bearer \(loadAccessToken(userID: UserDefaults.standard.string(forKey: "loginAccount") ?? "loadAccessToken Error"))"]
         }
     }
 }