wbrawner/twigs-swift-sdk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Idk, updated something

Browse source
This commit is contained in:
William Brawner 2023-12-08 23:01:07 -07:00
parent 3c40566094
commit 4b65d7417f
Signed by: wbrawner
GPG key ID: 8FF12381C6C90D35
2 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Sources/TwigsCore/Budget.swift
View file

@ -17,26 +17,31 @@ public struct Budget: Identifiable, Hashable, Codable {
public struct BudgetOverview: Equatable { public struct BudgetOverview: Equatable {
public let budget: Budget public let budget: Budget
public let balance: Int public let balance: Int
public var maxValue: Float { public let transactionCount: Int
get { public let categories: [Category]
return Float(max( public var expectedIncome: Float
max(expectedIncome, actualIncome), public var actualIncome: Float
max(expectedExpenses, actualExpenses) public var expectedExpenses: Float
)) public var actualExpenses: Float
}
}
public var expectedIncome: Int
public var actualIncome: Int
public var expectedExpenses: Int
public var actualExpenses: Int
public init(budget: Budget, balance: Int, expectedIncome: Int = 0, actualIncome: Int = 0, expectedExpenses: Int = 0, actualExpenses: Int = 0) { public init(
budget: Budget,
balance: Int,
categories: [Category],
transactionCount: Int,
expectedIncome: Int = 0,
actualIncome: Int = 0,
expectedExpenses: Int = 0,
actualExpenses: Int = 0
) {
self.budget = budget self.budget = budget
self.balance = balance self.balance = balance
self.expectedIncome = expectedIncome self.categories = categories
self.actualIncome = actualIncome self.transactionCount = transactionCount
self.expectedExpenses = expectedExpenses self.expectedIncome = Float(expectedIncome) / 100.0
self.actualExpenses = actualExpenses self.actualIncome = Float(actualIncome) / 100.0
self.expectedExpenses = Float(expectedExpenses) / 100.0
self.actualExpenses = Float(actualExpenses) / 100.0
} }
} }

7
Sources/TwigsCore/TwigsApiService.swift
View file

@ -272,7 +272,7 @@ public class RequestHelper {
var combinedEndPoint = endPoint var combinedEndPoint = endPoint
if (queries != nil) { if (queries != nil) {
for (key, values) in queries! { for (key, values) in queries! {
for value in values { for value in values {
let separator = combinedEndPoint.contains("?") ? "&" : "?" let separator = combinedEndPoint.contains("?") ? "&" : "?"
combinedEndPoint += separator + key + "=" + value combinedEndPoint += separator + key + "=" + value
} }
@ -392,6 +392,9 @@ public class RequestHelper {
return try self.decoder.decode(ResultType.self, from: data) return try self.decoder.decode(ResultType.self, from: data)
} catch { } catch {
print("error decoding json: \(error)") print("error decoding json: \(error)")
if let data = data {
print(String(decoding: data, as: UTF8.self))
}
throw NetworkError.jsonParsingFailed(error) throw NetworkError.jsonParsingFailed(error)
} }
} }
@ -468,7 +471,7 @@ extension Date {
dateFormatter.timeZone = TimeZone(identifier: "UTC") dateFormatter.timeZone = TimeZone(identifier: "UTC")
return dateFormatter return dateFormatter
}() }()
func toISO8601String() -> String { func toISO8601String() -> String {
return Date.iso8601DateFormatter.string(from: self) return Date.iso8601DateFormatter.string(from: self)
} }