2FAS/2fas-server
1
0
Fork 0
mirror of https://github.com/twofas/2fas-server.git synced 2024-12-24 18:10:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor commands logging

Browse Source
This commit is contained in:
in-void 2023-03-14 22:20:06 +01:00
parent 00d5540218
commit 159a281b10
1 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
internal/api/icons/ports/http.go
View File

@ -2,7 +2,6 @@ package ports
import ( import (
"errors" "errors"
"fmt"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/go-playground/validator/v10" "github.com/go-playground/validator/v10"
"github.com/google/uuid" "github.com/google/uuid"
@ -99,9 +98,7 @@ func (r *RoutesHandler) UpdateWebService(c *gin.Context) {
return return
} }
logging.WithFields(logging.Fields{ logging.LogCommand(cmd)
"command": fmt.Sprintf("%#v", cmd),
}).Info("Start command `UpdateWebService`")
err = r.cqrs.Commands.UpdateWebService.Handle(cmd) err = r.cqrs.Commands.UpdateWebService.Handle(cmd)
@ -139,9 +136,7 @@ func (r *RoutesHandler) RemoveWebService(c *gin.Context) {
return return
} }
logging.WithFields(logging.Fields{ logging.LogCommand(cmd)
"command": fmt.Sprintf("%#v", cmd),
}).Info("Start command `DeleteWebService`")
err = r.cqrs.Commands.RemoveWebService.Handle(cmd) err = r.cqrs.Commands.RemoveWebService.Handle(cmd)
@ -165,7 +160,7 @@ func (r *RoutesHandler) RemoveAllWebServices(c *gin.Context) {
r.cqrs.Commands.RemoveAllWebServices.Handle(cmd) r.cqrs.Commands.RemoveAllWebServices.Handle(cmd)
c.JSON(200, api.NewOk("Web services has been removed.")) c.JSON(200, api.NewOk("Web services have been removed."))
} }
func (r *RoutesHandler) FindWebService(c *gin.Context) { func (r *RoutesHandler) FindWebService(c *gin.Context) {
@ -265,9 +260,7 @@ func (r *RoutesHandler) CreateIcon(c *gin.Context) {
return return
} }
logging.WithFields(logging.Fields{ logging.LogCommand(cmd)
"command": fmt.Sprintf("%#v", cmd),
}).Info("Start command `CreateIcon`")
err = r.cqrs.Commands.CreateIcon.Handle(cmd) err = r.cqrs.Commands.CreateIcon.Handle(cmd)
@ -306,9 +299,7 @@ func (r *RoutesHandler) UpdateIcon(c *gin.Context) {
return return
} }
logging.WithFields(logging.Fields{ logging.LogCommand(cmd)
"command": fmt.Sprintf("%#v", cmd),
}).Info("Start command `UpdateIcon`")
if err != nil { if err != nil {
var iconNotFound *adapters.IconCouldNotBeFound var iconNotFound *adapters.IconCouldNotBeFound
@ -359,9 +350,7 @@ func (r *RoutesHandler) RemoveIcon(c *gin.Context) {
return return
} }
logging.WithFields(logging.Fields{ logging.LogCommand(cmd)
"command": fmt.Sprintf("%#v", cmd),
}).Info("Start command `DeleteIcon`")
err = r.cqrs.Commands.RemoveIcon.Handle(cmd) err = r.cqrs.Commands.RemoveIcon.Handle(cmd)
@ -385,7 +374,7 @@ func (r *RoutesHandler) RemoveAllIcons(c *gin.Context) {
r.cqrs.Commands.RemoveAllIcons.Handle(cmd) r.cqrs.Commands.RemoveAllIcons.Handle(cmd)
c.JSON(200, api.NewOk("Icons has been removed.")) c.JSON(200, api.NewOk("Icons have been removed."))
} }
func (r *RoutesHandler) FindIcon(c *gin.Context) { func (r *RoutesHandler) FindIcon(c *gin.Context) {
@ -521,7 +510,7 @@ func (r *RoutesHandler) RemoveIconRequest(c *gin.Context) {
func (r *RoutesHandler) RemoveAllIconsRequests(c *gin.Context) { func (r *RoutesHandler) RemoveAllIconsRequests(c *gin.Context) {
r.cqrs.Commands.RemoveAllIconsRequests.Handle() r.cqrs.Commands.RemoveAllIconsRequests.Handle()
c.JSON(200, api.NewOk("Icons requests has been removed.")) c.JSON(200, api.NewOk("Icons requests have been removed."))
} }
func (r *RoutesHandler) UpdateWebServiceFromIconRequest(c *gin.Context) { func (r *RoutesHandler) UpdateWebServiceFromIconRequest(c *gin.Context) {
@ -572,8 +561,6 @@ func (r *RoutesHandler) TransformToWebService(c *gin.Context) {
c.BindUri(cmd) c.BindUri(cmd)
logging.LogCommand(cmd)
err := r.validator.Struct(cmd) err := r.validator.Struct(cmd)
if err != nil { if err != nil {
@ -582,6 +569,8 @@ func (r *RoutesHandler) TransformToWebService(c *gin.Context) {
return return
} }
logging.LogCommand(cmd)
err = r.cqrs.Commands.TransformIconRequestToWebService.Handle(cmd) err = r.cqrs.Commands.TransformIconRequestToWebService.Handle(cmd)
if err != nil { if err != nil {
@ -675,17 +664,13 @@ func (r *RoutesHandler) CreateIconsCollection(c *gin.Context) {
err := r.validator.Struct(cmd) err := r.validator.Struct(cmd)
logging.Info("Start command", cmd)
if err != nil { if err != nil {
validationErrors := err.(validator.ValidationErrors) validationErrors := err.(validator.ValidationErrors)
c.JSON(400, api.NewBadRequestError(validationErrors)) c.JSON(400, api.NewBadRequestError(validationErrors))
return return
} }
logging.WithFields(logging.Fields{ logging.LogCommand(cmd)
"command": fmt.Sprintf("%#v", cmd),
}).Info("Start command `CreateIconsCollection`")
err = r.cqrs.Commands.CreateIconsCollection.Handle(cmd) err = r.cqrs.Commands.CreateIconsCollection.Handle(cmd)
@ -716,16 +701,14 @@ func (r *RoutesHandler) UpdateIconsCollection(c *gin.Context) {
err := r.validator.Struct(cmd) err := r.validator.Struct(cmd)
logging.WithFields(logging.Fields{
"command": fmt.Sprintf("%#v", cmd),
}).Info("Start command `UpdateIconsCollection`")
if err != nil { if err != nil {
validationErrors := err.(validator.ValidationErrors) validationErrors := err.(validator.ValidationErrors)
c.JSON(400, api.NewBadRequestError(validationErrors)) c.JSON(400, api.NewBadRequestError(validationErrors))
return return
} }
logging.LogCommand(cmd)
if err != nil { if err != nil {
var notFound *adapters.IconsCollectionCouldNotBeFound var notFound *adapters.IconsCollectionCouldNotBeFound