Rename http package to server

cmd/budgeteer/main.go

@@ -8,9 +8,9 @@ import (
 
 	"git.javil.eu/jacob1123/budgeteer/bcrypt"
 	"git.javil.eu/jacob1123/budgeteer/config"
-	"git.javil.eu/jacob1123/budgeteer/http"
 	"git.javil.eu/jacob1123/budgeteer/jwt"
 	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"git.javil.eu/jacob1123/budgeteer/server"
 	"git.javil.eu/jacob1123/budgeteer/web"
 )
 
@@ -30,7 +30,7 @@ func main() {
 		panic("couldn't open static files")
 	}
 
-	handler := &http.Handler{
+	handler := &server.Handler{
 		Service:             q,
 		TokenVerifier:       &jwt.TokenVerifier{},
 		CredentialsVerifier: &bcrypt.Verifier{},

server/account.go

@@ -1,4 +1,4 @@
-package http
+package server
 
 import (
 	"net/http"

server/account_test.go

@@ -1,4 +1,4 @@
-package http
+package server_test
 
 import (
 	"encoding/json"
@@ -10,6 +10,7 @@ import (
 	"git.javil.eu/jacob1123/budgeteer/bcrypt"
 	"git.javil.eu/jacob1123/budgeteer/jwt"
 	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"git.javil.eu/jacob1123/budgeteer/server"
 	"github.com/gin-gonic/gin"
 
 	txdb "github.com/DATA-DOG/go-txdb"
@@ -20,36 +21,36 @@ func init() {
 }
 
 func TestListTimezonesHandler(t *testing.T) {
-	db, err := postgres.Connect("pgtx", "example")
+	database, err := postgres.Connect("pgtx", "example")
 	if err != nil {
 		t.Errorf("could not connect to db: %s", err)
 		return
 	}
 
-	h := Handler{
+	h := server.Handler{
-		Service:             db,
+		Service:             database,
 		TokenVerifier:       &jwt.TokenVerifier{},
 		CredentialsVerifier: &bcrypt.Verifier{},
 	}
 
 	recorder := httptest.NewRecorder()
-	c, engine := gin.CreateTestContext(recorder)
+	context, engine := gin.CreateTestContext(recorder)
 	h.LoadRoutes(engine)
 
 	t.Run("RegisterUser", func(t *testing.T) {
-		c.Request, err = http.NewRequest(http.MethodPost, "/api/v1/user/register", strings.NewReader(`{"password":"pass","email":"info@example.com","name":"Test"}`))
+		context.Request, err = http.NewRequest(http.MethodPost, "/api/v1/user/register", strings.NewReader(`{"password":"pass","email":"info@example.com","name":"Test"}`))
 		if err != nil {
 			t.Errorf("error creating request: %s", err)
 			return
 		}
 
-		h.registerPost(c)
+		h.registerPost(context)
 
 		if recorder.Code != http.StatusOK {
 			t.Errorf("handler returned wrong status code: got %v want %v", recorder.Code, http.StatusOK)
 		}
 
-		var response LoginResponse
+		var response server.LoginResponse
 		err = json.NewDecoder(recorder.Body).Decode(&response)
 		if err != nil {
 			t.Error(err.Error())
@@ -61,12 +62,12 @@ func TestListTimezonesHandler(t *testing.T) {
 	})
 
 	t.Run("GetTransactions", func(t *testing.T) {
-		c.Request, err = http.NewRequest(http.MethodGet, "/account/accountid/transactions", nil)
+		context.Request, err = http.NewRequest(http.MethodGet, "/account/accountid/transactions", nil)
 		if recorder.Code != http.StatusOK {
 			t.Errorf("handler returned wrong status code: got %v want %v", recorder.Code, http.StatusOK)
 		}
 
-		var response TransactionsResponse
+		var response server.TransactionsResponse
 		err = json.NewDecoder(recorder.Body).Decode(&response)
 		if err != nil {
 			t.Error(err.Error())

server/admin.go

@@ -1,4 +1,4 @@
-package http
+package server
 
 import (
 	"fmt"

server/autocomplete.go

@@ -1,4 +1,4 @@
-package http
+package server
 
 import (
 	"fmt"

server/budget.go

@@ -1,4 +1,4 @@
-package http
+package server
 
 import (
 	"fmt"

server/budgeting.go

@@ -1,4 +1,4 @@
-package http
+package server
 
 import (
 	"fmt"

server/dashboard.go

@@ -1,4 +1,4 @@
-package http
+package server
 
 import (
 	"net/http"

server/http.go

@@ -1,4 +1,4 @@
-package http
+package server
 
 import (
 	"errors"

server/json-date.go

@@ -1,4 +1,4 @@
-package http
+package server
 
 import (
 	"encoding/json"

server/session.go

@@ -1,4 +1,4 @@
-package http
+package server
 
 import (
 	"context"

server/transaction.go

@@ -1,4 +1,4 @@
-package http
+package server
 
 import (
 	"fmt"

server/ynab-import.go

@@ -1,4 +1,4 @@
-package http
+package server
 
 import (
 	"fmt"
@@ -40,7 +40,7 @@ func (h *Handler) importYNAB(c *gin.Context) {
 		return
 	}
 
-	err = ynab.ImportTransactions(transactions)
+	err = ynab.ImportTransactions(c.Request.Context(), transactions)
 	if err != nil {
 		c.AbortWithError(http.StatusInternalServerError, err)
 		return
@@ -58,7 +58,7 @@ func (h *Handler) importYNAB(c *gin.Context) {
 		return
 	}
 
-	err = ynab.ImportAssignments(assignments)
+	err = ynab.ImportAssignments(c.Request.Context(), assignments)
 	if err != nil {
 		c.AbortWithError(http.StatusInternalServerError, err)
 		return