diff --git a/backend/app/http/admin/posts.go b/backend/app/http/admin/posts.go index 3b4af7c..841e9c7 100644 --- a/backend/app/http/admin/posts.go +++ b/backend/app/http/admin/posts.go @@ -75,7 +75,46 @@ func (ctl *posts) Create(ctx fiber.Ctx, form *PostForm) error { // @Router /v1/admin/posts/:id [put] // @Bind id path // @Bind form body -func (ctl *posts) Update(ctx fiber.Ctx, id int64, form *model.Posts) error { +func (ctl *posts) Update(ctx fiber.Ctx, id int64, form *PostForm) error { + oldPost, err := models.Posts.GetByID(ctx.Context(), id) + if err != nil { + return err + } + + post := &model.Posts{ + Title: form.Title, + Price: form.Price, + Discount: form.Discount, + Description: form.Introduction, + Status: form.Status, + Content: "", + Tags: fields.Json[[]string]{}, + Assets: fields.Json[[]fields.MediaAsset]{}, + CreatedAt: oldPost.CreatedAt, + UpdatedAt: oldPost.UpdatedAt, + DeletedAt: oldPost.DeletedAt, + Views: oldPost.Views, + Likes: oldPost.Likes, + } + + if form.Medias != nil { + medias, err := models.Medias.GetByIds(ctx.Context(), form.Medias) + if err != nil { + return err + } + assets := lo.Map(medias, func(media *model.Medias, _ int) fields.MediaAsset { + return fields.MediaAsset{ + Type: models.Medias.ConvertFileTypeByMimeType(media.MimeType), + Media: media.ID, + Mark: nil, + } + }) + post.Assets = fields.ToJson(assets) + } + + if err := models.Posts.Update(ctx.Context(), id, post); err != nil { + return err + } return nil } diff --git a/backend/app/http/admin/routes.gen.go b/backend/app/http/admin/routes.gen.go index 374e374..5a3da4e 100644 --- a/backend/app/http/admin/routes.gen.go +++ b/backend/app/http/admin/routes.gen.go @@ -10,7 +10,6 @@ import ( . "go.ipao.vip/atom/fen" "mime/multipart" "quyun/app/requests" - "quyun/database/schemas/public/model" ) // @provider contracts.HttpRoute atom.GroupRoutes @@ -53,7 +52,7 @@ func (r *Routes) Register(router fiber.Router) { router.Put("/v1/admin/posts/:id", Func2( r.posts.Update, PathParam[int64]("id"), - Body[model.Posts]("form"), + Body[PostForm]("form"), )) router.Delete("/v1/admin/posts/:id", Func1( diff --git a/backend/app/models/posts.go b/backend/app/models/posts.go index 0eacc46..d7ead86 100644 --- a/backend/app/models/posts.go +++ b/backend/app/models/posts.go @@ -90,7 +90,7 @@ func (m *postsModel) Update(ctx context.Context, id int64, model *model.Posts) e model.UpdatedAt = time.Now() tbl := table.Posts - stmt := tbl.UPDATE(tbl.MutableColumns).SET(model).WHERE(tbl.ID.EQ(Int64(id))) + stmt := tbl.UPDATE(tbl.MutableColumns).MODEL(model).WHERE(tbl.ID.EQ(Int64(id))) m.log.Infof("sql: %s", stmt.DebugSql()) _, err := stmt.ExecContext(ctx, db) diff --git a/backend/go.mod b/backend/go.mod index d984a1e..6a28d40 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -102,6 +102,7 @@ require ( github.com/jcmturner/gofork v1.7.6 // indirect github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect github.com/jcmturner/rpc/v2 v2.0.3 // indirect + github.com/jinzhu/copier v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/jtolds/gls v4.20.0+incompatible // indirect diff --git a/backend/go.sum b/backend/go.sum index f38a030..67c13d8 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -168,6 +168,8 @@ github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh6 github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= +github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8= +github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= diff --git a/frontend/admin/src/pages/PostEditPage.vue b/frontend/admin/src/pages/PostEditPage.vue index 093cdf7..c14560b 100644 --- a/frontend/admin/src/pages/PostEditPage.vue +++ b/frontend/admin/src/pages/PostEditPage.vue @@ -1,7 +1,8 @@