Add tag filtering to ListPosts and enhance ListTags with post count
All checks were successful
CI - Build and Push / Build and Push Docker Image (push) Successful in 53s

This commit is contained in:
2025-10-26 16:00:30 +08:00
parent a8b2457762
commit df712e8715
4 changed files with 81 additions and 23 deletions

View File

@@ -80,6 +80,7 @@ type (
type ( type (
ListPostsReq { ListPostsReq {
TagIds []string `json:"tagIds,optional"` // Array of tag IDs to filter posts (optional)
Page int `json:"page"` // Page number for pagination (1-based) Page int `json:"page"` // Page number for pagination (1-based)
PageSize int `json:"pageSize"` // Number of posts per page PageSize int `json:"pageSize"` // Number of posts per page
} }
@@ -104,6 +105,7 @@ type (
ListTagsRespTags { ListTagsRespTags {
TagId string `json:"tagId"` // Unique identifier of the tag TagId string `json:"tagId"` // Unique identifier of the tag
TagName string `json:"tagName"` // Name of the tag TagName string `json:"tagName"` // Name of the tag
PostCount int `json:"postCount"` // Number of posts associated with the tag
} }
) )

View File

@@ -39,23 +39,71 @@ func (l *ListPostsLogic) ListPosts(req *types.ListPostsReq) (resp *types.ListPos
} }
offset := (page - 1) * pageSize offset := (page - 1) * pageSize
// Get total count // Build query with optional tag filter
var totalCount int var countQuery string
countQuery := `SELECT COUNT(*) FROM posts` var postsQuery string
err = l.svcCtx.DB.QueryRowContext(l.ctx, countQuery).Scan(&totalCount) var args []interface{}
if err != nil {
l.Errorf("Failed to get total count: %v", err)
return nil, err
}
// Get posts with pagination if len(req.TagIds) > 0 {
postsQuery := ` // Filter by tags - posts that have ALL specified tags
countQuery = `
SELECT COUNT(DISTINCT p.id)
FROM posts p
INNER JOIN post_hashtags ph ON p.id = ph.post_id
WHERE ph.hashtag_id = ANY($1)
GROUP BY p.id
HAVING COUNT(DISTINCT ph.hashtag_id) = $2
`
postsQuery = `
SELECT DISTINCT p.id, p.title, p.created_at, p.updated_at, p.cover_id
FROM posts p
INNER JOIN post_hashtags ph ON p.id = ph.post_id
WHERE ph.hashtag_id = ANY($1)
GROUP BY p.id, p.title, p.created_at, p.updated_at, p.cover_id
HAVING COUNT(DISTINCT ph.hashtag_id) = $2
ORDER BY p.created_at DESC
LIMIT $3 OFFSET $4
`
args = []interface{}{req.TagIds, len(req.TagIds), pageSize, offset}
} else {
// No tag filter - get all posts
countQuery = `SELECT COUNT(*) FROM posts`
postsQuery = `
SELECT p.id, p.title, p.created_at, p.updated_at, p.cover_id SELECT p.id, p.title, p.created_at, p.updated_at, p.cover_id
FROM posts p FROM posts p
ORDER BY p.created_at DESC ORDER BY p.created_at DESC
LIMIT $1 OFFSET $2 LIMIT $1 OFFSET $2
` `
rows, err := l.svcCtx.DB.QueryContext(l.ctx, postsQuery, pageSize, offset) args = []interface{}{pageSize, offset}
}
// Get total count
var totalCount int
if len(req.TagIds) > 0 {
// Count posts matching tag filter
rows, err := l.svcCtx.DB.QueryContext(l.ctx, countQuery, req.TagIds, len(req.TagIds))
if err != nil {
l.Errorf("Failed to get total count: %v", err)
return nil, err
}
defer rows.Close()
totalCount = 0
for rows.Next() {
totalCount++
}
} else {
err = l.svcCtx.DB.QueryRowContext(l.ctx, countQuery).Scan(&totalCount)
if err != nil {
l.Errorf("Failed to get total count: %v", err)
return nil, err
}
}
// Get posts with pagination
rows, err := l.svcCtx.DB.QueryContext(l.ctx, postsQuery, args...)
if err != nil { if err != nil {
l.Errorf("Failed to get posts: %v", err) l.Errorf("Failed to get posts: %v", err)
return nil, err return nil, err

View File

@@ -25,8 +25,14 @@ func NewListTagsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListTags
} }
func (l *ListTagsLogic) ListTags(req *types.ListTagsReq) (resp *types.ListTagsResp, err error) { func (l *ListTagsLogic) ListTags(req *types.ListTagsReq) (resp *types.ListTagsResp, err error) {
// Query all hashtags // Query all hashtags with post count
query := `SELECT id, name FROM hashtags ORDER BY name` query := `
SELECT h.id, h.name, COUNT(ph.post_id) as post_count
FROM hashtags h
LEFT JOIN post_hashtags ph ON h.id = ph.hashtag_id
GROUP BY h.id, h.name
ORDER BY h.name
`
rows, err := l.svcCtx.DB.QueryContext(l.ctx, query) rows, err := l.svcCtx.DB.QueryContext(l.ctx, query)
if err != nil { if err != nil {
l.Errorf("Failed to get tags: %v", err) l.Errorf("Failed to get tags: %v", err)
@@ -37,7 +43,7 @@ func (l *ListTagsLogic) ListTags(req *types.ListTagsReq) (resp *types.ListTagsRe
var tags []types.ListTagsRespTags var tags []types.ListTagsRespTags
for rows.Next() { for rows.Next() {
var tag types.ListTagsRespTags var tag types.ListTagsRespTags
err := rows.Scan(&tag.TagId, &tag.TagName) err := rows.Scan(&tag.TagId, &tag.TagName, &tag.PostCount)
if err != nil { if err != nil {
l.Errorf("Failed to scan tag: %v", err) l.Errorf("Failed to scan tag: %v", err)
continue continue

View File

@@ -53,6 +53,7 @@ type GetPostResp struct {
} }
type ListPostsReq struct { type ListPostsReq struct {
TagIds []string `json:"tagIds,optional"` // Array of tag IDs to filter posts (optional)
Page int `json:"page"` // Page number for pagination (1-based) Page int `json:"page"` // Page number for pagination (1-based)
PageSize int `json:"pageSize"` // Number of posts per page PageSize int `json:"pageSize"` // Number of posts per page
} }
@@ -80,6 +81,7 @@ type ListTagsResp struct {
type ListTagsRespTags struct { type ListTagsRespTags struct {
TagId string `json:"tagId"` // Unique identifier of the tag TagId string `json:"tagId"` // Unique identifier of the tag
TagName string `json:"tagName"` // Name of the tag TagName string `json:"tagName"` // Name of the tag
PostCount int `json:"postCount"` // Number of posts associated with the tag
} }
type PingReq struct { type PingReq struct {