Merge pull request #49 from tink-sdk-build/release-changes-2.1.0-527

BANKX-527: Tink Core 2.1.0 release

Package.swift

@@ -18,7 +18,7 @@ let package = Package(
     targets: [
         .binaryTarget(
             name: "TinkCore",
-            url: "https://github.com/tink-ab/tink-core-ios/releases/download/2.0.0/TinkCore.xcframework.zip", checksum: "b6f61c67ed2dac2fcca3a75253dd642285d002eb88cd5d7986d789f818814be7"
+            url: "https://github.com/tink-ab/tink-core-ios/releases/download/2.1.0/TinkCore.xcframework.zip", checksum: "b44c79ad86466339a11555e565994c0e88b300e50a1c86ad06f92c40980bcf95"
         ),
     ]
 )

Sources/TinkCore/AIS/Models/SelectOption.swift

@@ -14,7 +14,7 @@ public struct SelectOption: Equatable {
         self.value = value
     }
 
-    internal init(restSelectOption: RESTSelectOption) {
+    init(restSelectOption: RESTSelectOption) {
         self.iconURL = restSelectOption.iconUrl
         self.text = restSelectOption.text
         self.value = restSelectOption.value

Sources/TinkCore/PFM/Models/Mapping/RecommendedBudget+REST.swift

@@ -0,0 +1,10 @@
+import Foundation
+
+extension RecommendedBudget {
+    init(restRecommendedBudget: RESTRecommendedBudget) {
+        self.amount = CurrencyDenominatedAmount(restCurrencyDenominatedAmount: restRecommendedBudget.amount)
+        self.filter = Budget.Filter.makeFilters(restFilter: restRecommendedBudget.filter)
+        self.name = restRecommendedBudget.name
+        self.recurringPeriodicity = Budget.RecurringPeriodicity(restRecurringPeriodicity: restRecommendedBudget.recurringPeriodicity)
+    }
+}

Sources/TinkCore/PFM/Models/RecommendedBudget.swift

@@ -0,0 +1,12 @@
+import Foundation
+
+public struct RecommendedBudget {
+    /// The target amount for the budget. The currency will match the user profile currency setting.
+    public let amount: CurrencyDenominatedAmount?
+    /// The filter defines the budget and which transactions that are included in it. The configured fields of the filter are applied as logical and operator (intersection).
+    public let filter: [Budget.Filter]
+    /// The name of the recommended Budget.
+    public let name: String
+    /// Periodicity configuration for the recurring budget.
+    public let recurringPeriodicity: Budget.RecurringPeriodicity?
+}

Sources/TinkCore/PFM/REST/Models/RESTRecommendedBudget.swift

@@ -0,0 +1,12 @@
+import Foundation
+
+struct RESTRecommendedBudget: Decodable {
+    let amount: RESTCurrencyDenominatedAmount
+    let filter: RESTBudget.Filter
+    let name: String
+    let recurringPeriodicity: RESTBudget.RecurringPeriodicity
+}
+
+struct RESTRecommendedBudgetResponse: Decodable {
+    let recommendedBudgets: [RESTRecommendedBudget]
+}

Sources/TinkCore/PFM/REST/Services/RESTBudgetService.swift

@@ -262,4 +262,19 @@ final class RESTBudgetService: BudgetService {
         }
         return client.performRequest(request)
     }
+
+    @discardableResult
+    func recommendedBudgets(
+        completion: @escaping (Result<[RecommendedBudget], Error>) -> Void
+    ) -> Cancellable? {
+        let request = RESTResourceRequest<RESTRecommendedBudgetResponse>(
+            path: "/api/v1/budgets/recommended",
+            method: .get,
+            contentType: .json
+        ) { result in
+            let newResult = result.map { $0.recommendedBudgets.compactMap(RecommendedBudget.init(restRecommendedBudget:)) }
+            completion(newResult)
+        }
+        return client.performRequest(request)
+    }
 }

Sources/TinkCore/PFM/Services/BudgetService.swift

@@ -14,4 +14,6 @@ public protocol BudgetService {
     func budgetDetails(id: Budget.ID, dateInterval: DateInterval, completion: @escaping (Result<BudgetDetails, Error>) -> Void) -> Cancellable?
 
     func archive(id: Budget.ID, completion: @escaping (Result<Budget, Error>) -> Void) -> Cancellable?
+
+    func recommendedBudgets(completion: @escaping (Result<[RecommendedBudget], Error>) -> Void) -> Cancellable?
 }

Sources/TinkCore/Shared/Tink/Tink.swift

@@ -4,7 +4,7 @@ import Foundation
 #endif
 
 /// Current TinkCore version.
-public let version = "2.0.0"
+public let version = "2.1.0"
 
 /// The `Tink` class encapsulates a connection to the Tink API.
 ///

Tests/TinkCoreTests/CurrencyDenominatedAmountTests.swift

@@ -1,5 +1,5 @@
-import XCTest
 @testable import TinkCore
