nyne/nysoure
1
0
Fork 0
mirror of https://github.com/wgh136/nysoure.git synced 2025-09-27 04:17:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

user details page

Browse Source
This commit is contained in:
nyne
2025-05-14 16:48:52 +08:00
parent cbac071dd2
commit 3b7d52a7a8
20 changed files with 450 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/api/comment.go
View File

@@ -1,16 +1,18 @@
package api
import (
"github.com/gofiber/fiber/v3"
"nysoure/server/model"
"nysoure/server/service"
"strconv"
"github.com/gofiber/fiber/v3"
)
func AddCommentRoutes(router fiber.Router) {
api := router.Group("/comments")
api.Post("/:resourceID", createComment)
api.Get("/:resourceID", listComments)
api.Get("/user/:username", listCommentsWithUser)
}
func createComment(c fiber.Ctx) error {
@@ -60,3 +62,22 @@ func listComments(c fiber.Ctx) error {
Message: "Comments retrieved successfully",
})
}
func listCommentsWithUser(c fiber.Ctx) error {
username := c.Params("username")
pageStr := c.Query("page", "1")
page, err := strconv.Atoi(pageStr)
if err != nil {
return model.NewRequestError("Invalid page number")
}
comments, totalPages, err := service.ListCommentsWithUser(username, page)
if err != nil {
return err
}
return c.JSON(model.PageResponse[model.CommentWithResourceView]{
Success: true,
Data: comments,
TotalPages: totalPages,
Message: "Comments retrieved successfully",
})
}

29
server/api/resource.go
View File

