@@ -2,8 +2,8 @@ package user
22
33import (
44 "context"
5+ "github.com/core-go/core"
56 "github.com/core-go/search"
6- sv "github.com/core-go/service"
77 "net/http"
88 "reflect"
99)
@@ -17,64 +17,64 @@ type UserHandler interface {
1717 Delete (w http.ResponseWriter , r * http.Request )
1818}
1919
20- func NewUserHandler (find func (context.Context , interface {}, interface {}, int64 , ... int64 ) (int64 , string , error ), service UserService , status sv .StatusConfig , logError func (context.Context , string ), validate func (context.Context , interface {}) ([]sv .ErrorMessage , error ), action * sv .ActionConfig ) UserHandler {
20+ func NewUserHandler (find func (context.Context , interface {}, interface {}, int64 , ... int64 ) (int64 , string , error ), service UserService , status core .StatusConfig , logError func (context.Context , string , ... map [ string ] interface {} ), validate func (context.Context , interface {}) ([]core .ErrorMessage , error ), action * core .ActionConfig ) UserHandler {
2121 filterType := reflect .TypeOf (UserFilter {})
2222 modelType := reflect .TypeOf (User {})
23- params := sv .CreateParams (modelType , & status , logError , validate , action )
23+ params := core .CreateParams (modelType , & status , logError , validate , action )
2424 searchHandler := search .NewSearchHandler (find , modelType , filterType , logError , params .Log )
2525 return & userHandler {service : service , SearchHandler : searchHandler , Params : params }
2626}
2727
2828type userHandler struct {
2929 service UserService
3030 * search.SearchHandler
31- * sv .Params
31+ * core .Params
3232}
3333
3434func (h * userHandler ) Load (w http.ResponseWriter , r * http.Request ) {
35- id := sv .GetRequiredParam (w , r )
35+ id := core .GetRequiredParam (w , r )
3636 if len (id ) > 0 {
3737 res , err := h .service .Load (r .Context (), id )
38- sv .RespondModel (w , r , res , err , h .Error , nil )
38+ core .RespondModel (w , r , res , err , h .Error , nil )
3939 }
4040}
4141func (h * userHandler ) Create (w http.ResponseWriter , r * http.Request ) {
4242 var user User
43- er1 := sv .Decode (w , r , & user )
43+ er1 := core .Decode (w , r , & user )
4444 if er1 == nil {
4545 errors , er2 := h .Validate (r .Context (), & user )
46- if ! sv .HasError (w , r , errors , er2 , * h .Status .ValidationError , h .Error , h .Log , h .Resource , h .Action .Create ) {
46+ if ! core .HasError (w , r , errors , er2 , * h .Status .ValidationError , h .Error , h .Log , h .Resource , h .Action .Create ) {
4747 res , er3 := h .service .Create (r .Context (), & user )
48- sv .AfterCreated (w , r , & user , res , er3 , h .Status , h .Error , h .Log , h .Resource , h .Action .Create )
48+ core .AfterCreated (w , r , & user , res , er3 , h .Status , h .Error , h .Log , h .Resource , h .Action .Create )
4949 }
5050 }
5151}
5252func (h * userHandler ) Update (w http.ResponseWriter , r * http.Request ) {
5353 var user User
54- er1 := sv .DecodeAndCheckId (w , r , & user , h .Keys , h .Indexes )
54+ er1 := core .DecodeAndCheckId (w , r , & user , h .Keys , h .Indexes )
5555 if er1 == nil {
5656 errors , er2 := h .Validate (r .Context (), & user )
57- if ! sv .HasError (w , r , errors , er2 , * h .Status .ValidationError , h .Error , h .Log , h .Resource , h .Action .Update ) {
57+ if ! core .HasError (w , r , errors , er2 , * h .Status .ValidationError , h .Error , h .Log , h .Resource , h .Action .Update ) {
5858 res , er3 := h .service .Update (r .Context (), & user )
59- sv .HandleResult (w , r , & user , res , er3 , h .Status , h .Error , h .Log , h .Resource , h .Action .Update )
59+ core .HandleResult (w , r , & user , res , er3 , h .Status , h .Error , h .Log , h .Resource , h .Action .Update )
6060 }
6161 }
6262}
6363func (h * userHandler ) Patch (w http.ResponseWriter , r * http.Request ) {
6464 var user User
65- r , json , er1 := sv .BuildMapAndCheckId (w , r , & user , h .Keys , h .Indexes )
65+ r , json , er1 := core .BuildMapAndCheckId (w , r , & user , h .Keys , h .Indexes )
6666 if er1 == nil {
6767 errors , er2 := h .Validate (r .Context (), & user )
68- if ! sv .HasError (w , r , errors , er2 , * h .Status .ValidationError , h .Error , h .Log , h .Resource , h .Action .Patch ) {
68+ if ! core .HasError (w , r , errors , er2 , * h .Status .ValidationError , h .Error , h .Log , h .Resource , h .Action .Patch ) {
6969 res , er3 := h .service .Patch (r .Context (), json )
70- sv .HandleResult (w , r , json , res , er3 , h .Status , h .Error , h .Log , h .Resource , h .Action .Patch )
70+ core .HandleResult (w , r , json , res , er3 , h .Status , h .Error , h .Log , h .Resource , h .Action .Patch )
7171 }
7272 }
7373}
7474func (h * userHandler ) Delete (w http.ResponseWriter , r * http.Request ) {
75- id := sv .GetRequiredParam (w , r )
75+ id := core .GetRequiredParam (w , r )
7676 if len (id ) > 0 {
7777 res , err := h .service .Delete (r .Context (), id )
78- sv .HandleDelete (w , r , res , err , h .Error , h .Log , h .Resource , h .Action .Delete )
78+ core .HandleDelete (w , r , res , err , h .Error , h .Log , h .Resource , h .Action .Delete )
7979 }
8080}
0 commit comments