From 36b2f121832a64ab79207a56a6dfd79d32b3df2f Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sun, 20 Feb 2022 20:42:27 +0000 Subject: [PATCH] Renames --- postgres/budgetservice.go | 12 ++++++------ postgres/ynab-import.go | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/postgres/budgetservice.go b/postgres/budgetservice.go index 4af5c36..bcb4512 100644 --- a/postgres/budgetservice.go +++ b/postgres/budgetservice.go @@ -15,8 +15,8 @@ func (s *Database) NewBudget(context context.Context, name string, userID uuid.U return nil, fmt.Errorf("begin transaction: %w", err) } - q := s.WithTx(tx) - budget, err := q.CreateBudget(context, CreateBudgetParams{ + transaction := s.WithTx(tx) + budget, err := transaction.CreateBudget(context, CreateBudgetParams{ Name: name, IncomeCategoryID: uuid.New(), }) @@ -25,12 +25,12 @@ func (s *Database) NewBudget(context context.Context, name string, userID uuid.U } ub := LinkBudgetToUserParams{UserID: userID, BudgetID: budget.ID} - _, err = q.LinkBudgetToUser(context, ub) + _, err = transaction.LinkBudgetToUser(context, ub) if err != nil { return nil, fmt.Errorf("link budget to user: %w", err) } - group, err := q.CreateCategoryGroup(context, CreateCategoryGroupParams{ + group, err := transaction.CreateCategoryGroup(context, CreateCategoryGroupParams{ Name: "Inflow", BudgetID: budget.ID, }) @@ -38,7 +38,7 @@ func (s *Database) NewBudget(context context.Context, name string, userID uuid.U return nil, fmt.Errorf("create inflow category_group: %w", err) } - cat, err := q.CreateCategory(context, CreateCategoryParams{ + cat, err := transaction.CreateCategory(context, CreateCategoryParams{ Name: "Ready to Assign", CategoryGroupID: group.ID, }) @@ -46,7 +46,7 @@ func (s *Database) NewBudget(context context.Context, name string, userID uuid.U return nil, fmt.Errorf("create ready to assign category: %w", err) } - err = q.SetInflowCategory(context, SetInflowCategoryParams{ + err = transaction.SetInflowCategory(context, SetInflowCategoryParams{ IncomeCategoryID: cat.ID, ID: budget.ID, }) diff --git a/postgres/ynab-import.go b/postgres/ynab-import.go index c2b0ba4..8892d8f 100644 --- a/postgres/ynab-import.go +++ b/postgres/ynab-import.go @@ -21,23 +21,23 @@ type YNABImport struct { budgetID uuid.UUID } -func NewYNABImport(context context.Context, q *Queries, budgetID uuid.UUID) (*YNABImport, error) { - accounts, err := q.GetAccounts(context, budgetID) +func NewYNABImport(context context.Context, queries *Queries, budgetID uuid.UUID) (*YNABImport, error) { + accounts, err := queries.GetAccounts(context, budgetID) if err != nil { return nil, err } - payees, err := q.GetPayees(context, budgetID) + payees, err := queries.GetPayees(context, budgetID) if err != nil { return nil, err } - categories, err := q.GetCategories(context, budgetID) + categories, err := queries.GetCategories(context, budgetID) if err != nil { return nil, err } - categoryGroups, err := q.GetCategoryGroups(context, budgetID) + categoryGroups, err := queries.GetCategoryGroups(context, budgetID) if err != nil { return nil, err } @@ -47,7 +47,7 @@ func NewYNABImport(context context.Context, q *Queries, budgetID uuid.UUID) (*YN payees: payees, categories: categories, categoryGroups: categoryGroups, - queries: q, + queries: queries, budgetID: budgetID, }, nil }