chore(ci, dto): update build workflow and enhance post DTOs
- Added NODE_NO_WARNINGS environment variable to build and deploy workflows. - Upgraded actions/upload-artifact and actions/download-artifact to version 4 in the build workflow. - Introduced ContentEditedAt field in PostResponse and PostDetailResponse DTOs to track content modification timestamps. - Updated post conversion functions to include ContentEditedAt in responses. - Ensured ContentEditedAt is set during post updates in the repository.
This commit is contained in:
@@ -47,7 +47,7 @@ jobs:
|
|||||||
run: go build -v -o server ./cmd/server
|
run: go build -v -o server ./cmd/server
|
||||||
|
|
||||||
- name: Upload artifacts
|
- name: Upload artifacts
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: backend-server-linux-amd64
|
name: backend-server-linux-amd64
|
||||||
path: server
|
path: server
|
||||||
@@ -70,7 +70,7 @@ jobs:
|
|||||||
password: ${{ secrets.GIT_TOKEN }}
|
password: ${{ secrets.GIT_TOKEN }}
|
||||||
|
|
||||||
- name: Download artifact
|
- name: Download artifact
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: backend-server-linux-amd64
|
name: backend-server-linux-amd64
|
||||||
|
|
||||||
|
|||||||
@@ -149,6 +149,7 @@ type PostResponse struct {
|
|||||||
IsVote bool `json:"is_vote"`
|
IsVote bool `json:"is_vote"`
|
||||||
CreatedAt string `json:"created_at"`
|
CreatedAt string `json:"created_at"`
|
||||||
UpdatedAt string `json:"updated_at"`
|
UpdatedAt string `json:"updated_at"`
|
||||||
|
ContentEditedAt string `json:"content_edited_at,omitempty"`
|
||||||
Author *UserResponse `json:"author"`
|
Author *UserResponse `json:"author"`
|
||||||
IsLiked bool `json:"is_liked"`
|
IsLiked bool `json:"is_liked"`
|
||||||
IsFavorited bool `json:"is_favorited"`
|
IsFavorited bool `json:"is_favorited"`
|
||||||
@@ -172,6 +173,7 @@ type PostDetailResponse struct {
|
|||||||
IsVote bool `json:"is_vote"`
|
IsVote bool `json:"is_vote"`
|
||||||
CreatedAt string `json:"created_at"`
|
CreatedAt string `json:"created_at"`
|
||||||
UpdatedAt string `json:"updated_at"`
|
UpdatedAt string `json:"updated_at"`
|
||||||
|
ContentEditedAt string `json:"content_edited_at,omitempty"`
|
||||||
Author *UserResponse `json:"author"`
|
Author *UserResponse `json:"author"`
|
||||||
IsLiked bool `json:"is_liked"`
|
IsLiked bool `json:"is_liked"`
|
||||||
IsFavorited bool `json:"is_favorited"`
|
IsFavorited bool `json:"is_favorited"`
|
||||||
@@ -920,6 +922,7 @@ type AdminPostListResponse struct {
|
|||||||
ReviewedBy string `json:"reviewed_by,omitempty"`
|
ReviewedBy string `json:"reviewed_by,omitempty"`
|
||||||
CreatedAt string `json:"created_at"`
|
CreatedAt string `json:"created_at"`
|
||||||
UpdatedAt string `json:"updated_at"`
|
UpdatedAt string `json:"updated_at"`
|
||||||
|
ContentEditedAt string `json:"content_edited_at,omitempty"`
|
||||||
Author *UserResponse `json:"author"`
|
Author *UserResponse `json:"author"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -947,6 +950,7 @@ type AdminPostDetailResponse struct {
|
|||||||
ReviewedBy string `json:"reviewed_by,omitempty"`
|
ReviewedBy string `json:"reviewed_by,omitempty"`
|
||||||
CreatedAt string `json:"created_at"`
|
CreatedAt string `json:"created_at"`
|
||||||
UpdatedAt string `json:"updated_at"`
|
UpdatedAt string `json:"updated_at"`
|
||||||
|
ContentEditedAt string `json:"content_edited_at,omitempty"`
|
||||||
Author *UserResponse `json:"author"`
|
Author *UserResponse `json:"author"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ func ConvertPostToResponse(post *model.Post, isLiked, isFavorited bool) *PostRes
|
|||||||
IsVote: post.IsVote,
|
IsVote: post.IsVote,
|
||||||
CreatedAt: FormatTime(post.CreatedAt),
|
CreatedAt: FormatTime(post.CreatedAt),
|
||||||
UpdatedAt: FormatTime(post.UpdatedAt),
|
UpdatedAt: FormatTime(post.UpdatedAt),
|
||||||
|
ContentEditedAt: FormatTimePointer(post.ContentEditedAt),
|
||||||
Author: author,
|
Author: author,
|
||||||
IsLiked: isLiked,
|
IsLiked: isLiked,
|
||||||
IsFavorited: isFavorited,
|
IsFavorited: isFavorited,
|
||||||
@@ -103,6 +104,7 @@ func ConvertPostToDetailResponse(post *model.Post, isLiked, isFavorited bool) *P
|
|||||||
IsVote: post.IsVote,
|
IsVote: post.IsVote,
|
||||||
CreatedAt: FormatTime(post.CreatedAt),
|
CreatedAt: FormatTime(post.CreatedAt),
|
||||||
UpdatedAt: FormatTime(post.UpdatedAt),
|
UpdatedAt: FormatTime(post.UpdatedAt),
|
||||||
|
ContentEditedAt: FormatTimePointer(post.ContentEditedAt),
|
||||||
Author: author,
|
Author: author,
|
||||||
IsLiked: isLiked,
|
IsLiked: isLiked,
|
||||||
IsFavorited: isFavorited,
|
IsFavorited: isFavorited,
|
||||||
|
|||||||
@@ -114,6 +114,7 @@ func (h *PostHandler) GetByID(c *gin.Context) {
|
|||||||
IsVote: post.IsVote,
|
IsVote: post.IsVote,
|
||||||
CreatedAt: dto.FormatTime(post.CreatedAt),
|
CreatedAt: dto.FormatTime(post.CreatedAt),
|
||||||
UpdatedAt: dto.FormatTime(post.UpdatedAt),
|
UpdatedAt: dto.FormatTime(post.UpdatedAt),
|
||||||
|
ContentEditedAt: dto.FormatTimePointer(post.ContentEditedAt),
|
||||||
Author: authorWithFollowStatus,
|
Author: authorWithFollowStatus,
|
||||||
IsLiked: isLiked,
|
IsLiked: isLiked,
|
||||||
IsFavorited: isFavorited,
|
IsFavorited: isFavorited,
|
||||||
|
|||||||
@@ -60,6 +60,8 @@ type Post struct {
|
|||||||
// 时间戳
|
// 时间戳
|
||||||
CreatedAt time.Time `json:"created_at" gorm:"autoCreateTime;index:idx_posts_status_created,priority:2,sort:desc;index:idx_posts_user_status_created,priority:3,sort:desc;index:idx_posts_hot_score_created,priority:2,sort:desc"`
|
CreatedAt time.Time `json:"created_at" gorm:"autoCreateTime;index:idx_posts_status_created,priority:2,sort:desc;index:idx_posts_user_status_created,priority:3,sort:desc;index:idx_posts_hot_score_created,priority:2,sort:desc"`
|
||||||
UpdatedAt time.Time `json:"updated_at" gorm:"autoUpdateTime:false"`
|
UpdatedAt time.Time `json:"updated_at" gorm:"autoUpdateTime:false"`
|
||||||
|
// ContentEditedAt 仅在实际修改标题/正文/图片时更新,供前端展示「已编辑」;与统计类更新解耦
|
||||||
|
ContentEditedAt *time.Time `json:"content_edited_at,omitempty" gorm:"column:content_edited_at"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// BeforeCreate 创建前生成UUID
|
// BeforeCreate 创建前生成UUID
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ func (r *CommentRepository) Delete(id string) error {
|
|||||||
UpdateColumns(map[string]interface{}{
|
UpdateColumns(map[string]interface{}{
|
||||||
"comments_count": gorm.Expr("comments_count - 1"),
|
"comments_count": gorm.Expr("comments_count - 1"),
|
||||||
"hot_score": gorm.Expr("likes_count * 2 + (comments_count - 1) * 3 + views_count * 0.1"),
|
"hot_score": gorm.Expr("likes_count * 2 + (comments_count - 1) * 3 + views_count * 0.1"),
|
||||||
|
"updated_at": gorm.Expr("updated_at"),
|
||||||
}).Error; err != nil {
|
}).Error; err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -102,6 +103,7 @@ func (r *CommentRepository) ApplyPublishedStats(comment *model.Comment) error {
|
|||||||
UpdateColumns(map[string]any{
|
UpdateColumns(map[string]any{
|
||||||
"comments_count": gorm.Expr("comments_count + 1"),
|
"comments_count": gorm.Expr("comments_count + 1"),
|
||||||
"hot_score": gorm.Expr("likes_count * 2 + (comments_count + 1) * 3 + views_count * 0.1"),
|
"hot_score": gorm.Expr("likes_count * 2 + (comments_count + 1) * 3 + views_count * 0.1"),
|
||||||
|
"updated_at": gorm.Expr("updated_at"),
|
||||||
}).Error; err != nil {
|
}).Error; err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,7 +61,8 @@ func (r *PostRepository) Create(post *model.Post, images []string) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
// 新建帖子:保证 updated_at 与 created_at 一致(避免历史 NULL/库默认值导致前端误判为已编辑)
|
||||||
|
return tx.Model(post).Where("id = ?", post.ID).UpdateColumn("updated_at", post.CreatedAt).Error
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -77,14 +78,18 @@ func (r *PostRepository) GetByID(id string) (*model.Post, error) {
|
|||||||
|
|
||||||
// Update 更新帖子
|
// Update 更新帖子
|
||||||
func (r *PostRepository) Update(post *model.Post) error {
|
func (r *PostRepository) Update(post *model.Post) error {
|
||||||
post.UpdatedAt = time.Now()
|
now := time.Now()
|
||||||
|
post.UpdatedAt = now
|
||||||
|
post.ContentEditedAt = &now
|
||||||
return r.db.Save(post).Error
|
return r.db.Save(post).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
// UpdateWithImages 更新帖子及其图片(images=nil 表示不更新图片)
|
// UpdateWithImages 更新帖子及其图片(images=nil 表示不更新图片)
|
||||||
func (r *PostRepository) UpdateWithImages(post *model.Post, images *[]string) error {
|
func (r *PostRepository) UpdateWithImages(post *model.Post, images *[]string) error {
|
||||||
return r.db.Transaction(func(tx *gorm.DB) error {
|
return r.db.Transaction(func(tx *gorm.DB) error {
|
||||||
post.UpdatedAt = time.Now()
|
now := time.Now()
|
||||||
|
post.UpdatedAt = now
|
||||||
|
post.ContentEditedAt = &now
|
||||||
if err := tx.Save(post).Error; err != nil {
|
if err := tx.Save(post).Error; err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -120,6 +125,7 @@ func (r *PostRepository) UpdateModerationStatus(postID string, status model.Post
|
|||||||
"reviewed_at": gorm.Expr("CURRENT_TIMESTAMP"),
|
"reviewed_at": gorm.Expr("CURRENT_TIMESTAMP"),
|
||||||
"reviewed_by": reviewedBy,
|
"reviewed_by": reviewedBy,
|
||||||
"reject_reason": rejectReason,
|
"reject_reason": rejectReason,
|
||||||
|
"updated_at": gorm.Expr("updated_at"), // 防止 MySQL ON UPDATE CURRENT_TIMESTAMP 误刷新
|
||||||
}
|
}
|
||||||
return r.db.Model(&model.Post{}).Where("id = ?", postID).UpdateColumns(updates).Error
|
return r.db.Model(&model.Post{}).Where("id = ?", postID).UpdateColumns(updates).Error
|
||||||
}
|
}
|
||||||
@@ -258,6 +264,7 @@ func (r *PostRepository) Like(postID, userID string) error {
|
|||||||
UpdateColumns(map[string]any{
|
UpdateColumns(map[string]any{
|
||||||
"likes_count": gorm.Expr("likes_count + 1"),
|
"likes_count": gorm.Expr("likes_count + 1"),
|
||||||
"hot_score": gorm.Expr("(likes_count + 1) * 2 + comments_count * 3 + views_count * 0.1"),
|
"hot_score": gorm.Expr("(likes_count + 1) * 2 + comments_count * 3 + views_count * 0.1"),
|
||||||
|
"updated_at": gorm.Expr("updated_at"),
|
||||||
}).Error
|
}).Error
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -276,6 +283,7 @@ func (r *PostRepository) Unlike(postID, userID string) error {
|
|||||||
UpdateColumns(map[string]any{
|
UpdateColumns(map[string]any{
|
||||||
"likes_count": gorm.Expr("likes_count - 1"),
|
"likes_count": gorm.Expr("likes_count - 1"),
|
||||||
"hot_score": gorm.Expr("(likes_count - 1) * 2 + comments_count * 3 + views_count * 0.1"),
|
"hot_score": gorm.Expr("(likes_count - 1) * 2 + comments_count * 3 + views_count * 0.1"),
|
||||||
|
"updated_at": gorm.Expr("updated_at"),
|
||||||
}).Error
|
}).Error
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
@@ -338,9 +346,12 @@ func (r *PostRepository) Favorite(postID, userID string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// 增加帖子收藏数
|
// 增加帖子收藏数(显式固定 updated_at,避免 MySQL ON UPDATE 误刷新)
|
||||||
return tx.Model(&model.Post{}).Where("id = ?", postID).
|
return tx.Model(&model.Post{}).Where("id = ?", postID).
|
||||||
UpdateColumn("favorites_count", gorm.Expr("favorites_count + 1")).Error
|
UpdateColumns(map[string]any{
|
||||||
|
"favorites_count": gorm.Expr("favorites_count + 1"),
|
||||||
|
"updated_at": gorm.Expr("updated_at"),
|
||||||
|
}).Error
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -354,7 +365,10 @@ func (r *PostRepository) Unfavorite(postID, userID string) error {
|
|||||||
if result.RowsAffected > 0 {
|
if result.RowsAffected > 0 {
|
||||||
// 减少帖子收藏数
|
// 减少帖子收藏数
|
||||||
return tx.Model(&model.Post{}).Where("id = ?", postID).
|
return tx.Model(&model.Post{}).Where("id = ?", postID).
|
||||||
UpdateColumn("favorites_count", gorm.Expr("favorites_count - 1")).Error
|
UpdateColumns(map[string]any{
|
||||||
|
"favorites_count": gorm.Expr("favorites_count - 1"),
|
||||||
|
"updated_at": gorm.Expr("updated_at"),
|
||||||
|
}).Error
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
@@ -401,6 +415,7 @@ func (r *PostRepository) IncrementViews(postID string) error {
|
|||||||
UpdateColumns(map[string]interface{}{
|
UpdateColumns(map[string]interface{}{
|
||||||
"views_count": gorm.Expr("views_count + 1"),
|
"views_count": gorm.Expr("views_count + 1"),
|
||||||
"hot_score": gorm.Expr("likes_count * 2 + comments_count * 3 + (views_count + 1) * 0.1"),
|
"hot_score": gorm.Expr("likes_count * 2 + comments_count * 3 + (views_count + 1) * 0.1"),
|
||||||
|
"updated_at": gorm.Expr("updated_at"),
|
||||||
}).Error
|
}).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -537,7 +552,7 @@ func (r *PostRepository) createWithTx(tx *gorm.DB, post *model.Post, images []st
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return tx.Model(post).Where("id = ?", post.ID).UpdateColumn("updated_at", post.CreatedAt).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetByIDWithContext 根据ID获取帖子(支持事务)
|
// GetByIDWithContext 根据ID获取帖子(支持事务)
|
||||||
@@ -552,7 +567,9 @@ func (r *PostRepository) GetByIDWithContext(ctx context.Context, id string) (*mo
|
|||||||
|
|
||||||
// UpdateWithContext 更新帖子(支持事务)
|
// UpdateWithContext 更新帖子(支持事务)
|
||||||
func (r *PostRepository) UpdateWithContext(ctx context.Context, post *model.Post) error {
|
func (r *PostRepository) UpdateWithContext(ctx context.Context, post *model.Post) error {
|
||||||
post.UpdatedAt = time.Now()
|
now := time.Now()
|
||||||
|
post.UpdatedAt = now
|
||||||
|
post.ContentEditedAt = &now
|
||||||
return r.getDB(ctx).WithContext(ctx).Save(post).Error
|
return r.getDB(ctx).WithContext(ctx).Save(post).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -706,14 +723,20 @@ func (r *PostRepository) BatchUpdateStatus(ids []string, status model.PostStatus
|
|||||||
func (r *PostRepository) UpdatePinStatus(postID string, isPinned bool) error {
|
func (r *PostRepository) UpdatePinStatus(postID string, isPinned bool) error {
|
||||||
// 置顶状态属于管理操作,不应影响帖子内容更新时间(updated_at)
|
// 置顶状态属于管理操作,不应影响帖子内容更新时间(updated_at)
|
||||||
return r.db.Model(&model.Post{}).Where("id = ?", postID).
|
return r.db.Model(&model.Post{}).Where("id = ?", postID).
|
||||||
UpdateColumn("is_pinned", isPinned).Error
|
UpdateColumns(map[string]any{
|
||||||
|
"is_pinned": isPinned,
|
||||||
|
"updated_at": gorm.Expr("updated_at"),
|
||||||
|
}).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
// UpdateFeatureStatus 更新帖子加精状态
|
// UpdateFeatureStatus 更新帖子加精状态
|
||||||
func (r *PostRepository) UpdateFeatureStatus(postID string, isFeatured bool) error {
|
func (r *PostRepository) UpdateFeatureStatus(postID string, isFeatured bool) error {
|
||||||
// 加精状态属于管理操作,不应影响帖子内容更新时间(updated_at)
|
// 加精状态属于管理操作,不应影响帖子内容更新时间(updated_at)
|
||||||
return r.db.Model(&model.Post{}).Where("id = ?", postID).
|
return r.db.Model(&model.Post{}).Where("id = ?", postID).
|
||||||
UpdateColumn("is_featured", isFeatured).Error
|
UpdateColumns(map[string]any{
|
||||||
|
"is_featured": isFeatured,
|
||||||
|
"updated_at": gorm.Expr("updated_at"),
|
||||||
|
}).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
// ========== Cursor Pagination Methods ==========
|
// ========== Cursor Pagination Methods ==========
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package service
|
package service
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
@@ -296,6 +296,7 @@ func convertPostToAdminListResponse(post *model.Post) dto.AdminPostListResponse
|
|||||||
ReviewedBy: post.ReviewedBy,
|
ReviewedBy: post.ReviewedBy,
|
||||||
CreatedAt: post.CreatedAt.Format("2006-01-02T15:04:05Z07:00"),
|
CreatedAt: post.CreatedAt.Format("2006-01-02T15:04:05Z07:00"),
|
||||||
UpdatedAt: post.UpdatedAt.Format("2006-01-02T15:04:05Z07:00"),
|
UpdatedAt: post.UpdatedAt.Format("2006-01-02T15:04:05Z07:00"),
|
||||||
|
ContentEditedAt: dto.FormatTimePointer(post.ContentEditedAt),
|
||||||
Author: author,
|
Author: author,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -341,6 +342,7 @@ func convertPostToAdminDetailResponse(post *model.Post) *dto.AdminPostDetailResp
|
|||||||
ReviewedBy: post.ReviewedBy,
|
ReviewedBy: post.ReviewedBy,
|
||||||
CreatedAt: post.CreatedAt.Format("2006-01-02T15:04:05Z07:00"),
|
CreatedAt: post.CreatedAt.Format("2006-01-02T15:04:05Z07:00"),
|
||||||
UpdatedAt: post.UpdatedAt.Format("2006-01-02T15:04:05Z07:00"),
|
UpdatedAt: post.UpdatedAt.Format("2006-01-02T15:04:05Z07:00"),
|
||||||
|
ContentEditedAt: dto.FormatTimePointer(post.ContentEditedAt),
|
||||||
Author: author,
|
Author: author,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -284,6 +284,8 @@ func (s *VoteService) convertToPostResponse(post *model.Post, currentUserID stri
|
|||||||
IsLocked: post.IsLocked,
|
IsLocked: post.IsLocked,
|
||||||
IsVote: post.IsVote,
|
IsVote: post.IsVote,
|
||||||
CreatedAt: dto.FormatTime(post.CreatedAt),
|
CreatedAt: dto.FormatTime(post.CreatedAt),
|
||||||
|
UpdatedAt: dto.FormatTime(post.UpdatedAt),
|
||||||
|
ContentEditedAt: dto.FormatTimePointer(post.ContentEditedAt),
|
||||||
Images: make([]dto.PostImageResponse, 0, len(post.Images)),
|
Images: make([]dto.PostImageResponse, 0, len(post.Images)),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user