rogee/quyun-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 重构内容服务，优化数据预加载和用户互动功能；增加租户关注功能及相关测试用例

Browse Source
This commit is contained in:
Rogee
2025-12-30 09:17:13 +08:00
parent 33e1921e17
commit 9ef9642965
5 changed files with 500 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

289
backend/app/services/content.go
View File

@@ -34,9 +34,6 @@ func (s *content) List(ctx context.Context, filter *content_dto.ContentListFilte
q = q.Where(tbl.TenantID.Eq(tid))
}
// Preload Author
q = q.Preload(tbl.Author)
// Sort
sort := "latest"
if filter.Sort != nil && *filter.Sort != "" {
@@ -59,7 +56,14 @@ func (s *content) List(ctx context.Context, filter *content_dto.ContentListFilte
return nil, errorx.ErrDatabaseError.WithCause(err)
}
list, err := q.Offset(int(filter.Pagination.Offset())).Limit(int(filter.Pagination.Limit)).Find()
// Use UnderlyingDB for complex preloads
var list []*models.Content
err = q.Offset(int(filter.Pagination.Offset())).Limit(int(filter.Pagination.Limit)).
UnderlyingDB().
Preload("Author").
Preload("ContentAssets.Asset").
Find(&list).Error
if err != nil {
return nil, errorx.ErrDatabaseError.WithCause(err)
}
@@ -82,7 +86,6 @@ func (s *content) Get(ctx context.Context, id string) (*content_dto.ContentDetai
_, q := models.ContentQuery.QueryContext(ctx)
var item models.Content
// Use UnderlyingDB for complex nested preloading
err := q.UnderlyingDB().
Preload("Author").
Preload("ContentAssets", func(db *gorm.DB) *gorm.DB {
@@ -91,6 +94,7 @@ func (s *content) Get(ctx context.Context, id string) (*content_dto.ContentDetai
Preload("ContentAssets.Asset").
Where("id = ?", cid).
First(&item).Error
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, errorx.ErrRecordNotFound
@@ -98,13 +102,21 @@ func (s *content) Get(ctx context.Context, id string) (*content_dto.ContentDetai
return nil, errorx.ErrDatabaseError.WithCause(err)
}
// Interaction status (isLiked, isFavorited)
userID := ctx.Value(consts.CtxKeyUser)
// Interaction status
isLiked := false
isFavorited := false
if userID != nil {
// uid := cast.ToInt64(userID) // Unused for now until interaction query implemented
// ... check likes ...
if userID := ctx.Value(consts.CtxKeyUser); userID != nil {
uid := cast.ToInt64(userID)
isLiked, _ = models.UserContentActionQuery.WithContext(ctx).
Where(models.UserContentActionQuery.UserID.Eq(uid),
models.UserContentActionQuery.ContentID.Eq(cid),
models.UserContentActionQuery.Type.Eq("like")).
Exists()
isFavorited, _ = models.UserContentActionQuery.WithContext(ctx).
Where(models.UserContentActionQuery.UserID.Eq(uid),
models.UserContentActionQuery.ContentID.Eq(cid),
models.UserContentActionQuery.Type.Eq("favorite")).
Exists()
}
detail := &content_dto.ContentDetail{
@@ -137,27 +149,43 @@ func (s *content) ListComments(ctx context.Context, id string, page int) (*reque
return nil, errorx.ErrDatabaseError.WithCause(err)
}
// User likes
likedMap := make(map[int64]bool)
if userID := ctx.Value(consts.CtxKeyUser); userID != nil {
uid := cast.ToInt64(userID)
ids := make([]int64, len(list))
for i, v := range list {
ids[i] = v.ID
}
likes, _ := models.UserCommentActionQuery.WithContext(ctx).
Where(models.UserCommentActionQuery.UserID.Eq(uid),
models.UserCommentActionQuery.CommentID.In(ids...),
models.UserCommentActionQuery.Type.Eq("like")).
Find()
for _, l := range likes {
likedMap[l.CommentID] = true
}
}
data := make([]content_dto.Comment, len(list))
for i, v := range list {
data[i] = content_dto.Comment{
ID: cast.ToString(v.ID),
Content: v.Content,
UserID: cast.ToString(v.UserID),
UserNickname: v.User.Nickname, // Preloaded
UserNickname: v.User.Nickname,
UserAvatar: v.User.Avatar,
CreateTime: v.CreatedAt.Format("2006-01-02 15:04:05"),
Likes: int(v.Likes),
ReplyTo: cast.ToString(v.ReplyTo),
IsLiked: likedMap[v.ID],
}
}
return &requests.Pager{
Pagination: requests.Pagination{
Page: p.Page,
Limit: p.Limit,
},
Total: total,
Items: data,
Pagination: requests.Pagination{Page: p.Page, Limit: p.Limit},
Total: total,
Items: data,
}, nil
}
@@ -189,38 +217,99 @@ func (s *content) CreateComment(ctx context.Context, id string, form *content_dt
}
func (s *content) LikeComment(ctx context.Context, id string) error {
return nil
userID := ctx.Value(consts.CtxKeyUser)
if userID == nil {
return errorx.ErrUnauthorized
}
uid := cast.ToInt64(userID)
cmid := cast.ToInt64(id)
return models.Q.Transaction(func(tx *models.Query) error {
exists, _ := tx.UserCommentAction.WithContext(ctx).
Where(tx.UserCommentAction.UserID.Eq(uid), tx.UserCommentAction.CommentID.Eq(cmid), tx.UserCommentAction.Type.Eq("like")).
Exists()
if exists {
return nil
}
action := &models.UserCommentAction{UserID: uid, CommentID: cmid, Type: "like"}
if err := tx.UserCommentAction.WithContext(ctx).Create(action); err != nil {
return err
}
_, err := tx.Comment.WithContext(ctx).Where(tx.Comment.ID.Eq(cmid)).UpdateSimple(tx.Comment.Likes.Add(1))
return err
})
}
func (s *content) GetLibrary(ctx context.Context) ([]user_dto.ContentItem, error) {
return []user_dto.ContentItem{}, nil
userID := ctx.Value(consts.CtxKeyUser)
if userID == nil {
return nil, errorx.ErrUnauthorized
}
uid := cast.ToInt64(userID)
tbl, q := models.ContentAccessQuery.QueryContext(ctx)
accessList, err := q.Where(tbl.UserID.Eq(uid), tbl.Status.Eq(consts.ContentAccessStatusActive)).Find()
if err != nil {
return nil, errorx.ErrDatabaseError.WithCause(err)
}
if len(accessList) == 0 {
return []user_dto.ContentItem{}, nil
}
var contentIDs []int64
for _, a := range accessList {
contentIDs = append(contentIDs, a.ContentID)
}
ctbl, cq := models.ContentQuery.QueryContext(ctx)
var list []*models.Content
err = cq.Where(ctbl.ID.In(contentIDs...)).
UnderlyingDB().
Preload("Author").
Preload("ContentAssets.Asset").
Find(&list).Error
if err != nil {
return nil, errorx.ErrDatabaseError.WithCause(err)
}
var data []user_dto.ContentItem
for _, item := range list {
dto := s.toContentItemDTO(item)
dto.IsPurchased = true
data = append(data, dto)
}
return data, nil
}
func (s *content) GetFavorites(ctx context.Context) ([]user_dto.ContentItem, error) {
return []user_dto.ContentItem{}, nil
return s.getInteractList(ctx, "favorite")
}
func (s *content) AddFavorite(ctx context.Context, contentId string) error {
return nil
return s.addInteract(ctx, contentId, "favorite")
}
func (s *content) RemoveFavorite(ctx context.Context, contentId string) error {
return nil
return s.removeInteract(ctx, contentId, "favorite")
}
func (s *content) GetLikes(ctx context.Context) ([]user_dto.ContentItem, error) {
return []user_dto.ContentItem{}, nil
return s.getInteractList(ctx, "like")
}
func (s *content) AddLike(ctx context.Context, contentId string) error {
return nil
return s.addInteract(ctx, contentId, "like")
}
func (s *content) RemoveLike(ctx context.Context, contentId string) error {
return nil
return s.removeInteract(ctx, contentId, "like")
}
func (s *content) ListTopics(ctx context.Context) ([]content_dto.Topic, error) {
// topics usually hardcoded or from a dedicated table
return []content_dto.Topic{}, nil
}
@@ -228,17 +317,55 @@ func (s *content) ListTopics(ctx context.Context) ([]content_dto.Topic, error) {
func (s *content) toContentItemDTO(item *models.Content) content_dto.ContentItem {
dto := content_dto.ContentItem{
ID: cast.ToString(item.ID),
Title: item.Title,
Genre: item.Genre,
AuthorID: cast.ToString(item.UserID),
Views: int(item.Views),
Likes: int(item.Likes),
ID: cast.ToString(item.ID),
Title: item.Title,
Genre: item.Genre,
AuthorID: cast.ToString(item.UserID),
Views: int(item.Views),
Likes: int(item.Likes),
}
if item.Author != nil {
dto.AuthorName = item.Author.Nickname
dto.AuthorAvatar = item.Author.Avatar
}
// Determine Type and Cover from assets
var hasVideo, hasAudio bool
for _, asset := range item.ContentAssets {
if asset.Asset == nil {
continue
}
// Cover
if asset.Role == consts.ContentAssetRoleCover {
dto.Cover = "http://mock/" + asset.Asset.ObjectKey
}
// Type detection
switch asset.Asset.Type {
case consts.MediaAssetTypeVideo:
hasVideo = true
case consts.MediaAssetTypeAudio:
hasAudio = true
}
}
// Fallback for cover if not explicitly set as cover role (take first image or whatever)
if dto.Cover == "" && len(item.ContentAssets) > 0 {
for _, asset := range item.ContentAssets {
if asset.Asset != nil && asset.Asset.Type == consts.MediaAssetTypeImage {
dto.Cover = "http://mock/" + asset.Asset.ObjectKey
break
}
}
}
if hasVideo {
dto.Type = "video"
} else if hasAudio {
dto.Type = "audio"
} else {
dto.Type = "article"
}
return dto
}
@@ -246,14 +373,108 @@ func (s *content) toMediaURLs(assets []*models.ContentAsset) []content_dto.Media
var urls []content_dto.MediaURL
for _, ca := range assets {
if ca.Asset != nil {
// Construct URL based on Asset info (Bucket/Key/Provider)
// For prototype: mock url
url := "http://mock/" + ca.Asset.ObjectKey
urls = append(urls, content_dto.MediaURL{
Type: string(ca.Asset.Type), // Assuming type is enum or string
Type: string(ca.Asset.Type),
URL: url,
})
}
}
return urls
}
func (s *content) addInteract(ctx context.Context, contentId, typ string) error {
userID := ctx.Value(consts.CtxKeyUser)
if userID == nil {
return errorx.ErrUnauthorized
}
uid := cast.ToInt64(userID)
cid := cast.ToInt64(contentId)
return models.Q.Transaction(func(tx *models.Query) error {
exists, _ := tx.UserContentAction.WithContext(ctx).
Where(tx.UserContentAction.UserID.Eq(uid), tx.UserContentAction.ContentID.Eq(cid), tx.UserContentAction.Type.Eq(typ)).
Exists()
if exists {
return nil
}
action := &models.UserContentAction{UserID: uid, ContentID: cid, Type: typ}
if err := tx.UserContentAction.WithContext(ctx).Create(action); err != nil {
return err
}
if typ == "like" {
_, err := tx.Content.WithContext(ctx).Where(tx.Content.ID.Eq(cid)).UpdateSimple(tx.Content.Likes.Add(1))
return err
}
return nil
})
}
func (s *content) removeInteract(ctx context.Context, contentId, typ string) error {
userID := ctx.Value(consts.CtxKeyUser)
if userID == nil {
return errorx.ErrUnauthorized
}
uid := cast.ToInt64(userID)
cid := cast.ToInt64(contentId)
return models.Q.Transaction(func(tx *models.Query) error {
res, err := tx.UserContentAction.WithContext(ctx).
Where(tx.UserContentAction.UserID.Eq(uid), tx.UserContentAction.ContentID.Eq(cid), tx.UserContentAction.Type.Eq(typ)).
Delete()
if err != nil {
return err
}
if res.RowsAffected == 0 {
return nil
}
if typ == "like" {
_, err := tx.Content.WithContext(ctx).Where(tx.Content.ID.Eq(cid)).UpdateSimple(tx.Content.Likes.Sub(1))
return err
}
return nil
})
}
func (s *content) getInteractList(ctx context.Context, typ string) ([]user_dto.ContentItem, error) {
userID := ctx.Value(consts.CtxKeyUser)
if userID == nil {
return nil, errorx.ErrUnauthorized
}
uid := cast.ToInt64(userID)
tbl, q := models.UserContentActionQuery.QueryContext(ctx)
actions, err := q.Where(tbl.UserID.Eq(uid), tbl.Type.Eq(typ)).Find()
if err != nil {
return nil, errorx.ErrDatabaseError.WithCause(err)
}
if len(actions) == 0 {
return []user_dto.ContentItem{}, nil
}
var contentIDs []int64
for _, a := range actions {
contentIDs = append(contentIDs, a.ContentID)
}
ctbl, cq := models.ContentQuery.QueryContext(ctx)
var list []*models.Content
err = cq.Where(ctbl.ID.In(contentIDs...)).
UnderlyingDB().
Preload("Author").
Preload("ContentAssets.Asset").
Find(&list).Error
if err != nil {
return nil, errorx.ErrDatabaseError.WithCause(err)
}
var data []user_dto.ContentItem
for _, item := range list {
data = append(data, s.toContentItemDTO(item))
}
return data, nil
}