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
app/maindb/account.go
+3 -4
View File
@@ -4,7 +4,6 @@ import (
"context"
"mstore/pkg/descr"
"mstore/pkg/uuid"
)
func (db *Database) InsertAccount(ctx context.Context, account *descr.Account) error {
@@ -20,7 +19,7 @@ func (db *Database) InsertAccount(ctx context.Context, account *descr.Account) e
return err
}
func (db *Database) UpdateAccountByID(ctx context.Context, accountID uuid.UUID, account *descr.Account) error {
func (db *Database) UpdateAccountByID(ctx context.Context, accountID uint64, 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 +51,7 @@ func (db *Database) ListAccounts(ctx context.Context) ([]descr.Account, error) {
return res, err
}
func (db *Database) GetAccountByID(ctx context.Context, accountID uuid.UUID) (bool, *descr.Account, error) {
func (db *Database) GetAccountByID(ctx context.Context, accountID uint64) (bool, *descr.Account, error) {
var err error
var res *descr.Account
var exists bool = false
@@ -91,7 +90,7 @@ func (db *Database) GetAccountByUsername(ctx context.Context, username string) (
return exists, res, err
}
func (db *Database) DeleteAccountByID(ctx context.Context, accountID uuid.UUID) error {
func (db *Database) DeleteAccountByID(ctx context.Context, accountID uint64) error {
var err error
request := `DELETE FROM accounts WHERE id = $1`
app/maindb/file.go
+1 -2
View File
@@ -13,7 +13,6 @@ import (
"context"
"mstore/pkg/descr"
"mstore/pkg/uuid"
)
func (db *Database) InsertFile(ctx context.Context, file *descr.File) error {
@@ -28,7 +27,7 @@ func (db *Database) InsertFile(ctx context.Context, file *descr.File) error {
return err
}
func (db *Database) UpdateFileByID(ctx context.Context, fileID uuid.UUID, file *descr.File) error {
func (db *Database) UpdateFileByID(ctx context.Context, fileID uint64, 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
+1 -1
View File
@@ -16,7 +16,7 @@ import (
"mstore/pkg/auxtool"
"mstore/pkg/descr"
"mstore/pkg/uuid"
"mstore/pkg/auxid"
"github.com/stretchr/testify/require"
)
app/maindb/grant.go
+9 -10
View File
@@ -14,7 +14,6 @@ import (
"mstore/pkg/descr"
"mstore/pkg/term"
"mstore/pkg/uuid"
)
func (db *Database) InsertGrant(ctx context.Context, grant *descr.Grant) error {
@@ -29,7 +28,7 @@ func (db *Database) InsertGrant(ctx context.Context, grant *descr.Grant) error {
return err
}
func (db *Database) UpdateGrantByID(ctx context.Context, grantID uuid.UUID, grant *descr.Grant) error {
func (db *Database) UpdateGrantByID(ctx context.Context, grantID uint64, 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)
@@ -39,7 +38,7 @@ func (db *Database) UpdateGrantByID(ctx context.Context, grantID uuid.UUID, gran
return err
}
func (db *Database) ListGrantsByAccountID(ctx context.Context, accountID uuid.UUID) ([]descr.Grant, error) {
func (db *Database) ListGrantsByAccountID(ctx context.Context, accountID uint64) ([]descr.Grant, error) {
var err error
request := `SELECT * FROM grants WHERE account_id = $1`
res := make([]descr.Grant, 0)
@@ -61,7 +60,7 @@ func (db *Database) ListGrants(ctx context.Context) ([]descr.Grant, error) {
return res, err
}
func (db *Database) GetGrantByID(ctx context.Context, id uuid.UUID) (bool, *descr.Grant, error) {
func (db *Database) GetGrantByID(ctx context.Context, id uint64) (bool, *descr.Grant, error) {
var err error
res := &descr.Grant{}
request := `SELECT * FROM grants WHERE id = $1 LIMIT 1`
@@ -78,7 +77,7 @@ func (db *Database) GetGrantByID(ctx context.Context, id uuid.UUID) (bool, *desc
return true, res, err
}
func (db *Database) GetGrantByAccoundIDRight(ctx context.Context, accountID uuid.UUID, right term.Right) (bool, *descr.Grant, error) {
func (db *Database) GetGrantByAccoundIDRight(ctx context.Context, accountID uint64, right term.Right) (bool, *descr.Grant, error) {
var err error
res := &descr.Grant{}
request := `SELECT * FROM grants WHERE account_id = $1 AND right = $2 LIMIT 1`
@@ -95,7 +94,7 @@ func (db *Database) GetGrantByAccoundIDRight(ctx context.Context, accountID uuid
return true, res, err
}
func (db *Database) ListGrantsByAccoundIDRight(ctx context.Context, accountID uuid.UUID, right term.Right) (bool, []descr.Grant, error) {
func (db *Database) ListGrantsByAccoundIDRight(ctx context.Context, accountID uint64, right term.Right) (bool, []descr.Grant, error) {
var err error
request := `SELECT * FROM grants WHERE account_id = $1 AND right = $2`
res := make([]descr.Grant, 0)
@@ -109,7 +108,7 @@ func (db *Database) ListGrantsByAccoundIDRight(ctx context.Context, accountID uu
return true, res, err
}
func (db *Database) GetGrantByAccoundIDRightPattern(ctx context.Context, accountID uuid.UUID, right term.Right, pattern string) (bool, *descr.Grant, error) {
func (db *Database) GetGrantByAccoundIDRightPattern(ctx context.Context, accountID uint64, right term.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`
@@ -126,7 +125,7 @@ func (db *Database) GetGrantByAccoundIDRightPattern(ctx context.Context, account
return true, res, err
}
func (db *Database) DeleteGrantByAccountIDRightPattern(ctx context.Context, accountID uuid.UUID, right, pattern string) error {
func (db *Database) DeleteGrantByAccountIDRightPattern(ctx context.Context, accountID uint64, 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)
@@ -136,7 +135,7 @@ func (db *Database) DeleteGrantByAccountIDRightPattern(ctx context.Context, acco
return err
}
func (db *Database) DeleteGrantByID(ctx context.Context, grantID uuid.UUID) error {
func (db *Database) DeleteGrantByID(ctx context.Context, grantID uint64) error {
var err error
request := `DELETE FROM grants WHERE id = $1`
_, err = db.db.Exec(request, grantID)
@@ -146,7 +145,7 @@ func (db *Database) DeleteGrantByID(ctx context.Context, grantID uuid.UUID) erro
return err
}
func (db *Database) DeleteAllGrantsForAccountID(ctx context.Context, grantID uuid.UUID) error {
func (db *Database) DeleteAllGrantsForAccountID(ctx context.Context, grantID uint64) error {
var err error
request := `DELETE FROM grants WHERE account_id = $1`
_, err = db.db.Exec(request, grantID)
app/maindb/grant_test.go
+1 -1
View File
@@ -17,7 +17,7 @@ import (
"mstore/pkg/auxtool"
"mstore/pkg/descr"
"mstore/pkg/uuid"
"mstore/pkg/auxid"
"github.com/stretchr/testify/require"
)
app/maindb/init.go
+9 -9
View File
@@ -17,7 +17,7 @@ import (
"mstore/pkg/auxtool"
"mstore/pkg/descr"
"mstore/pkg/term"
"mstore/pkg/uuid"
"mstore/pkg/auxid"
)
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: uuid.NewUUID(),
ID: auxid.NewID(),
AccountID: accountDescr.ID,
Right: term.RightReadFiles,
Pattern: ".*",
@@ -55,7 +55,7 @@ func (db *Database) WriteAnonymous(ctx context.Context) error {
return err
}
grantDescr = &descr.Grant{
ID: uuid.NewUUID(),
ID: auxid.NewID(),
AccountID: accountDescr.ID,
Right: term.RightReadImages,
Pattern: ".*",
@@ -93,7 +93,7 @@ func (db *Database) WriteInituser(ctx context.Context) error {
}
// Files
grantDescr := &descr.Grant{
ID: uuid.NewUUID(),
ID: auxid.NewID(),
AccountID: accountDescr.ID,
Right: term.RightReadFiles,
Pattern: ".*",
@@ -107,7 +107,7 @@ func (db *Database) WriteInituser(ctx context.Context) error {
return err
}
grantDescr = &descr.Grant{
ID: uuid.NewUUID(),
ID: auxid.NewID(),
AccountID: accountDescr.ID,
Right: term.RightWriteFiles,
Pattern: ".*",
@@ -122,7 +122,7 @@ func (db *Database) WriteInituser(ctx context.Context) error {
}
// Accounts
grantDescr = &descr.Grant{
ID: uuid.NewUUID(),
ID: auxid.NewID(),
AccountID: accountDescr.ID,
Right: term.RightReadAccounts,
Pattern: ".*",
@@ -136,7 +136,7 @@ func (db *Database) WriteInituser(ctx context.Context) error {
return err
}
grantDescr = &descr.Grant{
ID: uuid.NewUUID(),
ID: auxid.NewID(),
AccountID: accountDescr.ID,
Right: term.RightWriteAccounts,
Pattern: ".*",
@@ -151,7 +151,7 @@ func (db *Database) WriteInituser(ctx context.Context) error {
}
// Images
grantDescr = &descr.Grant{
ID: uuid.NewUUID(),
ID: auxid.NewID(),
AccountID: accountDescr.ID,
Right: term.RightReadImages,
Pattern: ".*",
@@ -165,7 +165,7 @@ func (db *Database) WriteInituser(ctx context.Context) error {
return err
}
grantDescr = &descr.Grant{
ID: uuid.NewUUID(),
ID: auxid.NewID(),
AccountID: accountDescr.ID,
Right: term.RightWriteImages,
Pattern: ".*",