merch-tracker-v2/merch-api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

log wrappers refactor

Browse source
This commit is contained in:
nquidox 2026-03-08 15:12:17 +03:00
parent bf193c7d90
commit 40344d47b5
3 changed files with 46 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

44
internal/merch/controller.go
View file

@ -9,6 +9,8 @@ import (
"net/http"
)
const controllerLogHeader string = "[Controller]"
type controller struct {
service *service
utils utils.Utils
@ -54,13 +56,13 @@ func (co *controller) create(c *gin.Context) {
var newMerch newMerchDTO
if err := c.ShouldBindJSON(&newMerch); err != nil {
c.JSON(http.StatusBadRequest, responses.BadRequest{Error: err.Error()})
logErrController(err)
logErr(controllerLogHeader, err)
return
}
if err := co.service.createMerch(c, getUserId(c), &newMerch); err != nil {
c.JSON(http.StatusInternalServerError, responses.InternalServerError{Error: err.Error()})
logErrController(err)
logErr(controllerLogHeader, err)
return
}
@ -85,7 +87,7 @@ func (co *controller) getMany(c *gin.Context) {
response, err := co.service.getMany(c, getUserId(c))
if err != nil {
c.JSON(http.StatusInternalServerError, responses.InternalServerError{Error: err.Error()})
logErrController(err)
logErr(controllerLogHeader, err)
return
}
@ -115,27 +117,27 @@ func (co *controller) updateMerch(c *gin.Context) {
merchUuid := c.Param("id")
if err := uuid.Validate(merchUuid); err != nil {
c.JSON(http.StatusBadRequest, responses.BadRequest{Error: err.Error()})
logErrController(err)
logErr(controllerLogHeader, err)
return
}
var payload updateMerchDTO
if err := c.ShouldBindJSON(&payload); err != nil {
c.JSON(http.StatusBadRequest, responses.BadRequest{Error: err.Error()})
logErrController(err)
logErr(controllerLogHeader, err)
return
}
if merchUuid != payload.MerchUuid {
c.JSON(http.StatusBadRequest, responses.BadRequest{Error: "MerchUuid does not match"})
logErrController(errors.New("MerchUuid does not match"))
logErr(controllerLogHeader, errors.New("MerchUuid does not match"))
return
}
response, err := co.service.updateMerch(c, getUserId(c), &payload)
if err != nil {
c.JSON(http.StatusInternalServerError, responses.InternalServerError{Error: err.Error()})
logErrController(err)
logErr(controllerLogHeader, err)
return
}
@ -160,27 +162,27 @@ func (co *controller) updateExtraData(c *gin.Context) {
merchUuid := c.Param("id")
if err := uuid.Validate(merchUuid); err != nil {
c.JSON(http.StatusBadRequest, responses.BadRequest{Error: err.Error()})
logErrController(err)
logErr(controllerLogHeader, err)
return
}
var payload extraDataDTO
if err := c.ShouldBindJSON(&payload); err != nil {
c.JSON(http.StatusBadRequest, responses.BadRequest{Error: err.Error()})
logErrController(err)
logErr(controllerLogHeader, err)
return
}
if merchUuid != payload.MerchUuid {
c.JSON(http.StatusBadRequest, responses.BadRequest{Error: "MerchUuid does not match"})
logErrController(errors.New("MerchUuid does not match"))
logErr(controllerLogHeader, errors.New("MerchUuid does not match"))
return
}
response, err := co.service.updateExtraData(c, getUserId(c), &payload)
if err != nil {
c.JSON(http.StatusInternalServerError, responses.InternalServerError{Error: err.Error()})
logErrController(err)
logErr(controllerLogHeader, err)
return
}
@ -203,13 +205,13 @@ func (co *controller) deleteMerch(c *gin.Context) {
merchUuid := c.Param("id")
if err := uuid.Validate(merchUuid); err != nil {
c.JSON(http.StatusBadRequest, responses.BadRequest{Error: err.Error()})
logErrController(err)
logErr(controllerLogHeader, err)
return
}
if err := co.service.deleteOneMerchRecord(c, getUserId(c), merchUuid); err != nil {
c.JSON(http.StatusInternalServerError, responses.InternalServerError{Error: err.Error()})
logErrController(err)
logErr(controllerLogHeader, err)
return
}
@ -233,17 +235,17 @@ func (co *controller) createOrigin(c *gin.Context) {
if err := c.ShouldBindJSON(&origin); err != nil {
c.JSON(http.StatusBadRequest, responses.BadRequest{Error: err.Error()})
logErrController(err)
logErr(controllerLogHeader, err)
return
}
if err := co.service.createOrigin(c, origin); err != nil {
c.JSON(http.StatusInternalServerError, responses.InternalServerError{Error: err.Error()})
logErrController(err)
logErr(controllerLogHeader, err)
return
}
logDebugController("create origin success")
logDebug(controllerLogHeader, "create origin success")
c.Status(http.StatusCreated)
}
@ -263,11 +265,11 @@ func (co *controller) getOrigins(c *gin.Context) {
response, err := co.service.getOrigins(c)
if err != nil {
c.JSON(http.StatusInternalServerError, responses.InternalServerError{Error: err.Error()})
logErrController(err)
logErr(controllerLogHeader, err)
return
}
logDebugController("get origins success")
logDebug(controllerLogHeader, "get origins success")
c.JSON(http.StatusOK, response)
}
@ -288,16 +290,16 @@ func (co *controller) deleteOrigin(c *gin.Context) {
if err := c.ShouldBindJSON(&origin); err != nil {
c.JSON(http.StatusBadRequest, responses.BadRequest{Error: err.Error()})
logErrController(err)
logErr(controllerLogHeader, err)
return
}
if err := co.service.deleteOrigin(c, origin); err != nil {
c.JSON(http.StatusInternalServerError, responses.InternalServerError{Error: err.Error()})
logErrController(err)
logErr(controllerLogHeader, err)
return
}
logDebugController("delete origin success")
logDebug(controllerLogHeader, "delete origin success")
c.Status(http.StatusNoContent)
}