From 69e5d7886636a28218c8725dcaf013975ac50445 Mon Sep 17 00:00:00 2001 From: kandrusyak Date: Tue, 18 Jul 2023 01:21:19 +0300 Subject: [PATCH] replace id type --- model/organization.go | 6 +++--- model/position.go | 14 +++++++------- model/user.go | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/model/organization.go b/model/organization.go index 7e53592..26e8030 100644 --- a/model/organization.go +++ b/model/organization.go @@ -9,11 +9,11 @@ type Organization struct { ID uuid.UUID `gorm:"type:uuid;default:gen_random_uuid();primarykey"` gorm.Model Name string `json:"name" gorm:"unique;index"` - ParentID uint `json:"parent_id"` + ParentID uuid.UUID `json:"parent_id"` Positions []Position `json:"positions,omitempty"` } type OrganizationApi struct { - Name string `json:"name" gorm:"unique;index"` - ParentID uint `json:"parent_id"` + Name string `json:"name" gorm:"unique;index"` + ParentID uuid.UUID `json:"parent_id"` } diff --git a/model/position.go b/model/position.go index 5e26bbc..8cf98ea 100644 --- a/model/position.go +++ b/model/position.go @@ -8,14 +8,14 @@ import ( type Position struct { ID uuid.UUID `gorm:"type:uuid;default:gen_random_uuid();primarykey"` gorm.Model - Name string `json:"name" gorm:"unique;index"` - RightMask int `json:"right_mask"` - OrganizationID uint `json:"organization_id" gorm:"index;not null"` - Users []User `json:"users,omitempty"` + Name string `json:"name" gorm:"unique;index"` + RightMask int `json:"right_mask"` + OrganizationID uuid.UUID `json:"organization_id" gorm:"index;not null"` + Users []User `json:"users,omitempty"` } type PositionApi struct { - Name string `json:"name" gorm:"unique;index"` - RightMask int `json:"right_mask"` - OrganizationID uint `json:"organization_id" gorm:"index;not null"` + 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 274974d..06e5cc7 100644 --- a/model/user.go +++ b/model/user.go @@ -15,10 +15,10 @@ type ( ) type APIUser struct { - UserName string `json:"user_name" gorm:"unique;index"` - Password string `json:"password,omitempty"` - FirstName string `json:"first_name"` - LastName string `json:"last_name"` - Role string `json:"role" gorm:"default:employee"` - PositionID uint `json:"position_id,omitempty"` + UserName string `json:"user_name" gorm:"unique;index"` + Password string `json:"password,omitempty"` + FirstName string `json:"first_name"` + LastName string `json:"last_name"` + Role string `json:"role" gorm:"default:employee"` + PositionID uuid.UUID `json:"position_id,omitempty"` }