From d18414e468544d86190775272964243aec60d918 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Wed, 16 Sep 2020 15:35:35 +0200 Subject: [PATCH] Person: Rename optional UserUUID to GlobalUID #98 #144 Signed-off-by: Michael Mayer --- frontend/src/model/user.js | 2 +- internal/entity/address.go | 2 +- internal/entity/person.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/model/user.js b/frontend/src/model/user.js index 90cc1d8a5..105e5b1b6 100644 --- a/frontend/src/model/user.js +++ b/frontend/src/model/user.js @@ -39,7 +39,7 @@ export class User extends RestModel { UID: "", Address: {}, ParentUID: "", - UUID: "", + GlobalUID: "", UserName: "", DisplayName: "", DisplayLocation: "", diff --git a/internal/entity/address.go b/internal/entity/address.go index ee37a55c9..91870e6f8 100644 --- a/internal/entity/address.go +++ b/internal/entity/address.go @@ -11,7 +11,7 @@ type Addresses []Address type Address struct { ID int `gorm:"primary_key" json:"ID" yaml:"ID"` CellID string `gorm:"type:VARBINARY(42);index;default:'zz'" json:"CellID" yaml:"CellID"` - AddressUUID string `gorm:"type:VARBINARY(42);index;" json:"UUID" yaml:"UUID,omitempty"` + GlobalUID string `gorm:"type:VARBINARY(42);index;" json:"GlobalUID" yaml:"GlobalUID,omitempty"` AddressLat float32 `gorm:"type:FLOAT;index;" json:"Lat" yaml:"Lat,omitempty"` AddressLng float32 `gorm:"type:FLOAT;index;" json:"Lng" yaml:"Lng,omitempty"` AddressLine1 string `gorm:"size:255;" json:"Line1" yaml:"Line1,omitempty"` diff --git a/internal/entity/person.go b/internal/entity/person.go index 4f91d8556..fdd1e3d48 100644 --- a/internal/entity/person.go +++ b/internal/entity/person.go @@ -19,7 +19,7 @@ type Person struct { AddressID int `gorm:"default:1" json:"-" yaml:"-"` PersonUID string `gorm:"type:VARBINARY(42);unique_index;" json:"UID" yaml:"UID"` ParentUID string `gorm:"type:VARBINARY(42);" json:"ParentUID" yaml:"ParentUID,omitempty"` - UserUUID string `gorm:"type:VARBINARY(42);index;" json:"UUID" yaml:"UUID,omitempty"` + GlobalUID string `gorm:"type:VARBINARY(42);index;" json:"GlobalUID" yaml:"GlobalUID,omitempty"` UserName string `gorm:"size:64;" json:"UserName" yaml:"UserName,omitempty"` DisplayName string `gorm:"size:128;" json:"DisplayName" yaml:"DisplayName,omitempty"` DisplayLocation string `gorm:"size:128;" json:"DisplayLocation" yaml:"DisplayLocation,omitempty"`