fix response format

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)

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 {

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"`

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"`