ziggi/mstore
1
0
Fork 0
Code Pull Requests Actions Packages Projects Releases Wiki Activity

working commit

Browse Source
This commit is contained in:
Олег Бородин
2026-02-20 19:08:26 +02:00
parent f973293315
commit 3220e2d78f
32 changed files with 195 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/descr/account.go
+6 -9
View File
@@ -9,28 +9,25 @@
*/
package descr
import (
"mstore/pkg/uuid"
)
type Account struct {
ID uuid.UUID `json:"id" db:"id"`
ID uint64 `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 uuid.UUID `json:"createdBy" db:"created_by"`
UpdatedBy uuid.UUID `json:"updatedBy" db:"updated_by"`
CreatedBy uint64 `json:"createdBy" db:"created_by"`
UpdatedBy uint64 `json:"updatedBy" db:"updated_by"`
}
type AccountShort struct {
ID uuid.UUID `json:"id"`
ID uint64 `json:"id"`
Username string `json:"username"`
Disabled bool `json:"disabled"`
CreatedAt string `json:"createdAt"`
UpdatedAt string `json:"updatedAt"`
CreatedBy uuid.UUID `json:"createdBy"`
UpdatedBy uuid.UUID `json:"updatedBy"`
CreatedBy uint64 `json:"createdBy"`
UpdatedBy uint64 `json:"updatedBy"`
Grants []Grant `json:"grants"`
}
pkg/descr/blob.go
+3 -7
View File
@@ -9,12 +9,8 @@
*/
package descr
import (
"mstore/pkg/uuid"
)
type Blob struct {
ID uuid.UUID `db:"id" json:"id"`
ID uint64 `db:"id" json:"id"`
Name string `db:"name" json:"name"`
Reference string `db:"reference" json:"reference"`
MediaType string `db:"mediaType" json:"mediaType"`
@@ -22,6 +18,6 @@ type Blob struct {
Size int64 `db:"size" json:"size"`
CreatedAt string `db:"created_at" json:"createdAt"`
UpdatedAt string `db:"updated_at" json:"updatedAt"`
CreatedBy uuid.UUID `db:"created_by" json:"createdBy,omitempty"`
UpdatedBy uuid.UUID `db:"updated_by" json:"updatedBy,omitempty"`
CreatedBy uint64 `db:"created_by" json:"createdBy,omitempty"`
UpdatedBy uint64 `db:"updated_by" json:"updatedBy,omitempty"`
}
pkg/descr/file.go
+3 -7
View File
@@ -9,12 +9,8 @@
*/
package descr
import (
"mstore/pkg/uuid"
)
type File struct {
ID uuid.UUID `db:"id" json:"id,omitempty" yaml:"id,omitempty"`
ID uint64 `db:"id" json:"id,omitempty" yaml:"id,omitempty"`
Collection string `db:"collection" json:"collection,omitempty" yaml:"collection,omitempty"`
Name string `db:"name" json:"name,omitempty" yaml:"name,omitempty"`
Type string `db:"type" json:"type,omitempty" yaml:"type,omitempty"`
@@ -22,6 +18,6 @@ type File struct {
Size int64 `db:"size" json:"size,omitempty" yaml:"size,omitempty"`
CreatedAt string `db:"created_at" json:"createdAt,omitempty" yaml:"createdAt,omitempty"`
UpdatedAt string `db:"updated_at" json:"updatedAt,omitempty" yaml:"updatedAt,omitempty"`
CreatedBy uuid.UUID `db:"created_by" json:"createdBy,omitempty" yaml:"createdBy,omitempty"`
UpdatedBy uuid.UUID `db:"updated_by" json:"updatedBy,omitempty" yaml:"updatedBy,omitempty"`
CreatedBy uint64 `db:"created_by" json:"createdBy,omitempty" yaml:"createdBy,omitempty"`
UpdatedBy uint64 `db:"updated_by" json:"updatedBy,omitempty" yaml:"updatedBy,omitempty"`
}
pkg/descr/grant.go
+4 -5
View File
@@ -12,16 +12,15 @@ package descr
import (
"mstore/pkg/term"
"mstore/pkg/uuid"
)
type Grant struct {
ID uuid.UUID `json:"id" db:"id"`
AccountID uuid.UUID `json:"accountID" db:"account_id"`
ID uint64 `json:"id" db:"id"`
AccountID uint64 `json:"accountID" db:"account_id"`
Right term.Right `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 uuid.UUID `json:"createdBy" db:"created_by"`
UpdatedBy uuid.UUID `json:"updatedBy" db:"updated_by"`
CreatedBy uint64 `json:"createdBy" db:"created_by"`
UpdatedBy uint64 `json:"updatedBy" db:"updated_by"`
}
pkg/descr/manifest.go
+3 -7
View File
@@ -9,12 +9,8 @@
*/
package descr
import (
"mstore/pkg/uuid"
)
type Manifest struct {
ID uuid.UUID `db:"id" json:"id"`
ID uint64 `db:"id" json:"id"`
Name string `db:"name" json:"name"`
Reference string `db:"reference" json:"reference"`
ContentType string `db:"contentType" json:"contentType"`
@@ -22,8 +18,8 @@ type Manifest struct {
Digest string `db:"digest" json:"digest"`
CreatedAt string `db:"created_at" json:"createdAt"`
UpdatedAt string `db:"updated_at" json:"updatedAt"`
CreatedBy uuid.UUID `db:"created_by" json:"createdBy,omitempty"`
UpdatedBy uuid.UUID `db:"updated_by" json:"updatedBy,omitempty"`
CreatedBy uint64 `db:"created_by" json:"createdBy,omitempty"`
UpdatedBy uint64 `db:"updated_by" json:"updatedBy,omitempty"`
}
type Tags struct {