refactor: reimplement the user storage quota calc

Signed-off-by: saltbo <[email protected]>
saltbo · Aug 5, 2023 · 78e0178 · 78e0178
1 parent c06eed7
commit 78e0178
Show file tree

Hide file tree

Showing 19 changed files with 583 additions and 72 deletions.
diff --git a/hack/gen/main.go b/hack/gen/main.go
@@ -12,7 +12,7 @@ func main() {
 	})
 
 	// Generate basic type-safe DAO API for struct `model.User` following conventions
-	g.ApplyBasic(entity.Storage{}, entity.Matter{}, entity.RecycleBin{})
+	g.ApplyBasic(entity.Storage{}, entity.Matter{}, entity.RecycleBin{}, entity.UserStorage{})
 
 	// Generate the code
 	g.Execute()

diff --git a/internal/app/api/recyclebin.go b/internal/app/api/recyclebin.go
@@ -67,7 +67,7 @@ func (rs *RecycleBinResource) delete(c *gin.Context) {
 }
 
 func (rs *RecycleBinResource) clean(c *gin.Context) {
-	if err := rs.rbf.Clean(c, ginutil.QueryInt64(c, "sid")); err != nil {
+	if err := rs.rbf.Clean(c, ginutil.QueryInt64(c, "sid"), authed.UidGet(c)); err != nil {
 		ginutil.JSONServerError(c, err)
 		return
 	}

diff --git a/internal/app/dao/dao.go b/internal/app/dao/dao.go
@@ -39,10 +39,6 @@ type DBQueryFactory struct {
 }
 
 func NewDBQueryFactory() *DBQueryFactory {
-	return &DBQueryFactory{}
-}
-
-func (D *DBQueryFactory) Q() *query.Query {
 	if !viper.IsSet("installed") {
 		return nil
 	}
@@ -51,5 +47,9 @@ func (D *DBQueryFactory) Q() *query.Query {
 		log.Fatalln(err)
 	}
 
+	return &DBQueryFactory{}
+}
+
+func (D *DBQueryFactory) Q() *query.Query {
 	return query.Use(gdb)
 }
diff --git a/internal/app/dao/user.go b/internal/app/dao/user.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/saltbo/gopkg/strutil"
+	"github.com/saltbo/zpan/internal/app/entity"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 
@@ -85,8 +86,8 @@ func (u *User) Create(user *model.User, storageMax uint64) (*model.User, error)
 		Uid:      user.Id,
 		Nickname: user.Email[:strings.Index(user.Email, "@")],
 	}
-	user.Storage = model.UserStorage{
-		Max: model.UserStorageDefaultSize,
+	user.Storage = entity.UserStorage{
+		Max: entity.UserStorageDefaultSize,
 	}
 	if storageMax > 0 {
 		user.Storage.Max = storageMax
@@ -144,5 +145,5 @@ func (u *User) UpdateProfile(uid int64, up *model.UserProfile) error {
 }
 
 func (u *User) UpdateStorage(uid int64, quota uint64) error {
-	return gdb.Model(model.UserStorage{}).Where("uid=?", uid).Update("max", quota).Error
+	return gdb.Model(entity.UserStorage{}).Where("uid=?", uid).Update("max", quota).Error
 }
diff --git a/internal/app/model/user_storage.go → internal/app/entity/user_storage.go b/internal/app/model/user_storage.go → internal/app/entity/user_storage.go
@@ -1,4 +1,4 @@
-package model
+package entity
 
 import (
 	"time"
@@ -21,12 +21,12 @@ type UserStorage struct {
 	Deleted gorm.DeletedAt `json:"-"`
 }
 
-func (UserStorage) TableName() string {
+func (us *UserStorage) TableName() string {
 	return "zp_storage_quota"
 }
 
-func (sq *UserStorage) Overflowed(addonSize int64) bool {
-	if sq.Used+uint64(addonSize) >= sq.Max {
+func (us *UserStorage) Overflowed(addonSize int64) bool {
+	if us.Used+uint64(addonSize) >= us.Max {
 		return true
 	}
 

diff --git a/internal/app/model/base.go b/internal/app/model/base.go
@@ -8,7 +8,7 @@ func Tables() []interface{} {
 		new(User),
 		new(UserKey),
 		new(UserProfile),
-		new(UserStorage),
+		new(entity.UserStorage),
 		new(entity.Storage),
 		new(entity.Matter),
 		new(Share),

diff --git a/internal/app/model/user.go b/internal/app/model/user.go
@@ -5,6 +5,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/saltbo/zpan/internal/app/entity"
 	"gorm.io/gorm"
 )
 
@@ -45,20 +46,20 @@ func NewUserCreateOption() UserCreateOption {
 }
 
 type User struct {
-	Id        int64          `json:"id"`
-	Email     string         `json:"email" gorm:"size:32;unique_index;not null"`
-	Username  string         `json:"username" gorm:"size:20;unique_index;not null"`
-	Password  string         `json:"-" gorm:"size:32;not null"`
-	Status    uint8          `json:"-" gorm:"size:1;not null"`
-	StatusTxt string         `json:"status" gorm:"-"`
-	Roles     string         `json:"-" gorm:"size:64;not null"`
-	RoleTxt   string         `json:"role" gorm:"-"`
-	Ticket    string         `json:"ticket" gorm:"size:6;unique_index;not null"`
-	Profile   UserProfile    `json:"profile,omitempty" gorm:"foreignKey:Uid"`
-	Storage   UserStorage    `json:"storage,omitempty" gorm:"foreignKey:Uid"`
-	Created   time.Time      `json:"created" gorm:"autoCreateTime;not null"`
-	Updated   time.Time      `json:"updated" gorm:"autoUpdateTime;not null"`
-	Deleted   gorm.DeletedAt `json:"-"`
+	Id        int64              `json:"id"`
+	Email     string             `json:"email" gorm:"size:32;unique_index;not null"`
+	Username  string             `json:"username" gorm:"size:20;unique_index;not null"`
+	Password  string             `json:"-" gorm:"size:32;not null"`
+	Status    uint8              `json:"-" gorm:"size:1;not null"`
+	StatusTxt string             `json:"status" gorm:"-"`
+	Roles     string             `json:"-" gorm:"size:64;not null"`
+	RoleTxt   string             `json:"role" gorm:"-"`
+	Ticket    string             `json:"ticket" gorm:"size:6;unique_index;not null"`
+	Profile   UserProfile        `json:"profile,omitempty" gorm:"foreignKey:Uid"`
+	Storage   entity.UserStorage `json:"storage,omitempty" gorm:"foreignKey:Uid"`
+	Created   time.Time          `json:"created" gorm:"autoCreateTime;not null"`
+	Updated   time.Time          `json:"updated" gorm:"autoUpdateTime;not null"`
+	Deleted   gorm.DeletedAt     `json:"-"`
 
 	Token string `json:"-" gorm:"-"`
 }

diff --git a/internal/app/repo/query/gen.go b/internal/app/repo/query/gen.go