diff --git a/api/v1/users/users.go b/api/v1/users/users.go index 1bf1c43..e5337dd 100644 --- a/api/v1/users/users.go +++ b/api/v1/users/users.go @@ -2,7 +2,7 @@ package users import ( "git.devices.local/mawas/golang-api-skeleton/lib/cache" - "git.devices.local/mawas/golang-api-skeleton/lib/common" + "git.devices.local/mawas/golang-api-skeleton/lib/response" "git.devices.local/mawas/golang-api-skeleton/repositories" "git.devices.local/mawas/golang-api-skeleton/services" "github.com/gin-gonic/gin" @@ -12,7 +12,7 @@ import ( func Read(c *gin.Context) { db := c.MustGet("db").(*gorm.DB) cc := c.MustGet("cache").(cache.Cache) - response := common.Envelope{ + response := response.Envelope{ RequestID: c.MustGet("requestID").(string), } userRepo := repositories.NewUserRepository(db, "01F5FSJXDHWT4HK93B9NB8V5G4", "test", cc) diff --git a/lib/common/common.go b/lib/common/common.go index 098694b..5cc29af 100644 --- a/lib/common/common.go +++ b/lib/common/common.go @@ -99,28 +99,3 @@ func (guidPK *ModelHiddenGUIDPK) BeforeCreate(tx *gorm.DB) error { } return err } - -// Envelope for response objects -type Envelope struct { - Success bool `json:"success"` - RequestID string `json:"request_id,omitempty"` - Warnings []string `json:"warnings,omitempty"` - Errors []string `json:"errors,omitempty"` - // PaginationInfo *pagination.Pagination `json:"pagination_info,omitempty"` - Result interface{} `json:"result,omitempty"` -} - -// AppendError to envelope -func (envelope *Envelope) AppendError(err error) *Envelope { - envelope.Success = false - envelope.Result = nil - envelope.Errors = append(envelope.Errors, err.Error()) - return envelope -} - -// SetSuccess to envelope -func (envelope *Envelope) SetSuccess(result interface{}) *Envelope { - envelope.Success = true - envelope.Result = result - return envelope -} diff --git a/lib/response/response.go b/lib/response/response.go new file mode 100644 index 0000000..040fa83 --- /dev/null +++ b/lib/response/response.go @@ -0,0 +1,26 @@ +package response + +// Envelope for response objects +type Envelope struct { + Success bool `json:"success"` + RequestID string `json:"request_id,omitempty"` + Warnings []string `json:"warnings,omitempty"` + Errors []string `json:"errors,omitempty"` + // PaginationInfo *pagination.Pagination `json:"pagination_info,omitempty"` + Result interface{} `json:"result,omitempty"` +} + +// AppendError to envelope +func (envelope *Envelope) AppendError(err error) *Envelope { + envelope.Success = false + envelope.Result = nil + envelope.Errors = append(envelope.Errors, err.Error()) + return envelope +} + +// SetSuccess to envelope +func (envelope *Envelope) SetSuccess(result interface{}) *Envelope { + envelope.Success = true + envelope.Result = result + return envelope +}