diff --git a/handler/users.go b/handler/users.go index 522548e..2c6039b 100644 --- a/handler/users.go +++ b/handler/users.go @@ -23,7 +23,7 @@ func (h *Handler) GetCurrentUser(c echo.Context) error { u := new(model.User) - tx := h.DB.Where("id = ?", userId).First(&u) + tx := h.DB.Preload("Position").Where("id = ?", userId).First(&u) if tx.RowsAffected == 0 { return c.NoContent(http.StatusNotFound) diff --git a/model/organization.go b/model/organization.go index d8bcd77..9eeb478 100644 --- a/model/organization.go +++ b/model/organization.go @@ -6,11 +6,11 @@ import ( ) type Organization struct { - gorm.Model - ID uuid.UUID `gorm:"type:uuid;default:gen_random_uuid();primarykey"` - Name string `json:"name" gorm:"unique;index"` - ParentID uuid.UUID `json:"parent_id"` - Positions []Position `json:"positions,omitempty"` + gorm.Model `json:"meta"` + ID uuid.UUID `json:"id" gorm:"type:uuid;default:gen_random_uuid();primarykey"` + Name string `json:"name" gorm:"unique;index"` + ParentID uuid.UUID `json:"parent_id"` + Positions []Position `json:"positions,omitempty"` } type OrganizationApi struct { diff --git a/model/position.go b/model/position.go index e6924af..577ca29 100644 --- a/model/position.go +++ b/model/position.go @@ -6,8 +6,8 @@ import ( ) type Position struct { - gorm.Model - ID uuid.UUID `gorm:"type:uuid;default:gen_random_uuid();primarykey"` + gorm.Model `json:"meta"` + ID uuid.UUID `json:"id" gorm:"type:uuid;default:gen_random_uuid();primarykey"` Name string `json:"name" gorm:"unique;index"` RightMask int `json:"right_mask"` OrganizationID uuid.UUID `json:"organization_id" gorm:"index;not null"` diff --git a/model/user.go b/model/user.go index c74451c..a22beb3 100644 --- a/model/user.go +++ b/model/user.go @@ -7,8 +7,8 @@ import ( type ( User struct { - gorm.Model - ID uuid.UUID `gorm:"type:uuid;default:gen_random_uuid();primarykey"` + gorm.Model `json:"meta"` + ID uuid.UUID `json:"id" gorm:"type:uuid;default:gen_random_uuid();primarykey"` APIUser Position Position `gorm:"-:migration"` Avatar string `json:"avatar"`