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

feat: add list profile

Browse Source
This commit is contained in:
Rogee
2024-12-09 20:33:35 +08:00
parent af8a8e9469
commit 0c9cb498d5
12 changed files with 125 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
backend/modules/medias/controller.go
View File

@@ -6,7 +6,7 @@ import (
"backend/providers/jwt"
"github.com/gofiber/fiber/v3"
. "github.com/spf13/cast"
log "github.com/sirupsen/logrus"
)
// @provider
@@ -18,6 +18,7 @@ type Controller struct {
func (c *Controller) List(ctx fiber.Ctx) error {
filter := ListFilter{}
if err := ctx.Bind().Body(&filter); err != nil {
log.WithError(err).Error("parse body failed")
return ctx.Status(fiber.StatusBadRequest).JSON(errorx.RequestParseError)
}
claim := ctx.Locals(consts.CtxKeyClaim).(*jwt.Claims)
@@ -32,15 +33,24 @@ func (c *Controller) List(ctx fiber.Ctx) error {
// Show
func (c *Controller) Show(ctx fiber.Ctx) error {
id := ToInt64(ctx.Params("id"))
tenantId, userId := ToInt64(ctx.Locals("tenantId")), ToInt64(ctx.Locals("userId"))
hash := ctx.Params("hash")
claim := fiber.Locals[*jwt.Claims](ctx, consts.CtxKeyClaim)
log.Debug(claim)
item, err := c.svc.GetByID(ctx.Context(), tenantId, userId, id)
model, err := c.svc.GetMediaByHash(ctx.Context(), claim.TenantID, hash)
if err != nil {
log.WithField("action", "medias.Show").WithError(err).Error("GetMediaByHash")
return ctx.Status(fiber.StatusInternalServerError).JSON(errorx.InternalError)
}
return ctx.JSON(item)
resource := c.svc.ModelToListItem(ctx.Context(), model)
resource.Bought, err = c.svc.HasUserBought(ctx.Context(), claim.TenantID, claim.UserID, model.ID)
if err != nil {
log.WithField("action", "medias.Show").WithError(err).Error("HasUserBought")
return ctx.Status(fiber.StatusInternalServerError).JSON(errorx.InternalError)
}
return ctx.JSON(resource)
}
// Audio

21
backend/modules/medias/dto.go
View File

@@ -1,17 +1,28 @@
package medias
import (
"backend/database/models/qvyun/public/model"
"time"
"backend/pkg/db"
"backend/pkg/pg"
)
type ListFilter struct {
db.Pagination
Title *string `json:"title"`
Bought *bool `json:"bought"`
Title *string `json:"title,omitempty"`
Bought *bool `json:"bought,omitempty"`
}
type ListItem struct {
model.Medias
Bought bool `json:"bought"`
ID int64 `json:"-"`
Hash string `json:"hash"`
Title string `json:"title"`
Description string `json:"description"`
Duration int64 `json:"duration"`
Price int64 `json:"price"`
Discount int64 `json:"discount"`
Resources pg.MediaResources `json:"resources"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
Bought bool `json:"bought"`
}

3
backend/modules/medias/router.go
View File

@@ -25,5 +25,6 @@ func (r *Router) Prepare() error {
func (r *Router) Register(router fiber.Router) {
group := router.Group(r.Name())
group.Get("", r.controller.List)
group.Post("", r.controller.List)
group.Get(":hash", r.controller.Show)
}

88
backend/modules/medias/service.go
View File

@@ -7,6 +7,7 @@ import (
"time"
"backend/common/media_store"
"backend/database/models/qvyun/public/model"
"backend/database/models/qvyun/public/table"
"backend/pkg/path"
"backend/pkg/pg"
@@ -30,9 +31,31 @@ func (svc *Service) Prepare() error {
return nil
}
// GetMediaByHash
func (svc *Service) GetMediaByHash(ctx context.Context, tenantId int64, hash string) (*model.Medias, error) {
log := svc.log.WithField("method", "GetMediaByHash")
tbl := table.Medias
stmt := tbl.
SELECT(tbl.AllColumns).
WHERE(
tbl.Hash.EQ(String(hash)).AND(
tbl.TenantID.EQ(Int(tenantId)),
),
)
log.Debug(stmt.DebugSql())
var m model.Medias
if err := stmt.QueryContext(ctx, svc.db, &m); err != nil {
return nil, errors.Wrapf(err, "get media by hash %s failed", hash)
}
return &m, nil
}
// GetByID
func (svc *Service) GetByID(ctx context.Context, tenantId, userId, id int64) (*ListItem, error) {
log := svc.log.WithField("method", "GetByID")
func (svc *Service) GetMediaByID(ctx context.Context, tenantId, userId, id int64) (*model.Medias, error) {
log := svc.log.WithField("method", "GetMediaByID")
tbl := table.Medias
stmt := tbl.SELECT(tbl.AllColumns).WHERE(
@@ -40,22 +63,28 @@ func (svc *Service) GetByID(ctx context.Context, tenantId, userId, id int64) (*L
tbl.TenantID.EQ(Int(tenantId)),
),
)
log.Debug(stmt.Sql())
log.Debug(stmt.DebugSql())
var media ListItem
if err := stmt.QueryContext(ctx, svc.db, &media); err != nil {
var m model.Medias
if err := stmt.QueryContext(ctx, svc.db, &m); err != nil {
return nil, errors.Wrap(err, "query media by id")
}
return &m, nil
}
// todo: resources
var err error
media.Bought, err = svc.HasUserBought(ctx, tenantId, userId, media.ID)
if err != nil {
return nil, errors.Wrap(err, "check user bought")
func (svc *Service) ModelToListItem(ctx context.Context, m *model.Medias) *ListItem {
return &ListItem{
ID: m.ID,
Hash: m.Hash,
Title: m.Title,
Description: m.Description,
Duration: m.Duration,
Price: m.Price,
Discount: m.Discount,
Resources: m.Resources,
CreatedAt: m.CreatedAt,
UpdatedAt: m.UpdatedAt,
}
return &media, nil
}
// List
@@ -102,14 +131,24 @@ func (svc *Service) List(ctx context.Context, tenantId, userId int64, filter *Li
}
log.Debug(stmt.DebugSql())
var dest []ListItem
var dest []model.Medias
if err := stmt.QueryContext(ctx, svc.db, &dest); err != nil {
return nil, errors.Wrap(err, "query medias")
}
items := lo.Map(dest, func(item ListItem, _ int) ListItem {
if lo.Contains(boughtIDs, item.ID) {
item.Bought = true
items := lo.Map(dest, func(m model.Medias, _ int) ListItem {
item := ListItem{
ID: m.ID,
Hash: m.Hash,
Title: m.Title,
Description: m.Description,
Duration: m.Duration,
Price: m.Price,
Discount: m.Discount,
Resources: m.Resources,
CreatedAt: m.CreatedAt,
UpdatedAt: m.UpdatedAt,
Bought: lo.Contains(boughtIDs, m.ID),
}
return item
})
@@ -145,7 +184,7 @@ func (svc *Service) HasUserBought(ctx context.Context, tenantId, userId, mediaId
tbl := table.UserMedias
stmt := tbl.
SELECT(tbl.MediaID).
SELECT(COUNT(tbl.MediaID).AS("cnt")).
WHERE(
tbl.TenantID.EQ(Int(tenantId)).AND(
tbl.UserID.EQ(Int(userId)).AND(
@@ -155,12 +194,14 @@ func (svc *Service) HasUserBought(ctx context.Context, tenantId, userId, mediaId
)
log.Debug(stmt.DebugSql())
var mediaID int64
if err := stmt.QueryContext(ctx, svc.db, &mediaID); err != nil {
var m struct {
Cnt int64
}
if err := stmt.QueryContext(ctx, svc.db, &m); err != nil {
return false, errors.Wrap(err, "query user bought media")
}
return mediaID > 0, nil
return m.Cnt > 0, nil
}
// Upsert
@@ -182,14 +223,15 @@ func (svc *Service) Upsert(ctx context.Context, tenantId int64, item media_store
tbl := table.Medias
stmt := tbl.
INSERT(tbl.TenantID, tbl.Hash, tbl.Title, tbl.Price, tbl.Resources, tbl.Publish).
VALUES(Int(tenantId), String(item.Hash), String(item.Name), Int(item.Price()), Json(resources.MustValue()), Bool(true)).
INSERT(tbl.TenantID, tbl.Hash, tbl.Title, tbl.Price, tbl.Duration, tbl.Resources, tbl.Publish).
VALUES(Int(tenantId), String(item.Hash), String(item.Name), Int(item.Price()), Int(item.Duration), Json(resources.MustValue()), Bool(true)).
ON_CONFLICT(tbl.Hash).
DO_UPDATE(
SET(
tbl.Title.SET(String(item.Name)),
tbl.Price.SET(Int(item.Price())),
tbl.Resources.SET(Json(resources.MustValue())),
tbl.Duration.SET(Int(item.Duration)),
tbl.Publish.SET(Bool(true)),
tbl.UpdatedAt.SET(TimestampT(time.Now())),
),