Add activities page.

This commit is contained in:
2025-06-13 19:32:25 +08:00
parent 0b3b54a0c4
commit 1f238c56f3
18 changed files with 424 additions and 70 deletions

33
server/api/activity.go Normal file
View File

@@ -0,0 +1,33 @@
package api
import (
"github.com/gofiber/fiber/v3"
"nysoure/server/model"
"nysoure/server/service"
"strconv"
)
func handleGetActivity(c fiber.Ctx) error {
pageStr := c.Query("page", "1")
page, err := strconv.Atoi(pageStr)
if err != nil {
return model.NewRequestError("Invalid page number")
}
activities, totalPages, err := service.GetActivityList(page)
if err != nil {
return err
}
if activities == nil {
activities = []model.ActivityView{}
}
return c.JSON(model.PageResponse[model.ActivityView]{
Success: true,
Data: activities,
TotalPages: totalPages,
Message: "Activities retrieved successfully",
})
}
func AddActivityRoutes(router fiber.Router) {
router.Get("/activity", handleGetActivity)
}

53
server/dao/activity.go Normal file
View File

@@ -0,0 +1,53 @@
package dao
import "nysoure/server/model"
func AddNewResourceActivity(userID, resourceID uint) error {
activity := &model.Activity{
UserID: userID,
Type: model.ActivityTypeNewResource,
RefID: resourceID,
}
return db.Create(activity).Error
}
func AddUpdateResourceActivity(userID, resourceID uint) error {
activity := &model.Activity{
UserID: userID,
Type: model.ActivityTypeUpdateResource,
RefID: resourceID,
}
return db.Create(activity).Error
}
func AddNewCommentActivity(userID, commentID uint) error {
activity := &model.Activity{
UserID: userID,
Type: model.ActivityTypeNewComment,
RefID: commentID,
}
return db.Create(activity).Error
}
func DeleteResourceActivity(resourceID uint) error {
return db.Where("ref_id = ? AND (type = ? OR type = ?)", resourceID, model.ActivityTypeNewResource, model.ActivityTypeUpdateResource).Delete(&model.Activity{}).Error
}
func DeleteCommentActivity(commentID uint) error {
return db.Where("ref_id = ? AND type = ?", commentID, model.ActivityTypeNewComment).Delete(&model.Activity{}).Error
}
func GetActivityList(offset, limit int) ([]model.Activity, int, error) {
var activities []model.Activity
var total int64
if err := db.Model(&model.Activity{}).Count(&total).Error; err != nil {
return nil, 0, err
}
if err := db.Offset(offset).Limit(limit).Order("id DESC").Find(&activities).Error; err != nil {
return nil, 0, err
}
return activities, int(total), nil
}

View File

@@ -62,3 +62,11 @@ func GetCommentsWithUser(username string, page, pageSize int) ([]model.Comment,
totalPages := (int(total) + pageSize - 1) / pageSize
return comments, totalPages, nil
}
func GetCommentByID(commentID uint) (*model.Comment, error) {
var comment model.Comment
if err := db.Preload("User").Preload("Resource").First(&comment, commentID).Error; err != nil {
return nil, err
}
return &comment, nil
}

View File

@@ -34,7 +34,18 @@ func init() {
}
}
_ = db.AutoMigrate(&model.User{}, &model.Resource{}, &model.Image{}, &model.Tag{}, &model.Storage{}, &model.File{}, &model.UploadingFile{}, &model.Statistic{}, &model.Comment{})
_ = db.AutoMigrate(
&model.User{},
&model.Resource{},
&model.Image{},
&model.Tag{},
&model.Storage{},
&model.File{},
&model.UploadingFile{},
&model.Statistic{},
&model.Comment{},
&model.Activity{},
)
}
func GetDB() *gorm.DB {

31
server/model/activity.go Normal file
View File

@@ -0,0 +1,31 @@
package model
import (
"gorm.io/gorm"
"time"
)
type ActivityType uint
const (
ActivityTypeUnknown ActivityType = iota
ActivityTypeNewResource
ActivityTypeUpdateResource
ActivityTypeNewComment
)
type Activity struct {
gorm.Model
UserID uint `gorm:"not null"`
Type ActivityType `gorm:"not null"`
RefID uint `gorm:"not null"` // Reference ID for the resource or comment
}
type ActivityView struct {
ID uint `json:"id"`
Time time.Time `json:"time"`
Type ActivityType `json:"type"`
User UserView `json:"user"`
Comment *CommentWithResourceView `json:"comment,omitempty"`
Resource *ResourceView `json:"resource,omitempty"`
}

View File

@@ -0,0 +1,53 @@
package service
import (
"nysoure/server/dao"
"nysoure/server/model"
)
func GetActivityList(page int) ([]model.ActivityView, int, error) {
offset := (page - 1) * pageSize
limit := pageSize
activities, total, err := dao.GetActivityList(offset, limit)
if err != nil {
return nil, 0, err
}
var views []model.ActivityView
for _, activity := range activities {
user, err := dao.GetUserByID(activity.UserID)
if err != nil {
return nil, 0, err
}
var comment *model.CommentWithResourceView
var resource *model.ResourceView
if activity.Type == model.ActivityTypeNewComment {
c, err := dao.GetCommentByID(activity.RefID)
if err != nil {
return nil, 0, err
}
comment = c.ToViewWithResource()
} else if activity.Type == model.ActivityTypeNewResource || activity.Type == model.ActivityTypeUpdateResource {
r, err := dao.GetResourceByID(activity.RefID)
if err != nil {
return nil, 0, err
}
rv := r.ToView()
resource = &rv
}
view := model.ActivityView{
ID: activity.ID,
User: user.ToView(),
Type: activity.Type,
Time: activity.CreatedAt,
Comment: comment,
Resource: resource,
}
views = append(views, view)
}
totalPages := (total + pageSize - 1) / pageSize
return views, totalPages, nil
}

View File

@@ -29,6 +29,10 @@ func CreateComment(content string, userID uint, resourceID uint) (*model.Comment
log.Error("Error creating comment:", err)
return nil, model.NewInternalServerError("Error creating comment")
}
err = dao.AddNewCommentActivity(userID, c.ID)
if err != nil {
log.Error("Error creating comment activity:", err)
}
return c.ToView(), nil
}

View File

@@ -60,6 +60,10 @@ func CreateResource(uid uint, params *ResourceCreateParams) (uint, error) {
if err != nil {
log.Error("Error updating cached tag list:", err)
}
err = dao.AddNewResourceActivity(uid, r.ID)
if err != nil {
log.Error("AddNewResourceActivity error: ", err)
}
return r.ID, nil
}
@@ -253,6 +257,10 @@ func EditResource(uid, rid uint, params *ResourceCreateParams) error {
if err != nil {
log.Error("Error updating cached tag list:", err)
}
err = dao.AddUpdateResourceActivity(uid, r.ID)
if err != nil {
log.Error("AddUpdateResourceActivity error: ", err)
}
return nil
}