Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions backend/handlers/activity/board_activities.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ package activity
import (
"math"
"net/http"
"strconv"

"progress-wall-backend/dto"
"progress-wall-backend/models"
"progress-wall-backend/repository"
"progress-wall-backend/services"
"strconv"

"github.com/gin-gonic/gin"
"gorm.io/gorm"
Expand All @@ -29,7 +30,7 @@ func NewBoardActivitiesHandler(db *gorm.DB) *BoardActivitiesHandler {
}

// GetBoardActivities 获取看板活动日志
// GET /api/boards/:board_id/activities
// GET /api/boards/:boardId/activities
func (h *BoardActivitiesHandler) GetBoardActivities(c *gin.Context) {
// 获取当前登录用户ID
userID := c.GetUint("user_id")
Expand All @@ -39,7 +40,7 @@ func (h *BoardActivitiesHandler) GetBoardActivities(c *gin.Context) {
}

// 获取看板ID
boardIDStr := c.Param("board_id")
boardIDStr := c.Param("boardId")
boardID, err := strconv.ParseUint(boardIDStr, 10, 32)
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "无效的看板ID"})
Expand Down
7 changes: 4 additions & 3 deletions backend/handlers/activity/task_activities.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package activity
import (
"math"
"net/http"
"strconv"

"progress-wall-backend/dto"
"progress-wall-backend/repository"
"progress-wall-backend/services"
"strconv"

"github.com/gin-gonic/gin"
"gorm.io/gorm"
Expand All @@ -28,7 +29,7 @@ func NewTaskActivitiesHandler(db *gorm.DB) *TaskActivitiesHandler {
}

// GetTaskActivities 获取任务活动日志
// GET /api/tasks/:task_id/activities
// GET /api/tasks/:taskId/activities
func (h *TaskActivitiesHandler) GetTaskActivities(c *gin.Context) {
// 获取当前登录用户ID
userID := c.GetUint("user_id")
Expand All @@ -38,7 +39,7 @@ func (h *TaskActivitiesHandler) GetTaskActivities(c *gin.Context) {
}

// 获取任务ID
taskIDStr := c.Param("task_id")
taskIDStr := c.Param("taskId")
taskID, err := strconv.ParseUint(taskIDStr, 10, 32)
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "无效的任务ID"})
Expand Down
4 changes: 2 additions & 2 deletions backend/routes/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ func SetupRoutes(db *gorm.DB, cfg *config.Config) *gin.Engine {
protected.DELETE("/tasks/:taskId", taskHandler.DeleteTask)
protected.PATCH("/tasks/:taskId/move", taskHandler.MoveTask)
// 看板活动日志
protected.GET("/boards/:board_id/activities", boardActivitiesHandler.GetBoardActivities)
protected.GET("/boards/:boardId/activities", boardActivitiesHandler.GetBoardActivities)

// 任务活动日志
protected.GET("/tasks/:task_id/activities", taskActivitiesHandler.GetTaskActivities)
protected.GET("/tasks/:taskId/activities", taskActivitiesHandler.GetTaskActivities)
}

return r
Expand Down