rogee/quyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: update

Browse Source
This commit is contained in:
Rogee
2025-05-23 21:39:01 +08:00
parent f370887a71
commit f13ef4388e
20 changed files with 114 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
backend/app/model/medias_test.go
View File

@@ -52,7 +52,7 @@ func (s *MediasTestSuite) Test_countByCondition() {
Convey("no cond", func() {
database.Truncate(context.Background(), db, table.Medias.TableName())
cnt, err := MediasModel.countByCondition(context.Background(), nil)
cnt, err := MediasModel().countByCondition(context.Background(), nil)
Convey("should not return an error", func() {
So(err, ShouldBeNil)
})
@@ -110,7 +110,7 @@ func (s *MediasTestSuite) Test_BatchCreate() {
count := 10
for i := 0; i < count; i++ {
err := MediasModel.BatchCreate(context.Background(), models)
err := MediasModel().BatchCreate(context.Background(), models)
Convey("Create should not return an error: "+fmt.Sprintf("%d", i), func() {
So(err, ShouldBeNil)
})
@@ -132,12 +132,12 @@ func (s *MediasTestSuite) Test_Create() {
Path: "path/to/media.pdf",
}
err := MediasModel.Create(context.Background(), model)
err := MediasModel().Create(context.Background(), model)
Convey("Create should not return an error", func() {
So(err, ShouldBeNil)
})
cnt, err := MediasModel.countByCondition(context.Background(), nil)
cnt, err := MediasModel().countByCondition(context.Background(), nil)
Convey("Count should not return an error", func() {
So(err, ShouldBeNil)
})
@@ -165,31 +165,31 @@ func (s *MediasTestSuite) Test_Page() {
Path: "path/to/media.pdf",
}
err := MediasModel.Create(context.Background(), model)
err := MediasModel().Create(context.Background(), model)
So(err, ShouldBeNil)
}
cnt, err := MediasModel.countByCondition(context.Background(), nil)
cnt, err := MediasModel().countByCondition(context.Background(), nil)
So(err, ShouldBeNil)
So(cnt, ShouldEqual, 20)
})
Convey("Page", func() {
Convey("page 1", func() {
pager, err := MediasModel.List(context.Background(), &requests.Pagination{Page: 1, Limit: 10}, nil)
pager, err := MediasModel().List(context.Background(), &requests.Pagination{Page: 1, Limit: 10}, nil)
So(err, ShouldBeNil)
So(pager.Total, ShouldEqual, 20)
So(pager.Items, ShouldHaveLength, 10)
})
Convey("page 2", func() {
pager, err := MediasModel.List(context.Background(), &requests.Pagination{Page: 2, Limit: 10}, nil)
pager, err := MediasModel().List(context.Background(), &requests.Pagination{Page: 2, Limit: 10}, nil)
So(err, ShouldBeNil)
So(pager.Total, ShouldEqual, 20)
So(pager.Items, ShouldHaveLength, 10)
})
Convey("page 3", func() {
pager, err := MediasModel.List(context.Background(), &requests.Pagination{Page: 3, Limit: 10}, nil)
pager, err := MediasModel().List(context.Background(), &requests.Pagination{Page: 3, Limit: 10}, nil)
So(err, ShouldBeNil)
So(pager.Total, ShouldEqual, 20)
So(pager.Items, ShouldBeEmpty)
@@ -208,7 +208,7 @@ func (s *MediasTestSuite) Test_CreateGetID() {
Path: "path/to/media.pdf",
}
err := MediasModel.Create(context.Background(), model)
err := MediasModel().Create(context.Background(), model)
So(err, ShouldBeNil)
So(model.ID, ShouldNotBeEmpty)
@@ -219,7 +219,7 @@ func (s *MediasTestSuite) Test_CreateGetID() {
func (s *MediasTestSuite) Test_GetRelations() {
Convey("GetByHash", s.T(), func() {
hash := "ce4cd071128cef282cf315dda75bdab4"
media, err := MediasModel.GetRelations(context.Background(), hash)
media, err := MediasModel().GetRelations(context.Background(), hash)
So(err, ShouldBeNil)
So(media, ShouldNotBeNil)

54
backend/app/model/orders.go
View File

@@ -99,7 +99,7 @@ func (m *Orders) List(ctx context.Context, pagination *requests.Pagination, cond
return nil, err
}
postsMap, err := PostsModel.GetPostsMapByIDs(ctx, lo.Map(orders, func(order Orders, _ int) int64 {
postsMap, err := PostsModel().GetPostsMapByIDs(ctx, lo.Map(orders, func(order Orders, _ int) int64 {
return order.PostID
}))
if err != nil {
@@ -107,7 +107,7 @@ func (m *Orders) List(ctx context.Context, pagination *requests.Pagination, cond
return nil, err
}
userMap, err := UsersModel.GetUsersMapByIDs(ctx, lo.Map(orders, func(order Orders, _ int) int64 {
userMap, err := UsersModel().GetUsersMapByIDs(ctx, lo.Map(orders, func(order Orders, _ int) int64 {
return order.UserID
}))
if err != nil {
@@ -151,7 +151,7 @@ func (m *Orders) List(ctx context.Context, pagination *requests.Pagination, cond
// Create creates a new order
func (o *Orders) Create(ctx context.Context, userId, postId int64) (*Orders, error) {
post, err := PostsModel.GetByID(ctx, postId)
post, err := PostsModel().GetByID(ctx, postId)
if err != nil {
return nil, errors.Wrap(err, "failed to get post")
}
@@ -172,48 +172,43 @@ func (o *Orders) Create(ctx context.Context, userId, postId int64) (*Orders, err
stmt := tbl.INSERT(tbl.MutableColumns).MODEL(m).RETURNING(tbl.AllColumns)
o.log().Infof("sql: %s", stmt.DebugSql())
var order Orders
if err := stmt.QueryContext(ctx, db, &order); err != nil {
if err := stmt.QueryContext(ctx, db, o); err != nil {
o.log().Errorf("error creating order: %v", err)
return nil, err
}
return &order, nil
return o, nil
}
func (m *Orders) SetMeta(ctx context.Context, id int64, metaFunc func(fields.OrderMeta) fields.OrderMeta) error {
order, err := m.GetByID(ctx, id)
if err != nil {
return errors.Wrap(err, "failed to get order")
}
func (m *Orders) SetMeta(ctx context.Context, metaFunc func(fields.OrderMeta) fields.OrderMeta) error {
tbl := table.Orders
stmt := tbl.
UPDATE(tbl.Meta).
SET(fields.ToJson(metaFunc(order.Meta.Data))).
SET(fields.ToJson(metaFunc(m.Meta.Data))).
WHERE(
tbl.ID.EQ(Int64(id)),
)
tbl.ID.EQ(Int64(m.ID)),
).
RETURNING(tbl.AllColumns)
m.log().Infof("sql: %s", stmt.DebugSql())
if _, err := stmt.ExecContext(ctx, db); err != nil {
if err := stmt.QueryContext(ctx, db, m); err != nil {
m.log().Errorf("error set order meta: %v", err)
return err
}
return nil
}
// DeleteByID soft deletes an order by ID
func (m *Orders) SetStatus(ctx context.Context, orderNo string, status fields.OrderStatus) error {
func (m *Orders) SetStatus(ctx context.Context, status fields.OrderStatus) error {
tbl := table.Orders
stmt := tbl.
UPDATE(tbl.Status).
SET(status).
WHERE(
tbl.OrderNo.EQ(String(orderNo)),
)
tbl.ID.EQ(Int64(m.ID)),
).
RETURNING(tbl.AllColumns)
m.log().Infof("sql: %s", stmt.DebugSql())
if _, err := stmt.ExecContext(ctx, db); err != nil {
if err := stmt.QueryContext(ctx, db, m); err != nil {
m.log().Errorf("error set order status: %v", err)
return err
}
@@ -280,14 +275,14 @@ func (m *Orders) GetByOrderNo(ctx context.Context, orderNo string) (*Orders, err
return &order, nil
}
// SetTranscationID
func (m *Orders) SetTranscationID(ctx context.Context, id int64, transactionID string) error {
// SetTransactionID
func (m *Orders) SetTransactionID(ctx context.Context, transactionID string) error {
tbl := table.Orders
stmt := tbl.
UPDATE(tbl.TransactionID).
SET(String(transactionID)).
WHERE(
tbl.ID.EQ(Int64(id)),
tbl.ID.EQ(Int64(m.ID)),
)
m.log().Infof("sql: %s", stmt.DebugSql())
@@ -299,7 +294,7 @@ func (m *Orders) SetTranscationID(ctx context.Context, id int64, transactionID s
}
// Update
func (m *Orders) Update(ctx context.Context, order *Orders) error {
func (m *Orders) Update(ctx context.Context) error {
tbl := table.Orders
stmt := tbl.
UPDATE(
@@ -312,13 +307,14 @@ func (m *Orders) Update(ctx context.Context, order *Orders) error {
tbl.UserID,
),
).
MODEL(order).
MODEL(m).
WHERE(
tbl.ID.EQ(Int64(order.ID)),
)
tbl.ID.EQ(Int64(m.ID)),
).
RETURNING(tbl.AllColumns)
m.log().Infof("sql: %s", stmt.DebugSql())
if _, err := stmt.ExecContext(ctx, db); err != nil {
if err := stmt.QueryContext(ctx, db, m); err != nil {
m.log().Errorf("error updating order: %v", err)
return err
}

59
backend/app/model/provider.gen.go
View File

@@ -14,60 +14,19 @@ import (
)
var db *sql.DB
var MediasModel *Medias
var OrdersModel *Orders
var PostsModel *Posts
var UsersModel *Users
func Transaction(ctx context.Context) (*sql.Tx, error) {
return db.Begin()
}
func DB() *sql.DB {
return db
}
func MediasModel() *Medias { return &Medias{} }
func OrdersModel() *Orders { return &Orders{} }
func PostsModel() *Posts { return &Posts{} }
func UsersModel() *Users { return &Users{} }
func Transaction(ctx context.Context) (*sql.Tx, error) { return db.Begin() }
func DB() *sql.DB { return db }
func Provide(opts ...opt.Option) error {
if err := container.Container.Provide(func() (*Medias, error) {
obj := &Medias{}
return obj, nil
}); err != nil {
return err
}
if err := container.Container.Provide(func() (*Orders, error) {
obj := &Orders{}
return obj, nil
}); err != nil {
return err
}
if err := container.Container.Provide(func() (*Posts, error) {
obj := &Posts{}
return obj, nil
}); err != nil {
return err
}
if err := container.Container.Provide(func() (*Users, error) {
obj := &Users{}
return obj, nil
}); err != nil {
return err
}
if err := container.Container.Provide(func(
_db *sql.DB,
medias *Medias,
orders *Orders,
posts *Posts,
users *Users,
) (contracts.Initial, error) {
if err := container.Container.Provide(func(_db *sql.DB) (contracts.Initial, error) {
db = _db
MediasModel = medias
OrdersModel = orders
PostsModel = posts
UsersModel = users
return nil, nil
}, atom.GroupInitial); err != nil {
return err