feat: update
This commit is contained in:
@@ -19,8 +19,8 @@ type medias struct {
|
||||
// @Bind pagination query
|
||||
// @Bind query query
|
||||
func (ctl *medias) List(ctx fiber.Ctx, pagination *requests.Pagination, query *ListQuery) (*requests.Pager, error) {
|
||||
cond := model.MediasModel.BuildConditionWithKey(query.Keyword)
|
||||
return model.MediasModel.List(ctx.Context(), pagination, cond)
|
||||
cond := model.MediasModel().BuildConditionWithKey(query.Keyword)
|
||||
return model.MediasModel().List(ctx.Context(), pagination, cond)
|
||||
}
|
||||
|
||||
// Show media
|
||||
@@ -28,7 +28,7 @@ func (ctl *medias) List(ctx fiber.Ctx, pagination *requests.Pagination, query *L
|
||||
// @Router /admin/medias/:id [get]
|
||||
// @Bind id path
|
||||
func (ctl *medias) Show(ctx fiber.Ctx, id int64) error {
|
||||
media, err := model.MediasModel.GetByID(ctx.Context(), id)
|
||||
media, err := model.MediasModel().GetByID(ctx.Context(), id)
|
||||
if err != nil {
|
||||
return ctx.SendString("Media not found")
|
||||
}
|
||||
@@ -46,7 +46,7 @@ func (ctl *medias) Show(ctx fiber.Ctx, id int64) error {
|
||||
// @Router /admin/medias/:id [delete]
|
||||
// @Bind id path
|
||||
func (ctl *medias) Delete(ctx fiber.Ctx, id int64) error {
|
||||
media, err := model.MediasModel.GetByID(ctx.Context(), id)
|
||||
media, err := model.MediasModel().GetByID(ctx.Context(), id)
|
||||
if err != nil {
|
||||
return ctx.SendString("Media not found")
|
||||
}
|
||||
@@ -55,7 +55,7 @@ func (ctl *medias) Delete(ctx fiber.Ctx, id int64) error {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := model.MediasModel.Delete(ctx.Context(), id); err != nil {
|
||||
if err := model.MediasModel().Delete(ctx.Context(), id); err != nil {
|
||||
return err
|
||||
}
|
||||
return ctx.SendStatus(fiber.StatusNoContent)
|
||||
|
||||
@@ -28,25 +28,25 @@ type orders struct {
|
||||
// @Bind pagination query
|
||||
// @Bind query query
|
||||
func (ctl *orders) List(ctx fiber.Ctx, pagination *requests.Pagination, query *OrderListQuery) (*requests.Pager, error) {
|
||||
cond := model.OrdersModel.BuildConditionWithKey(query.OrderNumber, query.UserID)
|
||||
return model.OrdersModel.List(ctx.Context(), pagination, cond)
|
||||
cond := model.OrdersModel().BuildConditionWithKey(query.OrderNumber, query.UserID)
|
||||
return model.OrdersModel().List(ctx.Context(), pagination, cond)
|
||||
}
|
||||
|
||||
// Refund
|
||||
// @Router /admin/orders/:id/refund [post]
|
||||
// @Bind id path
|
||||
func (ctl *orders) Refund(ctx fiber.Ctx, id int64) error {
|
||||
order, err := model.OrdersModel.GetByID(ctx.Context(), id)
|
||||
order, err := model.OrdersModel().GetByID(ctx.Context(), id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
user, err := model.UsersModel.GetByID(ctx.Context(), order.UserID)
|
||||
user, err := model.UsersModel().GetByID(ctx.Context(), order.UserID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
post, err := model.PostsModel.GetByID(ctx.Context(), order.PostID)
|
||||
post, err := model.PostsModel().GetByID(ctx.Context(), order.PostID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -61,7 +61,7 @@ func (ctl *orders) Refund(ctx fiber.Ctx, id int64) error {
|
||||
}
|
||||
|
||||
order.Status = fields.OrderStatusRefundSuccess
|
||||
if err := model.OrdersModel.Update(ctx.Context(), order); err != nil {
|
||||
if err := order.Update(ctx.Context()); err != nil {
|
||||
return errors.Wrap(err, "update order failed")
|
||||
}
|
||||
|
||||
@@ -87,7 +87,7 @@ func (ctl *orders) Refund(ctx fiber.Ctx, id int64) error {
|
||||
order.RefundTransactionID = resp.RefundId
|
||||
order.Status = fields.OrderStatusRefundProcessing
|
||||
|
||||
if err := model.OrdersModel.Update(ctx.Context(), order); err != nil {
|
||||
if err := order.Update(ctx.Context()); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ func (ctl *posts) List(ctx fiber.Ctx, pagination *requests.Pagination, query *Li
|
||||
// conds.Post_Status(fields.PostStatusPublished),
|
||||
conds.Post_Like(query.Keyword),
|
||||
}
|
||||
pager, err := model.PostsModel.List(ctx.Context(), pagination, conds...)
|
||||
pager, err := model.PostsModel().List(ctx.Context(), pagination, conds...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -37,7 +37,7 @@ func (ctl *posts) List(ctx fiber.Ctx, pagination *requests.Pagination, query *Li
|
||||
return item.ID
|
||||
})
|
||||
if len(postIds) > 0 {
|
||||
postCntMap, err := model.PostsModel.BoughtStatistics(ctx.Context(), postIds)
|
||||
postCntMap, err := model.PostsModel().BoughtStatistics(ctx.Context(), postIds)
|
||||
if err != nil {
|
||||
return pager, err
|
||||
}
|
||||
@@ -85,7 +85,7 @@ func (ctl *posts) Create(ctx fiber.Ctx, form *PostForm) error {
|
||||
}
|
||||
|
||||
if form.Medias != nil {
|
||||
medias, err := model.MediasModel.GetByIds(ctx.Context(), form.Medias)
|
||||
medias, err := model.MediasModel().GetByIds(ctx.Context(), form.Medias)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -111,7 +111,7 @@ func (ctl *posts) Create(ctx fiber.Ctx, form *PostForm) error {
|
||||
// @Bind id path
|
||||
// @Bind form body
|
||||
func (ctl *posts) Update(ctx fiber.Ctx, id int64, form *PostForm) error {
|
||||
post, err := model.PostsModel.GetByID(ctx.Context(), id)
|
||||
post, err := model.PostsModel().GetByID(ctx.Context(), id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -125,7 +125,7 @@ func (ctl *posts) Update(ctx fiber.Ctx, id int64, form *PostForm) error {
|
||||
post.Tags = fields.Json[[]string]{}
|
||||
|
||||
if form.Medias != nil {
|
||||
medias, err := model.MediasModel.GetByIds(ctx.Context(), form.Medias)
|
||||
medias, err := model.MediasModel().GetByIds(ctx.Context(), form.Medias)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -150,7 +150,7 @@ func (ctl *posts) Update(ctx fiber.Ctx, id int64, form *PostForm) error {
|
||||
// @Router /admin/posts/:id [delete]
|
||||
// @Bind id path
|
||||
func (ctl *posts) Delete(ctx fiber.Ctx, id int64) error {
|
||||
post, err := model.PostsModel.GetByID(ctx.Context(), id)
|
||||
post, err := model.PostsModel().GetByID(ctx.Context(), id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -175,12 +175,12 @@ type PostItem struct {
|
||||
// @Router /admin/posts/:id [get]
|
||||
// @Bind id path
|
||||
func (ctl *posts) Show(ctx fiber.Ctx, id int64) (*PostItem, error) {
|
||||
post, err := model.PostsModel.GetByID(ctx.Context(), id)
|
||||
post, err := model.PostsModel().GetByID(ctx.Context(), id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
medias, err := model.MediasModel.GetByIds(ctx.Context(), lo.Map(post.Assets.Data, func(asset fields.MediaAsset, _ int) int64 {
|
||||
medias, err := model.MediasModel().GetByIds(ctx.Context(), lo.Map(post.Assets.Data, func(asset fields.MediaAsset, _ int) int64 {
|
||||
return asset.Media
|
||||
}))
|
||||
if err != nil {
|
||||
@@ -198,12 +198,12 @@ func (ctl *posts) Show(ctx fiber.Ctx, id int64) (*PostItem, error) {
|
||||
// @Bind id path
|
||||
// @Bind userId path
|
||||
func (ctl *posts) SendTo(ctx fiber.Ctx, id, userId int64) error {
|
||||
post, err := model.PostsModel.GetByID(ctx.Context(), id)
|
||||
post, err := model.PostsModel().GetByID(ctx.Context(), id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
user, err := model.UsersModel.GetByID(ctx.Context(), userId)
|
||||
user, err := model.UsersModel().GetByID(ctx.Context(), userId)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -29,31 +29,31 @@ func (s *statistics) statistics(ctx fiber.Ctx) (*StatisticsResponse, error) {
|
||||
|
||||
var err error
|
||||
|
||||
statistics.PostDraft, err = model.PostsModel.Count(ctx.Context(), table.Posts.Status.EQ(Int(int64(fields.PostStatusDraft))))
|
||||
statistics.PostDraft, err = model.PostsModel().Count(ctx.Context(), table.Posts.Status.EQ(Int(int64(fields.PostStatusDraft))))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
statistics.PostPublished, err = model.PostsModel.Count(ctx.Context(), table.Posts.Status.EQ(Int(int64(fields.PostStatusPublished))))
|
||||
statistics.PostPublished, err = model.PostsModel().Count(ctx.Context(), table.Posts.Status.EQ(Int(int64(fields.PostStatusPublished))))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
statistics.Media, err = model.MediasModel.Count(ctx.Context())
|
||||
statistics.Media, err = model.MediasModel().Count(ctx.Context())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
statistics.Order, err = model.OrdersModel.Count(ctx.Context(), table.Orders.Status.EQ(Int(int64(fields.OrderStatusCompleted))))
|
||||
statistics.Order, err = model.OrdersModel().Count(ctx.Context(), table.Orders.Status.EQ(Int(int64(fields.OrderStatusCompleted))))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
statistics.User, err = model.UsersModel.Count(ctx.Context(), BoolExp(Bool(true)))
|
||||
statistics.User, err = model.UsersModel().Count(ctx.Context(), BoolExp(Bool(true)))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
statistics.Amount, err = model.OrdersModel.SumAmount(ctx.Context())
|
||||
statistics.Amount, err = model.OrdersModel().SumAmount(ctx.Context())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ type PreCheckResp struct {
|
||||
// @Bind ext path
|
||||
// @Bind mime query
|
||||
func (up *uploads) PreUploadCheck(ctx fiber.Ctx, md5, ext, mime string) (*PreCheckResp, error) {
|
||||
_, err := model.MediasModel.GetByHash(ctx.Context(), md5)
|
||||
_, err := model.MediasModel().GetByHash(ctx.Context(), md5)
|
||||
if err != nil && errors.Is(err, qrm.ErrNoRows) {
|
||||
preSign, err := up.oss.PreSignUpload(ctx.Context(), fmt.Sprintf("%s.%s", md5, ext), mime)
|
||||
if err != nil {
|
||||
@@ -63,7 +63,7 @@ type PostUploadedForm struct {
|
||||
// @Router /admin/uploads/post-uploaded-action [post]
|
||||
// @Bind body body
|
||||
func (up *uploads) PostUploadedAction(ctx fiber.Ctx, body *PostUploadedForm) error {
|
||||
m, err := model.MediasModel.GetByHash(ctx.Context(), body.Md5)
|
||||
m, err := model.MediasModel().GetByHash(ctx.Context(), body.Md5)
|
||||
if err != nil && !errors.Is(err, qrm.ErrNoRows) {
|
||||
return err
|
||||
}
|
||||
@@ -75,7 +75,7 @@ func (up *uploads) PostUploadedAction(ctx fiber.Ctx, body *PostUploadedForm) err
|
||||
Hash: body.Md5,
|
||||
Path: filepath.Join(UPLOAD_PATH, body.Md5+filepath.Ext(body.OriginalName)),
|
||||
}
|
||||
if err := model.MediasModel.Create(ctx.Context(), m); err != nil {
|
||||
if err := model.MediasModel().Create(ctx.Context(), m); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
@@ -20,8 +20,8 @@ type users struct{}
|
||||
// @Bind pagination query
|
||||
// @Bind query query
|
||||
func (ctl *users) List(ctx fiber.Ctx, pagination *requests.Pagination, query *UserListQuery) (*requests.Pager, error) {
|
||||
cond := model.UsersModel.BuildConditionWithKey(query.Keyword)
|
||||
return model.UsersModel.List(ctx.Context(), pagination, cond)
|
||||
cond := model.UsersModel().BuildConditionWithKey(query.Keyword)
|
||||
return model.UsersModel().List(ctx.Context(), pagination, cond)
|
||||
}
|
||||
|
||||
// Show user
|
||||
@@ -29,7 +29,7 @@ func (ctl *users) List(ctx fiber.Ctx, pagination *requests.Pagination, query *Us
|
||||
// @Router /admin/users/:id [get]
|
||||
// @Bind id path
|
||||
func (ctl *users) Show(ctx fiber.Ctx, id int64) (*model.Users, error) {
|
||||
return model.UsersModel.GetByID(ctx.Context(), id)
|
||||
return model.UsersModel().GetByID(ctx.Context(), id)
|
||||
}
|
||||
|
||||
// Articles show user bought articles
|
||||
@@ -38,7 +38,7 @@ func (ctl *users) Show(ctx fiber.Ctx, id int64) (*model.Users, error) {
|
||||
// @Bind id path
|
||||
// @Bind pagination query
|
||||
func (ctl *users) Articles(ctx fiber.Ctx, id int64, pagination *requests.Pagination) (*requests.Pager, error) {
|
||||
return model.PostsModel.Bought(ctx.Context(), id, pagination)
|
||||
return model.PostsModel().Bought(ctx.Context(), id, pagination)
|
||||
}
|
||||
|
||||
type UserBalance struct {
|
||||
@@ -51,7 +51,7 @@ type UserBalance struct {
|
||||
// @Bind id path
|
||||
// @Bind balance body
|
||||
func (ctl *users) Balance(ctx fiber.Ctx, id int64, balance *UserBalance) error {
|
||||
user, err := model.UsersModel.GetByID(ctx.Context(), id)
|
||||
user, err := model.UsersModel().GetByID(ctx.Context(), id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user