Merge pull request #110 from Infomaniak/cursored-response

feat: Add cursor support for ApiResponse
Infomaniak · Mar 7, 2024 · 4433608 · 4433608
2 parents 7647060 + a00f588
commit 4433608
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/Sources/InfomaniakCore/Networking/ApiFetcher.swift b/Sources/InfomaniakCore/Networking/ApiFetcher.swift
@@ -178,7 +178,9 @@ open class ApiFetcher {
                 pages: apiResponse.pages,
                 page: apiResponse.page,
                 itemsPerPage: apiResponse.itemsPerPage,
-                responseAt: apiResponse.responseAt
+                responseAt: apiResponse.responseAt,
+                cursor: nil,
+                hasMore: false
             )
             return ValidServerResponse(
                 statusCode: serverResponse.statusCode,

diff --git a/Sources/InfomaniakCore/Networking/ApiResponse.swift b/Sources/InfomaniakCore/Networking/ApiResponse.swift
@@ -36,6 +36,8 @@ open class ApiResponse<ResponseContent: Decodable>: Decodable {
     public let page: Int?
     public let itemsPerPage: Int?
     public let responseAt: Int?
+    public let cursor: String?
+    public let hasMore: Bool
 
     enum CodingKeys: String, CodingKey {
         case result
@@ -46,6 +48,8 @@ open class ApiResponse<ResponseContent: Decodable>: Decodable {
         case page
         case itemsPerPage = "items_per_page"
         case responseAt = "response_at"
+        case cursor
+        case hasMore = "has_more"
     }
 
     public required init(from decoder: Decoder) throws {
@@ -64,5 +68,7 @@ open class ApiResponse<ResponseContent: Decodable>: Decodable {
         page = try container.decodeIfPresent(Int.self, forKey: .page)
         itemsPerPage = try container.decodeIfPresent(Int.self, forKey: .itemsPerPage)
         responseAt = try container.decodeIfPresent(Int.self, forKey: .responseAt)
+        cursor = try container.decodeIfPresent(String.self, forKey: .cursor)
+        hasMore = try container.decodeIfPresent(Bool.self, forKey: .hasMore) ?? false
     }
 }
diff --git a/Sources/InfomaniakCore/Networking/ValidApiResponse.swift b/Sources/InfomaniakCore/Networking/ValidApiResponse.swift
@@ -32,4 +32,6 @@ public struct ValidApiResponse<ResponseContent> {
     public let page: Int?
     public let itemsPerPage: Int?
     public let responseAt: Int?
+    public let cursor: String?
+    public let hasMore: Bool
 }