Skip to content

Feature 85 - Add transaction without category #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahmermughal wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Feature 85 - Add transaction without category #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
171 changes: 75 additions & 96 deletions app/dime/Data/DataController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,13 @@ class DataController: ObservableObject {
}
}

func fetchRequestForDefaultCategory(income: Bool) -> NSFetchRequest<Category> {
let itemRequest: NSFetchRequest<Category> = Category.fetchRequest()
itemRequest.sortDescriptors = [NSSortDescriptor(key: "order", ascending: true)]
itemRequest.predicate = NSPredicate(format: "income = %d AND name == %@", income, "Default")
return itemRequest
}

func fetchRequestForCategories(income: Bool) -> NSFetchRequest<Category> {
let itemRequest: NSFetchRequest<Category> = Category.fetchRequest()
itemRequest.sortDescriptors = [NSSortDescriptor(key: "order", ascending: true)]
Expand Down Expand Up @@ -509,6 +516,31 @@ class DataController: ObservableObject {
throw CustomError.notFound
}
}

func getDefaultCategory(income: Bool) -> Category? {

let request = fetchRequestForDefaultCategory(income: income)

do {
let results = try container.viewContext.fetch(request)
if let category = results.first {
return category
} else {
let category = Category(context: self.container.viewContext)
category.name = "Default"
category.emoji = "🏷️"
category.dateCreated = Date.now
category.id = UUID()
category.income = income
category.colour = "#9E9E9E"

self.save()
return getDefaultCategory(income: income)
}
} catch {
return nil
}
}

func categoryCheck(name: String, emoji: String, income: Bool) -> (error: CategoryError, order: Int64) {
if name.trimmingCharacters(in: .whitespacesAndNewlines) == "" && emoji == "" {
Expand All @@ -518,51 +550,26 @@ class DataController: ObservableObject {
} else if emoji == "" {
return (CategoryError.missingEmoji, 0)
}

if income {
let fetchRequest = fetchRequestForCategories(income: true)
let incomeCategories = results(for: fetchRequest)

var emojiArray = [String]()
var nameArray = [String]()

incomeCategories.forEach { category in
emojiArray.append(category.wrappedEmoji)
nameArray.append(category.wrappedName)
}

if emojiArray.contains(emoji) && nameArray.contains(name) {
return (CategoryError.duplicate, 0)
} else if emojiArray.contains(emoji) {
return (CategoryError.duplicateEmoji, 0)
} else if nameArray.contains(name) {
return (CategoryError.duplicateName, 0)
} else {
let newItemOrder = (incomeCategories.last?.order ?? 0) + 1
return (CategoryError.none, newItemOrder)
}
let fetchRequest = fetchRequestForCategories(income: income)
let categories = results(for: fetchRequest)
var emojiArray = [String]()
var nameArray = [String]()


categories.forEach { category in
emojiArray.append(category.wrappedEmoji)
nameArray.append(category.wrappedName)
}

if emojiArray.contains(emoji) && nameArray.contains(name) {
return (CategoryError.duplicate, 0)
} else if emojiArray.contains(emoji) {
return (CategoryError.duplicateEmoji, 0)
} else if nameArray.contains(name) {
return (CategoryError.duplicateName, 0)
} else {
let fetchRequest = fetchRequestForCategories(income: false)
let expenseCategories = results(for: fetchRequest)

var emojiArray = [String]()
var nameArray = [String]()

expenseCategories.forEach { category in
emojiArray.append(category.wrappedEmoji)
nameArray.append(category.wrappedName)
}

if emojiArray.contains(emoji) && nameArray.contains(name) {
return (CategoryError.duplicate, 0)
} else if emojiArray.contains(emoji) {
return (CategoryError.duplicateEmoji, 0)
} else if nameArray.contains(name) {
return (CategoryError.duplicateName, 0)
} else {
let newItemOrder = (expenseCategories.last?.order ?? 0) + 1
return (CategoryError.none, newItemOrder)
}
let newItemOrder = (categories.last?.order ?? 0) + 1
return (CategoryError.none, newItemOrder)
}
}

Expand All @@ -574,59 +581,31 @@ class DataController: ObservableObject {
} else if emoji == "" {
return (CategoryError.missingEmoji, 0)
}

if toEdit.income {
let fetchRequest = fetchRequestForCategories(income: true)
var incomeCategories = results(for: fetchRequest)

if let position = incomeCategories.firstIndex(of: toEdit) {
incomeCategories.remove(at: position)
}

var emojiArray = [String]()
var nameArray = [String]()

incomeCategories.forEach { category in
emojiArray.append(category.wrappedEmoji)
nameArray.append(category.wrappedName)
}

if emojiArray.contains(emoji) && nameArray.contains(name) {
return (CategoryError.duplicate, 0)
} else if emojiArray.contains(emoji) {
return (CategoryError.duplicateEmoji, 0)
} else if nameArray.contains(name) {
return (CategoryError.duplicateName, 0)
} else {
let newItemOrder = (incomeCategories.last?.order ?? 0) + 1
return (CategoryError.none, newItemOrder)
}

let fetchRequest = fetchRequestForCategories(income: toEdit.income)
var categories = results(for: fetchRequest)

if let position = categories.firstIndex(of: toEdit) {
categories.remove(at: position)
}

var emojiArray = [String]()
var nameArray = [String]()

categories.forEach { category in
emojiArray.append(category.wrappedEmoji)
nameArray.append(category.wrappedName)
}

if emojiArray.contains(emoji) && nameArray.contains(name) {
return (CategoryError.duplicate, 0)
} else if emojiArray.contains(emoji) {
return (CategoryError.duplicateEmoji, 0)
} else if nameArray.contains(name) {
return (CategoryError.duplicateName, 0)
} else {
let fetchRequest = fetchRequestForCategories(income: false)
var expenseCategories = results(for: fetchRequest)

if let position = expenseCategories.firstIndex(of: toEdit) {
expenseCategories.remove(at: position)
}

var emojiArray = [String]()
var nameArray = [String]()

expenseCategories.forEach { category in
emojiArray.append(category.wrappedEmoji)
nameArray.append(category.wrappedName)
}

if emojiArray.contains(emoji) && nameArray.contains(name) {
return (CategoryError.duplicate, 0)
} else if emojiArray.contains(emoji) {
return (CategoryError.duplicateEmoji, 0)
} else if nameArray.contains(name) {
return (CategoryError.duplicateName, 0)
} else {
let newItemOrder = (expenseCategories.last?.order ?? 0) + 1
return (CategoryError.none, newItemOrder)
}
let newItemOrder = (categories.last?.order ?? 0) + 1
return (CategoryError.none, newItemOrder)
}
}

Expand Down
5 changes: 5 additions & 0 deletions app/dime/Views/TransactionView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,6 +989,11 @@ struct TransactionView: View {
func submit() {
let generator = UINotificationFeedbackGenerator()

// select or create a default category if none is selected.
if self.category == nil {
self.category = self.dataController.getDefaultCategory(income: income)
}

if price == 0 && category == nil {
toastImage = "questionmark.app"
toastTitle = "Incomplete Entry"
Expand Down