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

Use goose for migrations

Browse Source
This commit is contained in:
Jan Bader
2021-11-08 22:24:21 +00:00
parent cf1bc70103
commit 5de7d32c30
25 changed files with 134 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
http/data.go
View File

@@ -1,14 +1,17 @@
package http
import "git.javil.eu/jacob1123/budgeteer"
import (
"git.javil.eu/jacob1123/budgeteer"
"git.javil.eu/jacob1123/budgeteer/postgres"
)
type TemplateData struct {
Token budgeteer.Token
Budget *budgeteer.Budget
budgetService budgeteer.ModelService
Budget *postgres.Budget
budgetService *postgres.Repository
}
func (d TemplateData) GetBudgets() []*budgeteer.Budget {
func (d TemplateData) GetBudgets() []postgres.Budget {
userID := d.Token.GetID()
budgets, err := d.budgetService.BudgetsForUser(userID)
if err != nil {

21
http/http.go
View File

@@ -1,6 +1,7 @@
package http
import (
"context"
"io/fs"
"net/http"
"time"
@@ -8,6 +9,8 @@ import (
"html/template"
"git.javil.eu/jacob1123/budgeteer"
"git.javil.eu/jacob1123/budgeteer/bcrypt"
"git.javil.eu/jacob1123/budgeteer/postgres"
"git.javil.eu/jacob1123/budgeteer/web"
"github.com/gin-gonic/gin"
@@ -15,9 +18,9 @@ import (
// Handler handles incoming requests
type Handler struct {
Service budgeteer.BudgetService
Service *postgres.Repository
TokenVerifier budgeteer.TokenVerifier
CredentialsVerifier budgeteer.CredentialVerifier
CredentialsVerifier *bcrypt.Verifier
}
const (
@@ -69,7 +72,7 @@ func (h *Handler) budget(c *gin.Context) {
}
budgetID := c.Param("budgetid")
budget, err := h.Service.Budget(budgetID)
budget, err := h.Service.DB.GetBudget(context.Background(), budgetID)
if err != nil {
c.AbortWithError(http.StatusUnauthorized, err)
return
@@ -77,7 +80,7 @@ func (h *Handler) budget(c *gin.Context) {
d := TemplateData{
Token: token,
Budget: budget,
Budget: &budget,
budgetService: h.Service,
}
@@ -163,7 +166,7 @@ func (h *Handler) loginPost(c *gin.Context) {
username, _ := c.GetPostForm("username")
password, _ := c.GetPostForm("password")
user, err := h.Service.UserByUsername(username)
user, err := h.Service.DB.GetUserByUsername(context.Background(), username)
if err != nil {
c.AbortWithError(http.StatusUnauthorized, err)
return
@@ -174,7 +177,7 @@ func (h *Handler) loginPost(c *gin.Context) {
return
}
t, err := h.TokenVerifier.CreateToken(user)
t, err := h.TokenVerifier.CreateToken(&user)
if err != nil {
c.AbortWithError(http.StatusUnauthorized, err)
}
@@ -192,7 +195,7 @@ func (h *Handler) registerPost(c *gin.Context) {
password, _ := c.GetPostForm("password")
name, _ := c.GetPostForm("name")
user, err := h.Service.UserByUsername(email)
_, err := h.Service.DB.GetUserByUsername(context.Background(), email)
if err == nil {
c.AbortWithStatus(http.StatusUnauthorized)
return
@@ -204,12 +207,12 @@ func (h *Handler) registerPost(c *gin.Context) {
return
}
user = &budgeteer.User{
createUser := postgres.CreateUserParams{
Name: name,
Password: hash,
Email: email,
}
err = h.Service.CreateUser(user)
_, err = h.Service.DB.CreateUser(context.Background(), createUser)
if err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
}