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

Remove Repository and use Database instead

Browse Source
This commit is contained in:
Jan Bader
2021-12-11 20:18:09 +00:00
parent d5ebf5a5cf
commit e9adc763b2
14 changed files with 42 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
http/account.go
View File

@@ -23,13 +23,13 @@ func (h *Handler) account(c *gin.Context) {
return
}
account, err := h.Service.DB.GetAccount(c.Request.Context(), accountUUID)
account, err := h.Service.GetAccount(c.Request.Context(), accountUUID)
if err != nil {
c.AbortWithError(http.StatusNotFound, err)
return
}
transactions, err := h.Service.DB.GetTransactionsForAccount(c.Request.Context(), accountUUID)
transactions, err := h.Service.GetTransactionsForAccount(c.Request.Context(), accountUUID)
if err != nil {
c.AbortWithError(http.StatusNotFound, err)
return

14
http/admin.go
View File

@@ -21,11 +21,11 @@ func (h *Handler) admin(c *gin.Context) {
func (h *Handler) clearDatabase(c *gin.Context) {
d := AdminData{}
if err := goose.Down(h.Service.LegacyDB, "schema"); err != nil {
if err := goose.Down(h.Service.DB, "schema"); err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
}
if err := goose.Up(h.Service.LegacyDB, "schema"); err != nil {
if err := goose.Up(h.Service.DB, "schema"); err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
}
@@ -52,7 +52,7 @@ func (h *Handler) clearBudget(c *gin.Context) {
return
}
rows, err := h.Service.DB.DeleteAllAssignments(c.Request.Context(), budgetUUID)
rows, err := h.Service.DeleteAllAssignments(c.Request.Context(), budgetUUID)
if err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
return
@@ -60,7 +60,7 @@ func (h *Handler) clearBudget(c *gin.Context) {
fmt.Printf("Deleted %d assignments\n", rows)
rows, err = h.Service.DB.DeleteAllTransactions(c.Request.Context(), budgetUUID)
rows, err = h.Service.DeleteAllTransactions(c.Request.Context(), budgetUUID)
if err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
return
@@ -77,7 +77,7 @@ func (h *Handler) cleanNegativeBudget(c *gin.Context) {
return
}*/
/*min_date, err := h.Service.DB.GetFirstActivity(c.Request.Context(), budgetUUID)
/*min_date, err := h.Service.GetFirstActivity(c.Request.Context(), budgetUUID)
date := getFirstOfMonthTime(min_date)
for {
nextDate := date.AddDate(0, 1, 0)
@@ -86,7 +86,7 @@ func (h *Handler) cleanNegativeBudget(c *gin.Context) {
ToDate: nextDate,
FromDate: date,
}
categories, err := h.Service.DB.GetCategoriesWithBalance(c.Request.Context(), params)
categories, err := h.Service.GetCategoriesWithBalance(c.Request.Context(), params)
if err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
return
@@ -104,7 +104,7 @@ func (h *Handler) cleanNegativeBudget(c *gin.Context) {
Amount: negativeAvailable,
CategoryID: category.ID,
}
h.Service.DB.CreateAssignment(c.Request.Context(), createAssignment)
h.Service.CreateAssignment(c.Request.Context(), createAssignment)
}
if nextDate.Before(time.Now()) {

4
http/always-needed-data.go
View File

@@ -24,13 +24,13 @@ func (h *Handler) getImportantData(c *gin.Context) {
return
}
budget, err := h.Service.DB.GetBudget(c.Request.Context(), budgetUUID)
budget, err := h.Service.GetBudget(c.Request.Context(), budgetUUID)
if err != nil {
c.AbortWithError(http.StatusNotFound, err)
return
}
accounts, err := h.Service.DB.GetAccountsWithBalance(c.Request.Context(), budgetUUID)
accounts, err := h.Service.GetAccountsWithBalance(c.Request.Context(), budgetUUID)
if err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
return

2
http/budget.go
View File

@@ -23,7 +23,7 @@ func (h *Handler) allAccounts(c *gin.Context) {
return
}
transactions, err := h.Service.DB.GetTransactionsForBudget(c.Request.Context(), budgetUUID)
transactions, err := h.Service.GetTransactionsForBudget(c.Request.Context(), budgetUUID)
if err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
return

4
http/budgeting.go
View File

@@ -78,9 +78,9 @@ func (h *Handler) budgeting(c *gin.Context) {
Previous: firstOfPreviousMonth,
}
categories, err := h.Service.DB.GetCategories(c.Request.Context(), budgetUUID)
categories, err := h.Service.GetCategories(c.Request.Context(), budgetUUID)
cumultativeBalances, err := h.Service.DB.GetCumultativeBalances(c.Request.Context(), budgetUUID)
cumultativeBalances, err := h.Service.GetCumultativeBalances(c.Request.Context(), budgetUUID)
if err != nil {
c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("load balances: %w", err))
return

2
http/dashboard.go
View File

@@ -10,7 +10,7 @@ import (
func (h *Handler) dashboard(c *gin.Context) {
userID := c.MustGet("token").(budgeteer.Token).GetID()
budgets, err := h.Service.DB.GetBudgetsForUser(c.Request.Context(), userID)
budgets, err := h.Service.GetBudgetsForUser(c.Request.Context(), userID)
if err != nil {
return
}

2
http/http.go
View File

@@ -15,7 +15,7 @@ import (
// Handler handles incoming requests
type Handler struct {
Service *postgres.Repository
Service *postgres.Database
TokenVerifier budgeteer.TokenVerifier
CredentialsVerifier *bcrypt.Verifier
}

8
http/session.go
View File

@@ -68,7 +68,7 @@ func (h *Handler) loginPost(c *gin.Context) {
username, _ := c.GetPostForm("username")
password, _ := c.GetPostForm("password")
user, err := h.Service.DB.GetUserByUsername(c.Request.Context(), username)
user, err := h.Service.GetUserByUsername(c.Request.Context(), username)
if err != nil {
c.AbortWithError(http.StatusUnauthorized, err)
return
@@ -84,7 +84,7 @@ func (h *Handler) loginPost(c *gin.Context) {
c.AbortWithError(http.StatusUnauthorized, err)
}
go h.Service.DB.UpdateLastLogin(context.Background(), user.ID)
go h.Service.UpdateLastLogin(context.Background(), user.ID)
maxAge := (int)((expiration * time.Hour).Seconds())
c.SetCookie(authCookie, t, maxAge, "", "", false, true)
@@ -98,7 +98,7 @@ func (h *Handler) registerPost(c *gin.Context) {
password, _ := c.GetPostForm("password")
name, _ := c.GetPostForm("name")
_, err := h.Service.DB.GetUserByUsername(c.Request.Context(), email)
_, err := h.Service.GetUserByUsername(c.Request.Context(), email)
if err == nil {
c.AbortWithStatus(http.StatusUnauthorized)
return
@@ -115,7 +115,7 @@ func (h *Handler) registerPost(c *gin.Context) {
Password: hash,
Email: email,
}
_, err = h.Service.DB.CreateUser(c.Request.Context(), createUser)
_, err = h.Service.CreateUser(c.Request.Context(), createUser)
if err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
}

2
http/transaction.go
View File

@@ -46,7 +46,7 @@ func (h *Handler) newTransaction(c *gin.Context) {
Amount: postgres.Numeric{},
AccountID: transactionAccountID,
}
_, err = h.Service.DB.CreateTransaction(c.Request.Context(), new)
_, err = h.Service.CreateTransaction(c.Request.Context(), new)
if err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
return

2
http/ynab-import.go
View File

@@ -22,7 +22,7 @@ func (h *Handler) importYNAB(c *gin.Context) {
return
}
ynab, err := postgres.NewYNABImport(c.Request.Context(), h.Service.DB, budgetUUID)
ynab, err := postgres.NewYNABImport(c.Request.Context(), h.Service.Queries, budgetUUID)
if err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
return