From 86153dfea383341f1c3768687be6ec29f316f607 Mon Sep 17 00:00:00 2001 From: Rahul Kantesaria Date: Wed, 3 Apr 2019 13:18:40 -0400 Subject: [PATCH] fixed constructor implementation for transaction and added newline after enum in BankAcct --- .../SynchronyFinancial/BankAcct.swift | 1 + .../SynchronyFinancial/Transaction.swift | 23 ++++--------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/SynchronyFinancial/SynchronyFinancial/BankAcct.swift b/SynchronyFinancial/SynchronyFinancial/BankAcct.swift index 25d1189..ea16335 100644 --- a/SynchronyFinancial/SynchronyFinancial/BankAcct.swift +++ b/SynchronyFinancial/SynchronyFinancial/BankAcct.swift @@ -12,6 +12,7 @@ public enum AccountType: Int { case checkings = 0 case savings = 1 } + class BankAcct: NSObject { var bankAcctId: String var acctType: AccountType diff --git a/SynchronyFinancial/SynchronyFinancial/Transaction.swift b/SynchronyFinancial/SynchronyFinancial/Transaction.swift index 21dc45d..71c58b0 100644 --- a/SynchronyFinancial/SynchronyFinancial/Transaction.swift +++ b/SynchronyFinancial/SynchronyFinancial/Transaction.swift @@ -22,28 +22,15 @@ class Transaction: NSObject { var isPending: Bool var isModifiable: Bool - //this constructor is for the case if it is a posted transaction - init(type: TransactionType, amount: Double, merchantID: String, date: Date, isPending: Bool) { - self.type = type - self.amount = amount - self.merchantID = merchantID - self.date = date - self.confirmationNum = "" - self.paymentId = 0 - self.isPending = isPending - self.isModifiable = false - } - - //this constructor is for the case if it is a pending transaction init(type: TransactionType, amount: Double, merchantID: String, date: Date, - confirmationNum: String, paymentId: Int, isPending: Bool, isModifiable: Bool) { + confirmationNum: String? = nil, paymentId: Int? = nil, isPending: Bool? = nil, isModifiable: Bool? = nil) { self.type = type self.amount = amount self.merchantID = merchantID self.date = date - self.confirmationNum = confirmationNum - self.paymentId = paymentId - self.isPending = isPending - self.isModifiable = isModifiable + self.confirmationNum = confirmationNum ?? "" + self.paymentId = paymentId ?? 0 + self.isPending = isPending ?? false + self.isModifiable = isModifiable ?? false } }