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

replace id type

Browse Source
This commit is contained in:
kandrusyak
2023-07-18 01:05:42 +03:00
parent 6a386e38cf
commit ec9fbfbbfd
5 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
go.mod
View File

@@ -10,6 +10,7 @@ require (
require ( require (
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgx/v5 v5.3.1 // indirect github.com/jackc/pgx/v5 v5.3.1 // indirect

2
go.sum
View File

@@ -3,6 +3,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=

6
model/organization.go
View File

@@ -1,8 +1,12 @@
package model package model
import "gorm.io/gorm" import (
"github.com/google/uuid"
"gorm.io/gorm"
)
type Organization struct { type Organization struct {
ID uuid.UUID `gorm:"type:uuid;default:gen_random_uuid();primarykey"`
gorm.Model gorm.Model
Name string `json:"name" gorm:"unique;index"` Name string `json:"name" gorm:"unique;index"`
ParentID uint `json:"parent_id"` ParentID uint `json:"parent_id"`

6
model/position.go
View File

@@ -1,8 +1,12 @@
package model package model
import "gorm.io/gorm" import (
"github.com/google/uuid"
"gorm.io/gorm"
)
type Position struct { type Position struct {
ID uuid.UUID `gorm:"type:uuid;default:gen_random_uuid();primarykey"`
gorm.Model gorm.Model
Name string `json:"name" gorm:"unique;index"` Name string `json:"name" gorm:"unique;index"`
RightMask int `json:"right_mask"` RightMask int `json:"right_mask"`

6
model/user.go
View File

@@ -1,9 +1,13 @@
package model package model
import "gorm.io/gorm" import (
"github.com/google/uuid"
"gorm.io/gorm"
)
type ( type (
User struct { User struct {
ID uuid.UUID `gorm:"type:uuid;default:gen_random_uuid();primarykey"`
gorm.Model gorm.Model
APIUser APIUser
Position Position `gorm:"-:migration"` Position Position `gorm:"-:migration"`