+import XCTest
 
 extension CurrencyDenominatedAmount {
     var doubleValue: Double {

Tests/TinkCoreTests/PFM/Models/CodeTests.swift

@@ -1,5 +1,5 @@
-import XCTest
 @testable import TinkCore
+import XCTest
 
 final class CodeTests: XCTestCase {
     func testInit() {

Tests/TinkCoreTests/PFM/Models/RecommendedBudgetTests.swift

@@ -0,0 +1,21 @@
+@testable import TinkCore
+import XCTest
+
+final class RecommendedBudgetTests: XCTestCase {
+    func testMapping() throws {
+        let sut = try RecommendedBudget(restRecommendedBudget: RESTRecommendedBudget.instanceFromJson())
+
+        XCTAssertTrue(sut.amount == CurrencyDenominatedAmount(10.5, currencyCode: "EUR"))
+        if case Budget.Filter.category(let cat) = sut.filter[0] {
+            XCTAssertTrue(cat == "expenses:food.coffee")
+        } else {
+            XCTFail()
+        }
+        XCTAssertTrue(sut.name == "Coffee budget")
+        XCTAssertTrue(sut.recurringPeriodicity?.periodUnit == Budget.RecurringPeriodicity.PeriodUnit.week)
+    }
+}
+
+extension RecommendedBudget {
+    static func dummyInstance() throws -> Self { try RecommendedBudget(restRecommendedBudget: RESTRecommendedBudget.instanceFromJson()) }
+}

Tests/TinkCoreTests/REST/ActionableInsightsRESTDecodingTests.swift

@@ -1,5 +1,5 @@
-import XCTest
 @testable import TinkCore
+import XCTest
 
 class ActionableInsightsRESTDecodingTests: XCTestCase {
     let decoder = JSONDecoder()

Tests/TinkCoreTests/REST/RESTRecommendedBudgetResponseTests.swift

@@ -0,0 +1,40 @@
+@testable import TinkCore
+import XCTest
+
+final class RESTRecommendedBudgetResponseTests: XCTestCase {
+    func testDecodable() throws {
+        let data = RESTRecommendedBudgetResponse.json.data(using: String.Encoding.utf8)
+        let decoder = JSONDecoder()
+        let sut = try decoder.decode(RESTRecommendedBudgetResponse.self, from: data!)
+
+        XCTAssertTrue(sut.recommendedBudgets.count == 1)
+    }
+}
+
+extension RESTRecommendedBudgetResponse {
+    static let json: String =
+        """
+        {
+          "recommendedBudgets": [
+            {
+              "amount": {
+                "currencyCode": "EUR",
+                "scale": 2,
+                "unscaledValue": 1050
+              },
+              "filter": {
+                "categories": [
+                  {
+                    "code": "expenses:food.coffee"
+                  }
+                ]
+              },
+              "name": "Coffee budget",
+              "recurringPeriodicity": {
+                "periodUnit": "WEEK"
+              }
+            }
+          ]
+        }
+        """
+}

Tests/TinkCoreTests/REST/RESTRecommendedBudgetTests.swift

@@ -0,0 +1,50 @@
+@testable import TinkCore
+import XCTest
+
+final class RESTRecommendedBudgetTests: XCTestCase {
+    func testDecodable() throws {
+        let sut0 = try RESTRecommendedBudget.instanceFromJson()
+
+        XCTAssertEqual(sut0.amount.currencyCode, "EUR")
+        XCTAssertEqual(sut0.amount.scale, 2)
+        XCTAssertEqual(sut0.amount.unscaledValue, 1050)
+
+        XCTAssertNil(sut0.filter.tags)
+        XCTAssertNil(sut0.filter.freeTextQuery)
+        XCTAssertNil(sut0.filter.accounts)
+        XCTAssertEqual(sut0.filter.categories?.count, 1)
+        XCTAssertEqual(sut0.filter.categories?[0].code, "expenses:food.coffee")
+
+        XCTAssertEqual(sut0.name, "Coffee budget")
+
+        XCTAssertEqual(sut0.recurringPeriodicity.periodUnit.rawValue, "WEEK")
+    }
+}
+
+extension RESTRecommendedBudget {
+    static let json: String =
+        """
+        {
+              "amount": {
+                "currencyCode": "EUR",
+                "scale": 2,
+                "unscaledValue": 1050
+              },
+              "filter": {
+                "categories": [
+                  {
+                    "code": "expenses:food.coffee"
+                  }
+                ]
+              },
+              "name": "Coffee budget",
+              "recurringPeriodicity": {
+                "periodUnit": "WEEK"
+              }
+            }
+        """
+
+    static func instanceFromJson() throws -> Self {
+        try JSONDecoder().decode(Self.self, from: json.data(using: String.Encoding.utf8)!)
+    }
+}

Tests/TinkCoreTests/ScopeTests.swift

@@ -1,5 +1,5 @@
-import XCTest
 @testable import TinkCore
+import XCTest
 
 class ScopeTests: XCTestCase {
     func testScopeDescription() {

TinkCore.podspec

@@ -4,7 +4,7 @@ Pod::Spec.new do |spec|
   spec.description  = <<-DESC
                     Core library for Tink SDKs.
                     DESC
-  spec.version      = "2.0.0"
+  spec.version      = "2.1.0"
   spec.license      = { :type => "MIT", :file => "LICENSE" }
   spec.authors      = { "Tink AB" => "mobile@tink.se" }
   spec.homepage     = "https://github.com/tink-ab/tink-core-ios"

TinkCore.xcframework/Info.plist

@@ -6,15 +6,18 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>TinkCore.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
@@ -31,18 +34,15 @@
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>TinkCore.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>