feat: improvements in structures
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
package handler
|
||||
package book
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
@@ -162,8 +162,8 @@ func deleteBook(service book.UseCase) http.Handler {
|
||||
})
|
||||
}
|
||||
|
||||
//MakeBookHandlers make url handlers
|
||||
func MakeBookHandlers(r *mux.Router, n negroni.Negroni, service book.UseCase) {
|
||||
//MakeHandlers make url handlers
|
||||
func MakeHandlers(r *mux.Router, n negroni.Negroni, service book.UseCase) {
|
||||
r.Handle("/v1/book", n.With(
|
||||
negroni.Wrap(listBooks(service)),
|
||||
)).Methods("GET", "OPTIONS").Name("listBooks")
|
||||
@@ -1,4 +1,4 @@
|
||||
package handler
|
||||
package book
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
@@ -24,7 +24,7 @@ func Test_listBooks(t *testing.T) {
|
||||
manager := mock.NewMockUseCase(controller)
|
||||
r := mux.NewRouter()
|
||||
n := negroni.New()
|
||||
MakeBookHandlers(r, *n, manager)
|
||||
MakeHandlers(r, *n, manager)
|
||||
path, err := r.GetRoute("listBooks").GetPathTemplate()
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, "/v1/book", path)
|
||||
@@ -74,7 +74,7 @@ func Test_createBook(t *testing.T) {
|
||||
manager := mock.NewMockUseCase(controller)
|
||||
r := mux.NewRouter()
|
||||
n := negroni.New()
|
||||
MakeBookHandlers(r, *n, manager)
|
||||
MakeHandlers(r, *n, manager)
|
||||
path, err := r.GetRoute("createBook").GetPathTemplate()
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, "/v1/book", path)
|
||||
@@ -106,7 +106,7 @@ func Test_getBook(t *testing.T) {
|
||||
manager := mock.NewMockUseCase(controller)
|
||||
r := mux.NewRouter()
|
||||
n := negroni.New()
|
||||
MakeBookHandlers(r, *n, manager)
|
||||
MakeHandlers(r, *n, manager)
|
||||
path, err := r.GetRoute("getBook").GetPathTemplate()
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, "/v1/book/{id}", path)
|
||||
@@ -133,7 +133,7 @@ func Test_deleteBook(t *testing.T) {
|
||||
manager := mock.NewMockUseCase(controller)
|
||||
r := mux.NewRouter()
|
||||
n := negroni.New()
|
||||
MakeBookHandlers(r, *n, manager)
|
||||
MakeHandlers(r, *n, manager)
|
||||
path, err := r.GetRoute("deleteBook").GetPathTemplate()
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, "/v1/book/{id}", path)
|
||||
@@ -1,4 +1,4 @@
|
||||
package handler
|
||||
package loan
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@@ -96,8 +96,8 @@ func returnBook(bookService book.UseCase, loanService loan.UseCase) http.Handler
|
||||
})
|
||||
}
|
||||
|
||||
//MakeLoanHandlers make url handlers
|
||||
func MakeLoanHandlers(r *mux.Router, n negroni.Negroni, bookService book.UseCase, userService user.UseCase, loanService loan.UseCase) {
|
||||
//MakeHandlers make url handlers
|
||||
func MakeHandlers(r *mux.Router, n negroni.Negroni, bookService book.UseCase, userService user.UseCase, loanService loan.UseCase) {
|
||||
r.Handle("/v1/loan/borrow/{book_id}/{user_id}", n.With(
|
||||
negroni.Wrap(borrowBook(bookService, userService, loanService)),
|
||||
)).Methods("GET", "OPTIONS").Name("borrowBook")
|
||||
@@ -1,4 +1,4 @@
|
||||
package handler
|
||||
package loan
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@@ -26,7 +26,7 @@ func Test_borrowBook(t *testing.T) {
|
||||
lMock := lmock.NewMockUseCase(controller)
|
||||
r := mux.NewRouter()
|
||||
n := negroni.New()
|
||||
MakeLoanHandlers(r, *n, bMock, uMock, lMock)
|
||||
MakeHandlers(r, *n, bMock, uMock, lMock)
|
||||
path, err := r.GetRoute("borrowBook").GetPathTemplate()
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, "/v1/loan/borrow/{book_id}/{user_id}", path)
|
||||
@@ -75,7 +75,7 @@ func Test_returnBook(t *testing.T) {
|
||||
lMock := lmock.NewMockUseCase(controller)
|
||||
r := mux.NewRouter()
|
||||
n := negroni.New()
|
||||
MakeLoanHandlers(r, *n, bMock, uMock, lMock)
|
||||
MakeHandlers(r, *n, bMock, uMock, lMock)
|
||||
path, err := r.GetRoute("returnBook").GetPathTemplate()
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, "/v1/loan/return/{book_id}", path)
|
||||
@@ -1,4 +1,4 @@
|
||||
package handler
|
||||
package user
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
@@ -162,8 +162,8 @@ func deleteUser(service user.UseCase) http.Handler {
|
||||
})
|
||||
}
|
||||
|
||||
//MakeUserHandlers make url handlers
|
||||
func MakeUserHandlers(r *mux.Router, n negroni.Negroni, service user.UseCase) {
|
||||
//MakeHandlers make url handlers
|
||||
func MakeHandlers(r *mux.Router, n negroni.Negroni, service user.UseCase) {
|
||||
r.Handle("/v1/user", n.With(
|
||||
negroni.Wrap(listUsers(service)),
|
||||
)).Methods("GET", "OPTIONS").Name("listUsers")
|
||||
@@ -1,4 +1,4 @@
|
||||
package handler
|
||||
package user
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
@@ -24,7 +24,7 @@ func Test_listUsers(t *testing.T) {
|
||||
m := mock.NewMockUseCase(controller)
|
||||
r := mux.NewRouter()
|
||||
n := negroni.New()
|
||||
MakeUserHandlers(r, *n, m)
|
||||
MakeHandlers(r, *n, m)
|
||||
path, err := r.GetRoute("listUsers").GetPathTemplate()
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, "/v1/user", path)
|
||||
@@ -74,7 +74,7 @@ func Test_createUser(t *testing.T) {
|
||||
m := mock.NewMockUseCase(controller)
|
||||
r := mux.NewRouter()
|
||||
n := negroni.New()
|
||||
MakeUserHandlers(r, *n, m)
|
||||
MakeHandlers(r, *n, m)
|
||||
path, err := r.GetRoute("createUser").GetPathTemplate()
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, "/v1/user", path)
|
||||
@@ -107,7 +107,7 @@ func Test_getUser(t *testing.T) {
|
||||
m := mock.NewMockUseCase(controller)
|
||||
r := mux.NewRouter()
|
||||
n := negroni.New()
|
||||
MakeUserHandlers(r, *n, m)
|
||||
MakeHandlers(r, *n, m)
|
||||
path, err := r.GetRoute("getUser").GetPathTemplate()
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, "/v1/user/{id}", path)
|
||||
@@ -134,7 +134,7 @@ func Test_deleteUser(t *testing.T) {
|
||||
m := mock.NewMockUseCase(controller)
|
||||
r := mux.NewRouter()
|
||||
n := negroni.New()
|
||||
MakeUserHandlers(r, *n, m)
|
||||
MakeHandlers(r, *n, m)
|
||||
path, err := r.GetRoute("deleteUser").GetPathTemplate()
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, "/v1/user/{id}", path)
|
||||
Reference in New Issue
Block a user