admin/astra-users
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix response format

Browse Source
This commit is contained in:
andrusyakka
2023-08-16 13:59:17 +03:00
parent fe1e913348
commit 8bfbee4fe2
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
handler/users.go
View File

@@ -23,7 +23,7 @@ func (h *Handler) GetCurrentUser(c echo.Context) error {
u := new(model.User) 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 { if tx.RowsAffected == 0 {
return c.NoContent(http.StatusNotFound) return c.NoContent(http.StatusNotFound)

10
model/organization.go
View File

@@ -6,11 +6,11 @@ import (
) )
type Organization struct { type Organization struct {
gorm.Model gorm.Model `json:"meta"`
ID uuid.UUID `gorm:"type:uuid;default:gen_random_uuid();primarykey"` ID uuid.UUID `json:"id" gorm:"type:uuid;default:gen_random_uuid();primarykey"`
Name string `json:"name" gorm:"unique;index"` Name string `json:"name" gorm:"unique;index"`
ParentID uuid.UUID `json:"parent_id"` ParentID uuid.UUID `json:"parent_id"`
Positions []Position `json:"positions,omitempty"` Positions []Position `json:"positions,omitempty"`
} }
type OrganizationApi struct { type OrganizationApi struct {

4
model/position.go
View File

@@ -6,8 +6,8 @@ import (
) )
type Position struct { type Position struct {
gorm.Model gorm.Model `json:"meta"`
ID uuid.UUID `gorm:"type:uuid;default:gen_random_uuid();primarykey"` ID uuid.UUID `json:"id" gorm:"type:uuid;default:gen_random_uuid();primarykey"`
Name string `json:"name" gorm:"unique;index"` Name string `json:"name" gorm:"unique;index"`
RightMask int `json:"right_mask"` RightMask int `json:"right_mask"`
OrganizationID uuid.UUID `json:"organization_id" gorm:"index;not null"` OrganizationID uuid.UUID `json:"organization_id" gorm:"index;not null"`

4
model/user.go
View File

@@ -7,8 +7,8 @@ import (
type ( type (
User struct { User struct {
gorm.Model gorm.Model `json:"meta"`
ID uuid.UUID `gorm:"type:uuid;default:gen_random_uuid();primarykey"` ID uuid.UUID `json:"id" gorm:"type:uuid;default:gen_random_uuid();primarykey"`
APIUser APIUser
Position Position `gorm:"-:migration"` Position Position `gorm:"-:migration"`
Avatar string `json:"avatar"` Avatar string `json:"avatar"`