Skip to content

Commit

Permalink
Refactor indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
cp-amisha-i committed Nov 28, 2024
1 parent c1e4f03 commit f25dfaf
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 33 deletions.
8 changes: 5 additions & 3 deletions Data/Data/Repository/ExpenseRepository.swift
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,11 @@ public class ExpenseRepository: ObservableObject {

private func hasExpenseChanged(_ expense: Expense, oldExpense: Expense) -> Bool {
return oldExpense.name != expense.name || oldExpense.amount != expense.amount ||
oldExpense.date.dateValue() != expense.date.dateValue() || oldExpense.updatedAt.dateValue() != expense.updatedAt.dateValue() ||
oldExpense.paidBy != expense.paidBy || oldExpense.updatedBy != expense.updatedBy || oldExpense.note != expense.note ||
oldExpense.imageUrl != expense.imageUrl || oldExpense.splitTo != expense.splitTo || oldExpense.splitType != expense.splitType ||
oldExpense.date.dateValue() != expense.date.dateValue() ||
oldExpense.updatedAt.dateValue() != expense.updatedAt.dateValue() ||
oldExpense.paidBy != expense.paidBy || oldExpense.updatedBy != expense.updatedBy ||
oldExpense.note != expense.note || oldExpense.imageUrl != expense.imageUrl ||
oldExpense.splitTo != expense.splitTo || oldExpense.splitType != expense.splitType ||
oldExpense.splitData != expense.splitData || oldExpense.isActive != expense.isActive
}

Expand Down
10 changes: 6 additions & 4 deletions Data/Data/Repository/GroupRepository.swift
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ public class GroupRepository: ObservableObject {
}
}

