Skip to content

Commit

Permalink
Merge pull request #29 from RianIhsan/improvement/error-handling
Browse files Browse the repository at this point in the history
improvement:error handling
  • Loading branch information
RianIhsan authored Oct 31, 2023
2 parents 0f4acc0 + 6d9a507 commit b0e4ed4
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions handler/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func (h *adminHandler) GetAllUsers(c *gin.Context) {
users, totalPages, currentPage, nextPage, prevPage, err = h.service.GetUsersPagination(page, pageSize)
}
if err != nil {
response := helper.ErrorResponse("Error to get users", err)
response := helper.ErrorResponse("Error to get users", err.Error())
c.JSON(http.StatusBadRequest, response)
return
}
Expand Down Expand Up @@ -89,7 +89,7 @@ func (h *adminHandler) GetAllUsersTransactions(c *gin.Context) {
transactions, totalPages, currentPage, nextPage, prevPage, err = h.service.GetTransactionsPagination(page, pageSize)
}
if err != nil {
response := helper.ErrorResponse("Error to get transactions", err)
response := helper.ErrorResponse("Error to get transactions", err.Error())
c.JSON(http.StatusBadRequest, response)
return
}
Expand Down
10 changes: 5 additions & 5 deletions handler/campaign.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func (h *campaignHandler) GetCampaigns(c *gin.Context) {
}

if err != nil {
response := helper.ErrorResponse("Error to get campaigns", err)
response := helper.ErrorResponse("Error to get campaigns", err.Error())
c.JSON(http.StatusBadRequest, response)
return
}
Expand All @@ -67,14 +67,14 @@ func (h *campaignHandler) GetCampaign(c *gin.Context) {
var input campaign.GetCampaignDetailInput
err := c.ShouldBindUri(&input)
if err != nil {
response := helper.ErrorResponse("Failed to get campaign 1", err)
response := helper.ErrorResponse("Failed to get campaign", err.Error())
c.JSON(http.StatusBadRequest, response)
return
}

campaignDetails, err := h.service.FindCampaignByID(input)
if err != nil {
response := helper.ErrorResponse("Failed to get campaign 2", err)
response := helper.ErrorResponse("Failed to get campaign", err.Error())
c.JSON(http.StatusBadRequest, response)
return
}
Expand All @@ -99,7 +99,7 @@ func (h *campaignHandler) CreateCampaign(c *gin.Context) {

newCampaign, err := h.service.CreateCampaign(input)
if err != nil {
response := helper.ErrorResponse("Failed create campaign", err)
response := helper.ErrorResponse("Failed create campaign", err.Error())
c.JSON(http.StatusBadRequest, response)
return
}
Expand All @@ -112,7 +112,7 @@ func (h *campaignHandler) UpdateCampaign(c *gin.Context) {
var input campaign.GetCampaignDetailInput
err := c.ShouldBindUri(&input)
if err != nil {
response := helper.ErrorResponse("Failed to update campaign", err)
response := helper.ErrorResponse("Failed to update campaign", err.Error())
c.JSON(http.StatusBadRequest, response)
return
}
Expand Down
4 changes: 2 additions & 2 deletions handler/transaction.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,14 @@ func (h transactionHandler) GetNotification(c *gin.Context) {
var input transaction.TransactionNotifyInput
err := c.ShouldBindJSON(&input)
if err != nil {
response := helper.ErrorResponse("Failed to process notification", err)
response := helper.ErrorResponse("Failed to process notification", err.Error())
c.JSON(http.StatusBadRequest, response)
return
}

err = h.service.ProsesPayment(input)
if err != nil {
response := helper.ErrorResponse("Failed to process notification", err)
response := helper.ErrorResponse("Failed to process notification", err.Error())
c.JSON(http.StatusBadRequest, response)
return
}
Expand Down
4 changes: 2 additions & 2 deletions handler/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,14 @@ func (h *userHandler) VerifyEmail(c *gin.Context) {
var payload user.VerifyEmailPayload

if err := c.ShouldBindJSON(&payload); err != nil {
response := helper.ErrorResponse("VerifyEmail failed", err)
response := helper.ErrorResponse("VerifyEmail failed", err.Error())
c.JSON(http.StatusUnprocessableEntity, response)
return
}

err := h.userService.VerifyEmail(payload.Email, payload.OTP)
if err != nil {
response := helper.ErrorResponse("VerifyEmail failed", err)
response := helper.ErrorResponse("VerifyEmail failed", err.Error())
c.JSON(http.StatusUnprocessableEntity, response)
return
}
Expand Down

0 comments on commit b0e4ed4

Please sign in to comment.