diff --git a/frontend/src/network/models.ts b/frontend/src/network/models.ts index 32ec4e5..92677a0 100644 --- a/frontend/src/network/models.ts +++ b/frontend/src/network/models.ts @@ -5,6 +5,8 @@ export interface User { avatar_path: string; is_admin: boolean; can_upload: boolean; + uploads_count: number; + comments_count: number; } export interface UserWithToken extends User { @@ -62,6 +64,8 @@ export interface ResourceDetails { images: Image[]; files: RFile[]; author: User; + views: number; + downloads: number; } export interface Storage { diff --git a/server/dao/comment.go b/server/dao/comment.go index 2786eb9..35f138f 100644 --- a/server/dao/comment.go +++ b/server/dao/comment.go @@ -1,15 +1,30 @@ package dao -import "nysoure/server/model" +import ( + "gorm.io/gorm" + "nysoure/server/model" +) func CreateComment(content string, userID uint, resourceID uint) (model.Comment, error) { - c := model.Comment{ - Content: content, - UserID: userID, - ResourceID: resourceID, + var comment model.Comment + err := db.Transaction(func(tx *gorm.DB) error { + comment = model.Comment{ + Content: content, + UserID: userID, + ResourceID: resourceID, + } + if err := tx.Create(&comment).Error; err != nil { + return err + } + if err := tx.Model(&model.User{}).Where("id = ?", userID).Update("comments_count", gorm.Expr("comments_count + 1")).Error; err != nil { + return err + } + return nil + }) + if err != nil { + return model.Comment{}, err } - err := db.Save(&c).Error - return c, err + return comment, nil } func GetCommentByResourceID(resourceID uint, page, pageSize int) ([]model.Comment, int, error) { diff --git a/server/dao/resource.go b/server/dao/resource.go index d2ae529..a920f8d 100644 --- a/server/dao/resource.go +++ b/server/dao/resource.go @@ -9,8 +9,17 @@ import ( ) func CreateResource(r model.Resource) (model.Resource, error) { - // Create a new resource in the database - if err := db.Create(&r).Error; err != nil { + err := db.Transaction(func(tx *gorm.DB) error { + err := tx.Create(&r).Error + if err != nil { + return err + } + if err := tx.Model(&model.User{}).Where("id = ?", r.UserID).Update("uploads_count", gorm.Expr("uploads_count + ?", 1)).Error; err != nil { + return err + } + return nil + }) + if err != nil { return model.Resource{}, err } return r, nil @@ -55,13 +64,22 @@ func UpdateResource(r model.Resource) error { } func DeleteResource(id uint) error { - // Delete a resource from the database - r := model.Resource{} - r.ID = id - if err := db.Delete(&r).Error; err != nil && !errors.Is(err, gorm.ErrRecordNotFound) { - return err - } - return nil + return db.Transaction(func(tx *gorm.DB) error { + var r model.Resource + if err := tx.Where("id = ?", id).First(&r).Error; err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return model.NewNotFoundError("Resource not found") + } + return err + } + if err := tx.Model(&model.User{}).Where("id = ?", r.UserID).Update("uploads_count", gorm.Expr("uploads_count - ?", 1)).Error; err != nil { + return err + } + if err := tx.Delete(&r).Error; err != nil { + return err + } + return nil + }) } func Search(query string, page, pageSize int) ([]model.Resource, int, error) { @@ -178,3 +196,17 @@ func ExistsResource(id uint) (bool, error) { } return true, nil } + +func AddResourceViewCount(id uint) error { + if err := db.Model(&model.Resource{}).Where("id = ?", id).Update("views", gorm.Expr("views + ?", 1)).Error; err != nil { + return err + } + return nil +} + +func AddResourceDownloadCount(id uint) error { + if err := db.Model(&model.Resource{}).Where("id = ?", id).Update("downloads", gorm.Expr("downloads + ?", 1)).Error; err != nil { + return err + } + return nil +} diff --git a/server/dao/user.go b/server/dao/user.go index 1432e19..9c98a00 100644 --- a/server/dao/user.go +++ b/server/dao/user.go @@ -61,6 +61,9 @@ func GetUserByUsername(username string) (model.User, error) { func GetUserByID(id uint) (model.User, error) { var user model.User if err := db.First(&user, id).Error; err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return user, model.NewNotFoundError("User not found") + } return user, err } return user, nil diff --git a/server/model/resource.go b/server/model/resource.go index 4000ca8..03c15a0 100644 --- a/server/model/resource.go +++ b/server/model/resource.go @@ -16,6 +16,8 @@ type Resource struct { Files []File `gorm:"foreignKey:ResourceID"` UserID uint User User + Views uint + Downloads uint } type ResourceView struct { @@ -37,6 +39,8 @@ type ResourceDetailView struct { Images []ImageView `json:"images"` Files []FileView `json:"files"` Author UserView `json:"author"` + Views uint `json:"views"` + Downloads uint `json:"downloads"` } func (r *Resource) ToView() ResourceView { @@ -85,5 +89,7 @@ func (r *Resource) ToDetailView() ResourceDetailView { Images: images, Files: files, Author: r.User.ToView(), + Views: r.Views, + Downloads: r.Downloads, } } diff --git a/server/model/user.go b/server/model/user.go index a7108dd..d1b1f1a 100644 --- a/server/model/user.go +++ b/server/model/user.go @@ -13,16 +13,20 @@ type User struct { IsAdmin bool CanUpload bool AvatarVersion int + UploadsCount int + CommentsCount int Resources []Resource `gorm:"foreignKey:UserID"` } type UserView struct { - ID uint `json:"id"` - Username string `json:"username"` - CreatedAt time.Time `json:"created_at"` - AvatarPath string `json:"avatar_path"` - IsAdmin bool `json:"is_admin"` - CanUpload bool `json:"can_upload"` + ID uint `json:"id"` + Username string `json:"username"` + CreatedAt time.Time `json:"created_at"` + AvatarPath string `json:"avatar_path"` + IsAdmin bool `json:"is_admin"` + CanUpload bool `json:"can_upload"` + UploadsCount int `json:"uploads_count"` + CommentsCount int `json:"comments_count"` } type UserViewWithToken struct { @@ -32,12 +36,14 @@ type UserViewWithToken struct { func (u User) ToView() UserView { return UserView{ - ID: u.ID, - Username: u.Username, - CreatedAt: u.CreatedAt, - AvatarPath: fmt.Sprintf("/api/user/avatar/%d?v=%d", u.ID, u.AvatarVersion), - IsAdmin: u.IsAdmin, - CanUpload: u.CanUpload || u.IsAdmin, + ID: u.ID, + Username: u.Username, + CreatedAt: u.CreatedAt, + AvatarPath: fmt.Sprintf("/api/user/avatar/%d?v=%d", u.ID, u.AvatarVersion), + IsAdmin: u.IsAdmin, + CanUpload: u.CanUpload || u.IsAdmin, + UploadsCount: u.UploadsCount, + CommentsCount: u.CommentsCount, } } diff --git a/server/service/file.go b/server/service/file.go index 8227b95..cd3fe08 100644 --- a/server/service/file.go +++ b/server/service/file.go @@ -379,6 +379,7 @@ func DownloadFile(fid string) (string, string, error) { if file.StorageID == nil { if file.RedirectUrl != "" { + _ = dao.AddResourceDownloadCount(file.ResourceID) return file.RedirectUrl, file.Filename, nil } return "", "", model.NewRequestError("file is not available") @@ -396,5 +397,7 @@ func DownloadFile(fid string) (string, string, error) { path, err := iStorage.Download(file.StorageKey, file.Filename) + _ = dao.AddResourceDownloadCount(file.ResourceID) + return path, file.Filename, err } diff --git a/server/service/resource.go b/server/service/resource.go index eb8ac64..343d79c 100644 --- a/server/service/resource.go +++ b/server/service/resource.go @@ -56,6 +56,7 @@ func CreateResource(uid uint, params *ResourceCreateParams) (uint, error) { func GetResource(id uint) (*model.ResourceDetailView, error) { r, err := dao.GetResourceByID(id) + _ = dao.AddResourceViewCount(id) if err != nil { return nil, err }