jacob1123/budgeteer
1
1
Fork 0
Code Issues 12 Pull Requests 1 Packages Releases 1 Wiki Activity

Revert "UNSURE explicitly init NullUUIDs"

Browse Source 
This reverts commit 62085cb69439d36db301dc9097ae1f259fdd0d9e.
This commit is contained in:
Jan Bader 2022-02-20 20:52:15 +00:00
parent e39d1dc6e3
commit a0d89ee93a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
postgres/ynab-import.go
View File

@ -320,7 +320,7 @@ func (ynab *YNABImport) GetAccount(context context.Context, name string) (*Accou
func (ynab *YNABImport) GetPayee(context context.Context, name string) (uuid.NullUUID, error) { func (ynab *YNABImport) GetPayee(context context.Context, name string) (uuid.NullUUID, error) {
if name == "" { if name == "" {
return uuid.NullUUID{UUID: uuid.UUID{}, Valid: false}, nil return uuid.NullUUID{}, nil
} }
for _, pay := range ynab.payees { for _, pay := range ynab.payees {
@ -331,7 +331,7 @@ func (ynab *YNABImport) GetPayee(context context.Context, name string) (uuid.Nul
payee, err := ynab.queries.CreatePayee(context, CreatePayeeParams{Name: name, BudgetID: ynab.budgetID}) payee, err := ynab.queries.CreatePayee(context, CreatePayeeParams{Name: name, BudgetID: ynab.budgetID})
if err != nil { if err != nil {
return uuid.NullUUID{UUID: uuid.UUID{}, Valid: false}, err return uuid.NullUUID{}, err
} }
ynab.payees = append(ynab.payees, payee) ynab.payees = append(ynab.payees, payee)
@ -340,7 +340,7 @@ func (ynab *YNABImport) GetPayee(context context.Context, name string) (uuid.Nul
func (ynab *YNABImport) GetCategory(context context.Context, group string, name string) (uuid.NullUUID, error) { func (ynab *YNABImport) GetCategory(context context.Context, group string, name string) (uuid.NullUUID, error) {
if group == "" || name == "" { if group == "" || name == "" {
return uuid.NullUUID{UUID: uuid.UUID{}, Valid: false}, nil return uuid.NullUUID{}, nil
} }
for _, category := range ynab.categories { for _, category := range ynab.categories {
@ -354,7 +354,7 @@ func (ynab *YNABImport) GetCategory(context context.Context, group string, name
createCategory := CreateCategoryParams{Name: name, CategoryGroupID: categoryGroup.ID} createCategory := CreateCategoryParams{Name: name, CategoryGroupID: categoryGroup.ID}
category, err := ynab.queries.CreateCategory(context, createCategory) category, err := ynab.queries.CreateCategory(context, createCategory)
if err != nil { if err != nil {
return uuid.NullUUID{UUID: uuid.UUID{}, Valid: false}, err return uuid.NullUUID{}, err
} }
getCategory := GetCategoriesRow{ getCategory := GetCategoriesRow{
@ -370,13 +370,13 @@ func (ynab *YNABImport) GetCategory(context context.Context, group string, name
categoryGroup, err := ynab.queries.CreateCategoryGroup(context, CreateCategoryGroupParams{Name: group, BudgetID: ynab.budgetID}) categoryGroup, err := ynab.queries.CreateCategoryGroup(context, CreateCategoryGroupParams{Name: group, BudgetID: ynab.budgetID})
if err != nil { if err != nil {
return uuid.NullUUID{UUID: uuid.UUID{}, Valid: false}, err return uuid.NullUUID{}, err
} }
ynab.categoryGroups = append(ynab.categoryGroups, categoryGroup) ynab.categoryGroups = append(ynab.categoryGroups, categoryGroup)
category, err := ynab.queries.CreateCategory(context, CreateCategoryParams{Name: name, CategoryGroupID: categoryGroup.ID}) category, err := ynab.queries.CreateCategory(context, CreateCategoryParams{Name: name, CategoryGroupID: categoryGroup.ID})
if err != nil { if err != nil {
return uuid.NullUUID{UUID: uuid.UUID{}, Valid: false}, err return uuid.NullUUID{}, err
} }
getCategory := GetCategoriesRow{ getCategory := GetCategoriesRow{