@@ -155,6 +155,34 @@ func handleSearchResources(c fiber.Ctx) error {
})
}
func handleGetResourcesWithUser(c fiber.Ctx) error {
username := c.Params("username")
if username == "" {
return model.NewRequestError("Username is required")
}
pageStr := c.Query("page")
if pageStr == "" {
pageStr = "1"
}
page, err := strconv.Atoi(pageStr)
if err != nil {
return model.NewRequestError("Invalid page number")
}
resources, totalPages, err := service.GetResourcesWithUser(username, page)
if err != nil {
return err
}
if resources == nil {
resources = []model.ResourceView{}
}
return c.Status(fiber.StatusOK).JSON(model.PageResponse[model.ResourceView]{
Success: true,
Data: resources,
TotalPages: totalPages,
Message: "Resources retrieved successfully",
})
}
func AddResourceRoutes(api fiber.Router) {
resource := api.Group("/resource")
{
@@ -164,5 +192,6 @@ func AddResourceRoutes(api fiber.Router) {
resource.Get("/:id", handleGetResource)
resource.Delete("/:id", handleDeleteResource)
resource.Get("/tag/:tag", handleListResourcesWithTag)
resource.Get("/user/:username", handleGetResourcesWithUser)
}
}

17
server/api/user.go
View File

@@ -261,6 +261,22 @@ func handleDeleteUser(c fiber.Ctx) error {
})
}
func handleGetUserInfo(c fiber.Ctx) error {
username := c.Query("username", "")
if username == "" {
return model.NewRequestError("Username is required")
}
user, err := service.GetUserByUsername(username)
if err != nil {
return err
}
return c.Status(fiber.StatusOK).JSON(model.Response[model.UserView]{
Success: true,
Data: user,
Message: "User information retrieved successfully",
})
}
func AddUserRoutes(r fiber.Router) {
u := r.Group("user")
u.Post("/register", handleUserRegister)
@@ -273,4 +289,5 @@ func AddUserRoutes(r fiber.Router) {
u.Get("/list", handleListUsers)
u.Get("/search", handleSearchUsers)
u.Post("/delete", handleDeleteUser)
u.Get("/info", handleGetUserInfo)
}

21
server/dao/comment.go
View File

@@ -1,8 +1,9 @@
package dao
import (
"gorm.io/gorm"
"nysoure/server/model"
"gorm.io/gorm"
)
func CreateComment(content string, userID uint, resourceID uint) (model.Comment, error) {
@@ -43,3 +44,21 @@ func GetCommentByResourceID(resourceID uint, page, pageSize int) ([]model.Commen
return comments, totalPages, nil
}
func GetCommentsWithUser(username string, page, pageSize int) ([]model.Comment, int, error) {
var user model.User
if err := db.Where("username = ?", username).First(&user).Error; err != nil {
return nil, 0, err
}
var comments []model.Comment
var total int64
if err := db.Model(&model.Comment{}).Where("user_id = ?", user.ID).Count(&total).Error; err != nil {
return nil, 0, err
}
if err := db.Where("user_id = ?", user.ID).Offset((page - 1) * pageSize).Limit(pageSize).Preload("User").Preload("Resource").Order("created_at DESC").Find(&comments).Error; err != nil {
return nil, 0, err
}
totalPages := (int(total) + pageSize - 1) / pageSize
return comments, totalPages, nil
}

27
server/dao/resource.go
View File

@@ -171,9 +171,8 @@ func searchWithKeyword(keyword string) ([]model.Resource, error) {
func GetResourceByTag(tagID uint, page int, pageSize int) ([]model.Resource, int, error) {
var tag model.Tag
var total int64
total = db.Model(&model.Tag{}).Where("id = ?", tagID).Association("Resources").Count()
total := db.Model(&model.Tag{}).Where("id = ?", tagID).Association("Resources").Count()
if err := db.Model(&model.Tag{}).Where("id = ?", tagID).Preload("Resources", func(tx *gorm.DB) *gorm.DB {
return tx.Offset((page - 1) * pageSize).Limit(pageSize).Preload("Tags").Preload("User").Preload("Images").Order("created_at DESC")
@@ -210,3 +209,27 @@ func AddResourceDownloadCount(id uint) error {
}
return nil
}
func GetResourcesByUsername(username string, page, pageSize int) ([]model.Resource, int, error) {
var user model.User
if err := db.Where("username = ?", username).First(&user).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, 0, model.NewNotFoundError("User not found")
}
return nil, 0, err
}
var resources []model.Resource
var total int64
if err := db.Model(&model.Resource{}).Where("user_id = ?", user.ID).Count(&total).Error; err != nil {
return nil, 0, err
}
if err := db.Model(&model.Resource{}).Where("user_id = ?", user.ID).Offset((page - 1) * pageSize).Limit(pageSize).Preload("User").Preload("Images").Preload("Tags").Order("created_at DESC").Find(&resources).Error; err != nil {
return nil, 0, err
}
totalPages := (total + int64(pageSize) - 1) / int64(pageSize)
return resources, int(totalPages), nil
}

21
server/model/comment.go
View File

@@ -1,8 +1,9 @@
package model
import (
"gorm.io/gorm"
"time"
"gorm.io/gorm"
)
type Comment struct {
@@ -29,3 +30,21 @@ func (c *Comment) ToView() *CommentView {
User: c.User.ToView(),
}
}
type CommentWithResourceView struct {
ID uint `json:"id"`
Content string `json:"content"`
CreatedAt time.Time `json:"created_at"`
Resource ResourceView `json:"resource"`
User UserView `json:"user"`
}
func (c *Comment) ToViewWithResource() *CommentWithResourceView {
return &CommentWithResourceView{
ID: c.ID,
Content: c.Content,
CreatedAt: c.CreatedAt,
Resource: c.Resource.ToView(),
User: c.User.ToView(),
}
}

16
server/service/comment.go
View File

@@ -1,9 +1,10 @@
package service
import (
"github.com/gofiber/fiber/v3/log"
"nysoure/server/dao"
"nysoure/server/model"
"github.com/gofiber/fiber/v3/log"
)
func CreateComment(content string, userID uint, resourceID uint) (*model.CommentView, error) {
@@ -51,3 +52,16 @@ func ListComments(resourceID uint, page int) ([]model.CommentView, int, error) {
}
return res, totalPages, nil
}
func ListCommentsWithUser(username string, page int) ([]model.CommentWithResourceView, int, error) {
comments, totalPages, err := dao.GetCommentsWithUser(username, page, pageSize)
if err != nil {
log.Error("Error getting comments:", err)
return nil, 0, model.NewInternalServerError("Error getting comments")
}
res := make([]model.CommentWithResourceView, 0, len(comments))
for _, c := range comments {
res = append(res, *c.ToViewWithResource())
}
return res, totalPages, nil
}

7
server/service/image.go
View File

@@ -3,8 +3,6 @@ package service
import (
"bytes"
"errors"
"github.com/gofiber/fiber/v3/log"
"github.com/google/uuid"
"image"
"net/http"
"nysoure/server/dao"
@@ -13,6 +11,9 @@ import (
"os"
"time"
"github.com/gofiber/fiber/v3/log"
"github.com/google/uuid"
_ "image/gif"
_ "image/jpeg"
_ "image/png"
@@ -116,7 +117,7 @@ func GetImage(id uint) ([]byte, error) {
}
data, err := os.ReadFile(imageDir + i.FileName)
if err != nil {
return nil, errors.New("Failed to read image file")
return nil, errors.New("failed to read image file")
}
return data, nil
}

12
server/service/resource.go
View File

@@ -124,3 +124,15 @@ func GetResourcesWithTag(tag string, page int) ([]model.ResourceView, int, error
}
return views, totalPages, nil
}
func GetResourcesWithUser(username string, page int) ([]model.ResourceView, int, error) {
resources, totalPages, err := dao.GetResourcesByUsername(username, page, pageSize)
if err != nil {
return nil, 0, err
}
var views []model.ResourceView
for _, r := range resources {
views = append(views, r.ToView())
}
return views, totalPages, nil
}

8
server/service/user.go
View File

@@ -256,3 +256,11 @@ func DeleteUser(adminID uint, targetUserID uint) error {
return dao.DeleteUser(targetUserID)
}
func GetUserByUsername(username string) (model.UserView, error) {
user, err := dao.GetUserByUsername(username)
if err != nil {
return model.UserView{}, err
}
return user.ToView(), nil
}