From daadfd45bc38f3ec038fff774e06a0213e2d21f5 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sat, 19 Feb 2022 21:28:04 +0000 Subject: [PATCH] Rename http package to server --- cmd/budgeteer/main.go | 4 ++-- {http => server}/account.go | 2 +- {http => server}/account_test.go | 21 +++++++++++---------- {http => server}/admin.go | 2 +- {http => server}/autocomplete.go | 2 +- {http => server}/budget.go | 2 +- {http => server}/budgeting.go | 2 +- {http => server}/dashboard.go | 2 +- {http => server}/http.go | 2 +- {http => server}/json-date.go | 2 +- {http => server}/session.go | 2 +- {http => server}/transaction.go | 2 +- {http => server}/ynab-import.go | 6 +++--- 13 files changed, 26 insertions(+), 25 deletions(-) rename {http => server}/account.go (98%) rename {http => server}/account_test.go (72%) rename {http => server}/admin.go (99%) rename {http => server}/autocomplete.go (98%) rename {http => server}/budget.go (97%) rename {http => server}/budgeting.go (99%) rename {http => server}/dashboard.go (96%) rename {http => server}/http.go (99%) rename {http => server}/json-date.go (97%) rename {http => server}/session.go (99%) rename {http => server}/transaction.go (99%) rename {http => server}/ynab-import.go (90%) diff --git a/cmd/budgeteer/main.go b/cmd/budgeteer/main.go index eb40d98..18ac498 100644 --- a/cmd/budgeteer/main.go +++ b/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{}, diff --git a/http/account.go b/server/account.go similarity index 98% rename from http/account.go rename to server/account.go index 03296c2..18cfe41 100644 --- a/http/account.go +++ b/server/account.go @@ -1,4 +1,4 @@ -package http +package server import ( "net/http" diff --git a/http/account_test.go b/server/account_test.go similarity index 72% rename from http/account_test.go rename to server/account_test.go index adbb97b..af1869e 100644 --- a/http/account_test.go +++ b/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{ - Service: db, + h := server.Handler{ + 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()) diff --git a/http/admin.go b/server/admin.go similarity index 99% rename from http/admin.go rename to server/admin.go index c14248a..7d19da3 100644 --- a/http/admin.go +++ b/server/admin.go @@ -1,4 +1,4 @@ -package http +package server import ( "fmt" diff --git a/http/autocomplete.go b/server/autocomplete.go similarity index 98% rename from http/autocomplete.go rename to server/autocomplete.go index 2a510c1..626b9ee 100644 --- a/http/autocomplete.go +++ b/server/autocomplete.go @@ -1,4 +1,4 @@ -package http +package server import ( "fmt" diff --git a/http/budget.go b/server/budget.go similarity index 97% rename from http/budget.go rename to server/budget.go index 5b93c40..bd6eb53 100644 --- a/http/budget.go +++ b/server/budget.go @@ -1,4 +1,4 @@ -package http +package server import ( "fmt" diff --git a/http/budgeting.go b/server/budgeting.go similarity index 99% rename from http/budgeting.go rename to server/budgeting.go index 431c3b7..ec07791 100644 --- a/http/budgeting.go +++ b/server/budgeting.go @@ -1,4 +1,4 @@ -package http +package server import ( "fmt" diff --git a/http/dashboard.go b/server/dashboard.go similarity index 96% rename from http/dashboard.go rename to server/dashboard.go index f752b10..ec8f08c 100644 --- a/http/dashboard.go +++ b/server/dashboard.go @@ -1,4 +1,4 @@ -package http +package server import ( "net/http" diff --git a/http/http.go b/server/http.go similarity index 99% rename from http/http.go rename to server/http.go index 2881030..4437946 100644 --- a/http/http.go +++ b/server/http.go @@ -1,4 +1,4 @@ -package http +package server import ( "errors" diff --git a/http/json-date.go b/server/json-date.go similarity index 97% rename from http/json-date.go rename to server/json-date.go index 36dd85a..17ba6a2 100644 --- a/http/json-date.go +++ b/server/json-date.go @@ -1,4 +1,4 @@ -package http +package server import ( "encoding/json" diff --git a/http/session.go b/server/session.go similarity index 99% rename from http/session.go rename to server/session.go index 0805ab8..7f56281 100644 --- a/http/session.go +++ b/server/session.go @@ -1,4 +1,4 @@ -package http +package server import ( "context" diff --git a/http/transaction.go b/server/transaction.go similarity index 99% rename from http/transaction.go rename to server/transaction.go index 306fe01..432d5ad 100644 --- a/http/transaction.go +++ b/server/transaction.go @@ -1,4 +1,4 @@ -package http +package server import ( "fmt" diff --git a/http/ynab-import.go b/server/ynab-import.go similarity index 90% rename from http/ynab-import.go rename to server/ynab-import.go index 948b442..e6cf0f3 100644 --- a/http/ynab-import.go +++ b/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