public func updateGroupWithImage(imageData: Data?, newImageUrl: String?, group: Groups, oldGroupName: String) async throws -> Groups {
public func updateGroupWithImage(imageData: Data?, newImageUrl: String?,
group: Groups, oldGroupName: String) async throws -> Groups {
var updatedGroup = group
olderGroupName = oldGroupName

Expand Down Expand Up @@ -165,9 +166,10 @@ public class GroupRepository: ObservableObject {

let actionUserName = memberId == currentUser.id ? "You" : currentUser.nameWithLastInitial

return ActivityLog(type: context.type, groupId: groupId, activityId: groupId, groupName: context.group?.name ?? "",
actionUserName: actionUserName, recordedOn: Timestamp(date: Date()),
previousGroupName: context.previousGroupName, removedMemberName: context.removedMemberName)
return ActivityLog(type: context.type, groupId: groupId, activityId: groupId,
groupName: context.group?.name ?? "", actionUserName: actionUserName,
recordedOn: Timestamp(date: Date()), previousGroupName: context.previousGroupName,
removedMemberName: context.removedMemberName)
}

private func addActivityLog(context: ActivityLogContext) async -> Error? {
Expand Down
29 changes: 18 additions & 11 deletions Data/Data/Repository/TransactionRepository.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ public class TransactionRepository: ObservableObject {
@Inject private var storageManager: StorageManager
@Inject private var activityLogRepository: ActivityLogRepository

public func addTransaction(group: Groups, transaction: Transactions, members: (payer: AppUser, receiver: AppUser), imageData: Data?) async throws -> Transactions {
public func addTransaction(group: Groups, transaction: Transactions,
members: (payer: AppUser, receiver: AppUser),
imageData: Data?) async throws -> Transactions {
// Generate a new document ID for the payment
let groupId = group.id ?? ""
let transactionDocument = try await store.getNewTransactionDocument(groupId: groupId)
Expand All @@ -34,13 +36,15 @@ public class TransactionRepository: ObservableObject {
return newTransaction
}

public func deleteTransaction(group: Groups, transaction: Transactions, payer: AppUser, receiver: AppUser) async throws -> Transactions {
public func deleteTransaction(group: Groups, transaction: Transactions,
payer: AppUser, receiver: AppUser) async throws -> Transactions {
var updatedTransaction = transaction
updatedTransaction.isActive = false // Make transaction inactive
updatedTransaction.updatedBy = preference.user?.id ?? ""
updatedTransaction.updatedAt = Timestamp()
return try await updateTransaction(group: group, transaction: updatedTransaction, oldTransaction: transaction,
members: (payer, receiver), type: .transactionDeleted)
return try await updateTransaction(group: group, transaction: updatedTransaction,
oldTransaction: transaction, members: (payer, receiver),
type: .transactionDeleted)
}

public func updateTransactionWithImage(imageData: Data?, newImageUrl: String?, group: Groups, transaction: (new: Transactions, old: Transactions), members: (payer: AppUser, receiver: AppUser)) async throws -> Transactions {
Expand All @@ -60,7 +64,9 @@ public class TransactionRepository: ObservableObject {
}

guard hasTransactionChanged(updatedTransaction, oldTransaction: transaction.old) else { return updatedTransaction }
return try await updateTransaction(group: group, transaction: updatedTransaction, oldTransaction: transaction.old, members: members, type: .transactionUpdated)
return try await updateTransaction(group: group, transaction: updatedTransaction,
oldTransaction: transaction.old, members: members,
type: .transactionUpdated)
}

private func uploadImage(imageData: Data, transaction: Transactions) async throws -> String {
Expand All @@ -79,8 +85,8 @@ public class TransactionRepository: ObservableObject {
public func updateTransaction(group: Groups, transaction: Transactions, oldTransaction: Transactions,
members: (payer: AppUser, receiver: AppUser), type: ActivityType) async throws -> Transactions {
try await store.updateTransaction(groupId: group.id ?? "", transaction: transaction)
try await addActivityLogForTransaction(group: group, transaction: transaction, oldTransaction: oldTransaction,
type: type, members: members)
try await addActivityLogForTransaction(group: group, transaction: transaction,
oldTransaction: oldTransaction, type: type, members: members)
return transaction
}

Expand Down Expand Up @@ -119,14 +125,15 @@ public class TransactionRepository: ObservableObject {
}

private func createActivityLogForTransaction(context: ActivityLogContext) -> ActivityLog? {
guard let groupId = context.group?.id, let transaction = context.transaction, let transactionId = transaction.id,
let currentUser = context.currentUser else { return nil }
guard let groupId = context.group?.id, let transaction = context.transaction,
let transactionId = transaction.id, let currentUser = context.currentUser else { return nil }

let actionUserName = (context.memberId == currentUser.id) ? "You" : currentUser.nameWithLastInitial
let amount: Double = (context.memberId == transaction.payerId) ? transaction.amount : (context.memberId == transaction.receiverId) ? -transaction.amount : 0

return ActivityLog(type: context.type, groupId: groupId, activityId: transactionId, groupName: context.group?.name ?? "",
actionUserName: actionUserName, recordedOn: Timestamp(date: Date()), payerName: context.payerName,
return ActivityLog(type: context.type, groupId: groupId, activityId: transactionId,
groupName: context.group?.name ?? "", actionUserName: actionUserName,
recordedOn: Timestamp(date: Date()), payerName: context.payerName,
receiverName: context.receiverName, amount: amount)
}

Expand Down
18 changes: 10 additions & 8 deletions Splito/UI/Home/Expense/AddExpenseView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ struct AddExpenseView: View {
.scrollBounceBehavior(.basedOnSize)

FooterView(date: $viewModel.expenseDate, showImagePickerOptions: $viewModel.showImagePickerOptions,
image: viewModel.expenseImage, imageUrl: viewModel.expenseImageUrl, handleNoteBtnTap: viewModel.handleNoteBtnTap,
handleImageTap: viewModel.handleExpenseImageTap, handleActionSelection: viewModel.handleActionSelection(_:))
image: viewModel.expenseImage, imageUrl: viewModel.expenseImageUrl,
handleNoteBtnTap: viewModel.handleNoteBtnTap, handleImageTap: viewModel.handleExpenseImageTap,
handleActionSelection: viewModel.handleActionSelection(_:))
}
}
.background(surfaceColor)
Expand All @@ -53,12 +54,13 @@ struct AddExpenseView: View {
}
.sheet(isPresented: $viewModel.showPayerSelection) {
NavigationStack {
ChoosePayerRouteView(appRoute: .init(root: .ChoosePayerView(groupId: viewModel.selectedGroup?.id ?? "",
amount: viewModel.expenseAmount,
selectedPayer: viewModel.selectedPayers,
onPayerSelection: viewModel.handlePayerSelection(payers:)))) {
viewModel.showPayerSelection = false
}
ChoosePayerRouteView(appRoute: .init(
root: .ChoosePayerView(groupId: viewModel.selectedGroup?.id ?? "",
amount: viewModel.expenseAmount,
selectedPayer: viewModel.selectedPayers,
onPayerSelection: viewModel.handlePayerSelection(payers:)))) {
viewModel.showPayerSelection = false
}
}
}
.sheet(isPresented: $viewModel.showSplitTypeSelection) {
Expand Down
6 changes: 5 additions & 1 deletion Splito/UI/Home/Expense/AddExpenseViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,11 @@ extension AddExpenseViewModel {
do {
showLoader = true

let updatedExpense = try await expenseRepository.updateExpenseWithImage(imageData: getImageData(), newImageUrl: expenseImageUrl, group: group, expense: (expense, oldExpense), type: .expenseUpdated)
let updatedExpense = try await expenseRepository.updateExpenseWithImage(imageData: getImageData(),
newImageUrl: expenseImageUrl,
group: group,
expense: (expense, oldExpense),
type: .expenseUpdated)
NotificationCenter.default.post(name: .updateExpense, object: updatedExpense)

guard hasExpenseChanged(updatedExpense, oldExpense: oldExpense) else { return true }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ class ExpenseDetailsViewModel: BaseViewModel, ObservableObject {
expense.updatedAt = Timestamp()

self.expense = try await self.expenseRepository.updateExpense(group: group, expense: expense,
oldExpense: expense, type: .expenseRestored)
oldExpense: expense, type: .expenseRestored)
await self.updateGroupMemberBalance(updateType: .Add)

self.viewState = .initial
Expand Down
3 changes: 2 additions & 1 deletion Splito/UI/Home/Expense/Note/AddNoteViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ class AddNoteViewModel: BaseViewModel, ObservableObject {
private let payment: Transactions?
private let handleSaveNoteTap: ((String) -> Void)?

init(group: Groups?, expense: Expense? = nil, payment: Transactions? = nil, note: String, handleSaveNoteTap: ((String) -> Void)? = nil) {
init(group: Groups?, expense: Expense? = nil, payment: Transactions? = nil,
note: String, handleSaveNoteTap: ((String) -> Void)? = nil) {
self.group = group
self.expense = expense
self.payment = payment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ class GroupPaymentViewModel: BaseViewModel, ObservableObject {
var transaction: Transactions?
private let router: Router<AppRoute>?

init(router: Router<AppRoute>, transactionId: String?, groupId: String, payerId: String, receiverId: String, amount: Double) {
init(router: Router<AppRoute>, transactionId: String?, groupId: String,
payerId: String, receiverId: String, amount: Double) {
self.router = router
self.amount = abs(amount)
self.groupId = groupId
Expand Down Expand Up @@ -103,7 +104,8 @@ class GroupPaymentViewModel: BaseViewModel, ObservableObject {

do {
viewState = .loading
self.transaction = try await transactionRepository.fetchTransactionBy(groupId: groupId, transactionId: transactionId)
self.transaction = try await transactionRepository.fetchTransactionBy(groupId: groupId,
transactionId: transactionId)

paymentDate = transaction?.date.dateValue() ?? Date.now
paymentNote = transaction?.note ?? ""
Expand Down Expand Up @@ -240,8 +242,9 @@ class GroupPaymentViewModel: BaseViewModel, ObservableObject {

return await updateTransaction(transaction: newTransaction, oldTransaction: transaction)
} else {
let transaction = Transactions(payerId: payerId, receiverId: receiverId, addedBy: userId, updatedBy: userId,
note: paymentNote, amount: amount, date: .init(date: paymentDate))
let transaction = Transactions(payerId: payerId, receiverId: receiverId, addedBy: userId,
updatedBy: userId, note: paymentNote, amount: amount,
date: .init(date: paymentDate))
return await addTransaction(transaction: transaction)
}
}
Expand Down

0 comments on commit f25dfaf

Please sign in to comment.