diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/FetchData.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/FetchData.swift index e531c63..5426ea7 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/FetchData.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/FetchData.swift @@ -43,9 +43,6 @@ class FetchData { guard dict["status"]?.dictionaryValue["response_code"]?.string == "0" else { return } //print(json) - let formatter = DateFormatter() - formatter.locale = Locale.current - formatter.dateFormat = "yyyyMMdd" if let accounts = dict["account_number_list"]?.arrayValue { accounts.forEach { if let accountAlias = $0.dictionaryValue["account_alias"]?.string, @@ -53,7 +50,7 @@ class FetchData { let creditLimitString = $0.dictionaryValue["credit_limit"]?.string, let creditLimit = Double(creditLimitString), let payDueDateString = $0.dictionaryValue["next_payment_due_date"]?.string, - let paymentDueDate = formatter.date(from: payDueDateString), + let paymentDueDate = Defaults.careCreditDateFormatter.date(from: payDueDateString), let curBalString = $0.dictionaryValue["current_balance"]?.string, let currentBalance = Double(curBalString), let availCreditString = $0.dictionaryValue["available_credit"]?.string, @@ -81,9 +78,6 @@ class FetchData { var header = Defaults.headerForTransaction header["account_alias"] = accountAlias var transactions: [Transaction] = [] - let formatter = DateFormatter() - formatter.locale = Locale.current - formatter.dateFormat = "yyyyMMdd" Alamofire.request(Defaults.TRANS_HISTORY_URL, method: .post, parameters: header, encoding: JSONEncoding.default, headers: Defaults.authHeader).responseJSON { payload in switch payload.result { @@ -94,7 +88,7 @@ class FetchData { //let's first parse the pending transactions dict["pending_transaction_list"]?.arrayValue.forEach { if let desc = $0["description"].string, - let date = formatter.date(from: $0["transaction_date"].stringValue), + let date = Defaults.careCreditDateFormatter.date(from: $0["transaction_date"].stringValue), let amountString = $0["transaction_amount"].string, let amount = Double(amountString), let confirmationNum = $0["payment_confirmation_number"].string, @@ -111,7 +105,7 @@ class FetchData { // let's parse just processed transactions now dict["processed_transaction_list"]?.arrayValue.forEach { if let desc = $0["description"].string, - let date = formatter.date(from: $0["transaction_date"].stringValue), + let date = Defaults.careCreditDateFormatter.date(from: $0["transaction_date"].stringValue), let amountString = $0["transaction_amount"].string, let amount = Double(amountString) { let type: TransactionType = $0["payment_amount_type"].stringValue == "" ? .purchase : .reimbursement diff --git a/SynchronyFinancial/SynchronyFinancial/Defaults.swift b/SynchronyFinancial/SynchronyFinancial/Defaults.swift index 6da079f..55958a8 100644 --- a/SynchronyFinancial/SynchronyFinancial/Defaults.swift +++ b/SynchronyFinancial/SynchronyFinancial/Defaults.swift @@ -54,13 +54,9 @@ final class Defaults { var account_alias = "" // Dates - let formatter = DateFormatter() - formatter.locale = Locale.current - formatter.dateFormat = "yyyyMMdd" - // for now lets get transactions from the past 2 weeks - let start_date = formatter.string(from: Calendar.current.date(byAdding: .day, value: -14, to: Date()) ?? Date()) - let end_date = formatter.string(from: Date()) + let start_date = careCreditDateFormatter.string(from: Calendar.current.date(byAdding: .day, value: -14, to: Date()) ?? Date()) + let end_date = careCreditDateFormatter.string(from: Date()) return ["account_alias": account_alias, "begin_sequence": "1",