diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/cmd/main.go | 2 | ||||
| -rw-r--r-- | server/guest/handler.go | 6 | ||||
| -rw-r--r-- | server/test/guest_test.go | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/server/cmd/main.go b/server/cmd/main.go index 38ccf37..21cdccc 100644 --- a/server/cmd/main.go +++ b/server/cmd/main.go @@ -36,7 +36,7 @@ func main() { adminHandler := admin.NewAdminHandler(adminStore, guestStore) mux := http.NewServeMux() - mux.Handle("/guest/", guestHandler) + mux.Handle("/guests/", guestHandler) mux.Handle("/admin/", adminHandler) log.Fatal(http.ListenAndServe(":8080", serveHTTP(mux))) } diff --git a/server/guest/handler.go b/server/guest/handler.go index 153a633..418c223 100644 --- a/server/guest/handler.go +++ b/server/guest/handler.go @@ -12,8 +12,8 @@ import ( ) var ( - guestRegex = regexp.MustCompile(`^/guest/*$`) - guestIDRegex = regexp.MustCompile(`^/guest/([0-9]+)$`) + guestRegex = regexp.MustCompile(`^/guests/*$`) + guestIDRegex = regexp.MustCompile(`^/guests/([0-9]+)$`) ) type GuestHandler struct { @@ -43,7 +43,7 @@ func (guestHandler *GuestHandler) ServeHTTP(responseWriter http.ResponseWriter, switch { case request.Method == http.MethodOptions: responseWriter.WriteHeader(http.StatusOK) - case request.Method == http.MethodPost && request.URL.Path == "/guest/login": + case request.Method == http.MethodPost && request.URL.Path == "/guests/login": guestHandler.handleLogIn(responseWriter, request) case request.Method == http.MethodPut && guestIDRegex.MatchString(request.URL.Path): guestHandler.handlePut(responseWriter, request) diff --git a/server/test/guest_test.go b/server/test/guest_test.go index 206837a..f6cc243 100644 --- a/server/test/guest_test.go +++ b/server/test/guest_test.go @@ -63,7 +63,7 @@ func TestUpdateRSVP(test *testing.T) { func logInGuest(guestHandler *guest.GuestHandler, test *testing.T) guest.LoginResponse { response := httptest.NewRecorder() loginRequest, err := http.NewRequest(http.MethodPost, - "http://localhost:8080/guest/login", strings.NewReader(getName())) + "http://localhost:8080/guests/login", strings.NewReader(getName())) if err != nil { test.Error(err) } @@ -79,7 +79,7 @@ func logInGuest(guestHandler *guest.GuestHandler, test *testing.T) guest.LoginRe func addPartyGuest(guestHandler *guest.GuestHandler, token string, test *testing.T) { response := httptest.NewRecorder() guestWithParty := getGuestWithParty() - putRequest, err := http.NewRequest(http.MethodPut, "http://localhost:8080/guest/1", + putRequest, err := http.NewRequest(http.MethodPut, "http://localhost:8080/guests/1", strings.NewReader(guestWithParty)) if err != nil { test.Error(err) @@ -107,7 +107,7 @@ func logInAdmin(adminHandler *admin.AdminHandler, test *testing.T) admin.LoginRe func getGuests(guestHandler *guest.GuestHandler, token string, test *testing.T) []guest.Guest { response := httptest.NewRecorder() - getRequest, _ := http.NewRequest(http.MethodGet, "http://localhost:8080/guest/", nil) + getRequest, _ := http.NewRequest(http.MethodGet, "http://localhost:8080/guests/", nil) getRequest.Header.Set("Authorization", token) guestHandler.ServeHTTP(response, getRequest) assertEquals(test, response.Result().StatusCode, 200) @@ -120,7 +120,7 @@ func getGuests(guestHandler *guest.GuestHandler, token string, test *testing.T) func deletePartyGuest(guestHandler *guest.GuestHandler, token string, test *testing.T) { response := httptest.NewRecorder() - putRequest, err := http.NewRequest(http.MethodPut, "http://localhost:8080/guest/1", + putRequest, err := http.NewRequest(http.MethodPut, "http://localhost:8080/guests/1", strings.NewReader(getGuestWithoutParty())) if err != nil { test.Error(err) |