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

right type used

Browse Source
This commit is contained in:
Олег Бородин
2026-02-20 15:28:26 +02:00
parent 8546ad496f
commit 1c8f6f142c
18 changed files with 146 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/maindb/account.go
+4 -4
View File
@@ -3,8 +3,8 @@ package maindb
import (
"context"
"mstore/pkg/auxuuid"
"mstore/pkg/descr"
"mstore/pkg/uuid"
)
func (db *Database) InsertAccount(ctx context.Context, account *descr.Account) error {
@@ -20,7 +20,7 @@ func (db *Database) InsertAccount(ctx context.Context, account *descr.Account) e
return err
}
func (db *Database) UpdateAccountByID(ctx context.Context, accountID auxuuid.UUID, account *descr.Account) error {
func (db *Database) UpdateAccountByID(ctx context.Context, accountID uuid.UUID, account *descr.Account) error {
var err error
request := `UPDATE accounts SET username = $1, passhash = $2, disabled = $3, updated_at = $4, updated_by = $5 WHERE id = $6`
_, err = db.db.Exec(request, account.Username, account.Passhash, account.Disabled, account.UpdatedAt, account.UpdatedBy, accountID)
@@ -52,7 +52,7 @@ func (db *Database) ListAccounts(ctx context.Context) ([]descr.Account, error) {
return res, err
}
func (db *Database) GetAccountByID(ctx context.Context, accountID auxuuid.UUID) (bool, *descr.Account, error) {
func (db *Database) GetAccountByID(ctx context.Context, accountID uuid.UUID) (bool, *descr.Account, error) {
var err error
var res *descr.Account
var exists bool = false
@@ -91,7 +91,7 @@ func (db *Database) GetAccountByUsername(ctx context.Context, username string) (
return exists, res, err
}
func (db *Database) DeleteAccountByID(ctx context.Context, accountID auxuuid.UUID) error {
func (db *Database) DeleteAccountByID(ctx context.Context, accountID uuid.UUID) error {
var err error
request := `DELETE FROM accounts WHERE id = $1`
app/maindb/file.go
+2 -2
View File
@@ -12,8 +12,8 @@ package maindb
import (
"context"
"mstore/pkg/auxuuid"
"mstore/pkg/descr"
"mstore/pkg/uuid"
)
func (db *Database) InsertFile(ctx context.Context, file *descr.File) error {
@@ -28,7 +28,7 @@ func (db *Database) InsertFile(ctx context.Context, file *descr.File) error {
return err
}
func (db *Database) UpdateFileByID(ctx context.Context, fileID auxuuid.UUID, file *descr.File) error {
func (db *Database) UpdateFileByID(ctx context.Context, fileID uuid.UUID, file *descr.File) error {
var err error
request := `UPDATE files SET id = $1, collection = $2, name = $3, type = $4, checksum = $5,
size = $6, updated_at = $7, created_by = $8, updated_by = $9
app/maindb/file_test.go
+3 -3
View File
@@ -15,8 +15,8 @@ import (
"time"
"mstore/pkg/auxtool"
"mstore/pkg/auxuuid"
"mstore/pkg/descr"
"mstore/pkg/uuid"
"github.com/stretchr/testify/require"
)
@@ -33,9 +33,9 @@ func TestFile(t *testing.T) {
err = db.InitDatabase()
require.NoError(t, err)
id := auxuuid.NewUUID()
id := uuid.NewUUID()
timenow := auxtool.TimeNow()
creator := auxuuid.NewUUID()
creator := uuid.NewUUID()
collection := "foo"
newFile := &descr.File{
ID: id,
app/maindb/grant.go
+11 -10
View File
@@ -12,8 +12,9 @@ package maindb
import (
"context"
"mstore/pkg/auxuuid"
"mstore/pkg/descr"
"mstore/pkg/terms"
"mstore/pkg/uuid"
)
func (db *Database) InsertGrant(ctx context.Context, grant *descr.Grant) error {
@@ -28,7 +29,7 @@ func (db *Database) InsertGrant(ctx context.Context, grant *descr.Grant) error {
return err
}
func (db *Database) UpdateGrantByID(ctx context.Context, grantID auxuuid.UUID, grant *descr.Grant) error {
func (db *Database) UpdateGrantByID(ctx context.Context, grantID uuid.UUID, grant *descr.Grant) error {
var err error
request := `UPDATE grants SET pattern = $1, updated_at = $2, updated_by = $3 WHERE id = $4`
_, err = db.db.Exec(request, grant.Pattern, grant.UpdatedAt, grant.UpdatedBy, grantID)
@@ -38,7 +39,7 @@ func (db *Database) UpdateGrantByID(ctx context.Context, grantID auxuuid.UUID, g
return err
}
func (db *Database) ListGrantsByAccountID(ctx context.Context, accountID auxuuid.UUID) ([]descr.Grant, error) {
func (db *Database) ListGrantsByAccountID(ctx context.Context, accountID uuid.UUID) ([]descr.Grant, error) {
var err error
request := `SELECT * FROM grants WHERE account_id = $1`
res := make([]descr.Grant, 0)
@@ -60,7 +61,7 @@ func (db *Database) ListGrants(ctx context.Context) ([]descr.Grant, error) {
return res, err
}
func (db *Database) GetGrantByID(ctx context.Context, id auxuuid.UUID) (bool, *descr.Grant, error) {
func (db *Database) GetGrantByID(ctx context.Context, id uuid.UUID) (bool, *descr.Grant, error) {
var err error
res := &descr.Grant{}
request := `SELECT * FROM grants WHERE id = $1 LIMIT 1`
@@ -77,7 +78,7 @@ func (db *Database) GetGrantByID(ctx context.Context, id auxuuid.UUID) (bool, *d
return true, res, err
}
func (db *Database) GetGrantByAccoundIDRight(ctx context.Context, accountID auxuuid.UUID, right string) (bool, *descr.Grant, error) {
func (db *Database) GetGrantByAccoundIDRight(ctx context.Context, accountID uuid.UUID, right terms.Right) (bool, *descr.Grant, error) {
var err error
res := &descr.Grant{}
request := `SELECT * FROM grants WHERE account_id = $1 AND right = $2 LIMIT 1`
@@ -94,7 +95,7 @@ func (db *Database) GetGrantByAccoundIDRight(ctx context.Context, accountID auxu
return true, res, err
}
func (db *Database) ListGrantsByAccoundIDRight(ctx context.Context, accountID auxuuid.UUID, right string) (bool, []descr.Grant, error) {
func (db *Database) ListGrantsByAccoundIDRight(ctx context.Context, accountID uuid.UUID, right terms.Right) (bool, []descr.Grant, error) {
var err error
request := `SELECT * FROM grants WHERE account_id = $1 AND right = $2`
res := make([]descr.Grant, 0)
@@ -108,7 +109,7 @@ func (db *Database) ListGrantsByAccoundIDRight(ctx context.Context, accountID au
return true, res, err
}
func (db *Database) GetGrantByAccoundIDRightPattern(ctx context.Context, accountID auxuuid.UUID, right, pattern string) (bool, *descr.Grant, error) {
func (db *Database) GetGrantByAccoundIDRightPattern(ctx context.Context, accountID uuid.UUID, right terms.Right, pattern string) (bool, *descr.Grant, error) {
var err error
res := &descr.Grant{}
request := `SELECT * FROM grants WHERE account_id = $1 AND right = $2 AND pattern = $3 LIMIT 1`
@@ -125,7 +126,7 @@ func (db *Database) GetGrantByAccoundIDRightPattern(ctx context.Context, account
return true, res, err
}
func (db *Database) DeleteGrantByAccountIDRightPattern(ctx context.Context, accountID auxuuid.UUID, right, pattern string) error {
func (db *Database) DeleteGrantByAccountIDRightPattern(ctx context.Context, accountID uuid.UUID, right, pattern string) error {
var err error
request := `DELETE FROM grants WHERE account_id = $1 AND right = $2 AND pattern = $3`
_, err = db.db.Exec(request, accountID, right, pattern)
@@ -135,7 +136,7 @@ func (db *Database) DeleteGrantByAccountIDRightPattern(ctx context.Context, acco
return err
}
func (db *Database) DeleteGrantByID(ctx context.Context, grantID auxuuid.UUID) error {
func (db *Database) DeleteGrantByID(ctx context.Context, grantID uuid.UUID) error {
var err error
request := `DELETE FROM grants WHERE id = $1`
_, err = db.db.Exec(request, grantID)
@@ -145,7 +146,7 @@ func (db *Database) DeleteGrantByID(ctx context.Context, grantID auxuuid.UUID) e
return err
}
func (db *Database) DeleteAllGrantsForAccountID(ctx context.Context, grantID auxuuid.UUID) error {
func (db *Database) DeleteAllGrantsForAccountID(ctx context.Context, grantID uuid.UUID) error {
var err error
request := `DELETE FROM grants WHERE account_id = $1`
_, err = db.db.Exec(request, grantID)
app/maindb/grant_test.go
+4 -4
View File
@@ -16,8 +16,8 @@ import (
"time"
"mstore/pkg/auxtool"
"mstore/pkg/auxuuid"
"mstore/pkg/descr"
"mstore/pkg/uuid"
"github.com/stretchr/testify/require"
)
@@ -34,10 +34,10 @@ func TestGrant(t *testing.T) {
err = db.InitDatabase()
require.NoError(t, err)
id := auxuuid.NewUUID()
accountID := auxuuid.NewUUID()
id := uuid.NewUUID()
accountID := uuid.NewUUID()
timenow := auxtool.TimeNow()
creator := auxuuid.NewUUID()
creator := uuid.NewUUID()
newGrant := &descr.Grant{
ID: id,
AccountID: accountID,
app/maindb/init.go
+9 -9
View File
@@ -15,9 +15,9 @@ import (
"mstore/pkg/auxpwd"
"mstore/pkg/auxtool"
"mstore/pkg/auxuuid"
"mstore/pkg/descr"
"mstore/pkg/terms"
"mstore/pkg/uuid"
)
func (db *Database) WriteAnonymous(ctx context.Context) error {
@@ -41,7 +41,7 @@ func (db *Database) WriteAnonymous(ctx context.Context) error {
return err
}
grantDescr := &descr.Grant{
ID: auxuuid.NewUUID(),
ID: uuid.NewUUID(),
AccountID: accountDescr.ID,
Right: terms.RightReadFiles,
Pattern: ".*",
@@ -55,7 +55,7 @@ func (db *Database) WriteAnonymous(ctx context.Context) error {
return err
}
grantDescr = &descr.Grant{
ID: auxuuid.NewUUID(),
ID: uuid.NewUUID(),
AccountID: accountDescr.ID,
Right: terms.RightReadImages,
Pattern: ".*",
@@ -93,7 +93,7 @@ func (db *Database) WriteInituser(ctx context.Context) error {
}
// Files
grantDescr := &descr.Grant{
ID: auxuuid.NewUUID(),
ID: uuid.NewUUID(),
AccountID: accountDescr.ID,
Right: terms.RightReadFiles,
Pattern: ".*",
@@ -107,7 +107,7 @@ func (db *Database) WriteInituser(ctx context.Context) error {
return err
}
grantDescr = &descr.Grant{
ID: auxuuid.NewUUID(),
ID: uuid.NewUUID(),
AccountID: accountDescr.ID,
Right: terms.RightWriteFiles,
Pattern: ".*",
@@ -122,7 +122,7 @@ func (db *Database) WriteInituser(ctx context.Context) error {
}
// Accounts
grantDescr = &descr.Grant{
ID: auxuuid.NewUUID(),
ID: uuid.NewUUID(),
AccountID: accountDescr.ID,
Right: terms.RightReadAccounts,
Pattern: ".*",
@@ -136,7 +136,7 @@ func (db *Database) WriteInituser(ctx context.Context) error {
return err
}
grantDescr = &descr.Grant{
ID: auxuuid.NewUUID(),
ID: uuid.NewUUID(),
AccountID: accountDescr.ID,
Right: terms.RightWriteAccounts,
Pattern: ".*",
@@ -151,7 +151,7 @@ func (db *Database) WriteInituser(ctx context.Context) error {
}
// Images
grantDescr = &descr.Grant{
ID: auxuuid.NewUUID(),
ID: uuid.NewUUID(),
AccountID: accountDescr.ID,
Right: terms.RightReadImages,
Pattern: ".*",
@@ -165,7 +165,7 @@ func (db *Database) WriteInituser(ctx context.Context) error {
return err
}
grantDescr = &descr.Grant{
ID: auxuuid.NewUUID(),
ID: uuid.NewUUID(),
AccountID: accountDescr.ID,
Right: terms.RightWriteImages,
Pattern: ".*",