working commit

app/descr/account.go

@@ -22,12 +22,12 @@ type Account struct {
 }
 
 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    []GrantShort `json:"grants"`
+	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"`
 }

app/descr/grant.go

@@ -31,15 +31,6 @@ type Grant struct {
 	UpdatedBy string `json:"updatedBy"  db:"updated_by"`
 }
 
-type GrantShort struct {
-	Right     string `json:"right"  db:"right"`
-	Pattern   string `json:"pattern"    db:"pattern"`
-	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"`
-}
-
 const (
 	// Accounts
 	RightReadAccounts  = "readAccounts"  // GetAccount, ListAccounts