uuid used

pkg/descr/account.go

@@ -7,27 +7,30 @@
  * Distribution of this work is permitted, but commercial use and
  * modifications are strictly prohibited.
  */
-
 package descr
 
+import (
+	"mstore/pkg/auxuuid"
+)
+
 type Account struct {
-	ID        string `json:"id"         db:"id"`
-	Username  string `json:"username"   db:"username"`
-	Passhash  string `json:"passhash"   db:"passhash"`
-	Disabled  bool   `json:"disabled"   db:"disabled"`
-	CreatedAt string `json:"createdAt"  db:"created_at"`
-	UpdatedAt string `json:"updatedAt"  db:"updated_at"`
-	CreatedBy string `json:"createdBy"  db:"created_by"`
-	UpdatedBy string `json:"updatedBy"  db:"updated_by"`
+	ID        auxuuid.UUID `json:"id"         db:"id"`
+	Username  string       `json:"username"   db:"username"`
+	Passhash  string       `json:"passhash"   db:"passhash"`
+	Disabled  bool         `json:"disabled"   db:"disabled"`
+	CreatedAt string       `json:"createdAt"  db:"created_at"`
+	UpdatedAt string       `json:"updatedAt"  db:"updated_at"`
+	CreatedBy auxuuid.UUID `json:"createdBy"  db:"created_by"`
+	UpdatedBy auxuuid.UUID `json:"updatedBy"  db:"updated_by"`
 }
 
 type AccountShort struct {
-	ID        string  `json:"id"`
-	Username  string  `json:"username"`
-	Disabled  bool    `json:"disabled"`
-	CreatedAt string  `json:"createdAt"`
-	UpdatedAt string  `json:"updatedAt"`
-	CreatedBy string  `json:"createdBy"`
-	UpdatedBy string  `json:"updatedBy"`
-	Grants    []Grant `json:"grants"`
+	ID        auxuuid.UUID `json:"id"`
+	Username  string       `json:"username"`
+	Disabled  bool         `json:"disabled"`
+	CreatedAt string       `json:"createdAt"`
+	UpdatedAt string       `json:"updatedAt"`
+	CreatedBy auxuuid.UUID `json:"createdBy"`
+	UpdatedBy auxuuid.UUID `json:"updatedBy"`
+	Grants    []Grant      `json:"grants"`
 }