Open platform to collect and prioritize feedback
fix: #313 by enqueuing it only after commit (#314)
Guilherme Oenning937061a61667
diff --git a/app/middlewares/setup.go b/app/middlewares/setup.goindex 622841323..56f4ecd4b 100644--- a/app/middlewares/setup.go+++ b/app/middlewares/setup.go@@ -100,9 +100,7 @@ func WebSetup(logger log.Logger) web.MiddlewareFunc {err := fmt.Errorf("%v\n%v", r, string(debug.Stack()))c.Failure(err)c.Logger().Debugf("%s finished in %s", path, log.Magenta(time.Since(start).String()))- if trx != nil {- trx.Rollback()- }+ c.Rollback()}}()@@ -110,7 +108,7 @@ func WebSetup(logger log.Logger) web.MiddlewareFunc {return err}- if err = trx.Commit(); err != nil {+ if err = c.Commit(); err != nil {return err}diff --git a/app/middlewares/setup_test.go b/app/middlewares/setup_test.goindex c2f9d0cbc..0c76089fc 100644--- a/app/middlewares/setup_test.go+++ b/app/middlewares/setup_test.go@@ -50,6 +50,34 @@ func TestWebSetup_Panic(t *testing.T) {Expect(status).To(Equal(http.StatusInternalServerError))}+func TestWebSetup_NotQueueTask_OnFailure(t *testing.T) {+ RegisterTestingT(t)++ server, _ := mock.NewServer()+ server.Use(middlewares.WebSetup(log.NewNoopLogger()))+ status, _ := server.Execute(func(c web.Context) error {+ c.Enqueue(mock.NewNoopTask())+ return c.Failure(errors.New("Something went wrong..."))+ })++ Expect(status).To(Equal(http.StatusInternalServerError))+ Expect(server.Engine().Worker().Length()).To(Equal(0))+}++func TestWebSetup_QueueTask_OnSuccess(t *testing.T) {+ RegisterTestingT(t)++ server, _ := mock.NewServer()+ server.Use(middlewares.WebSetup(log.NewNoopLogger()))+ status, _ := server.Execute(func(c web.Context) error {+ c.Enqueue(mock.NewNoopTask())+ return c.Ok(web.Map{})+ })++ Expect(status).To(Equal(http.StatusOK))+ Expect(server.Engine().Worker().Length()).To(Equal(1))+}+func TestWorkerSetup(t *testing.T) {RegisterTestingT(t)diff --git a/app/pkg/mock/server.go b/app/pkg/mock/server.goindex 3725981c1..7a54dad02 100644--- a/app/pkg/mock/server.go+++ b/app/pkg/mock/server.go@@ -40,6 +40,11 @@ func createServer(services *app.Services) *Server {}}+// Engine returns current engine from mocked server+func (s *Server) Engine() *web.Engine {+ return s.engine+}+// Use adds a new middleware to pipelinefunc (s *Server) Use(middleware web.MiddlewareFunc) {s.middleware = middlewarediff --git a/app/pkg/mock/worker.go b/app/pkg/mock/worker.goindex cfd8774b6..2e7c7f9b8 100644--- a/app/pkg/mock/worker.go+++ b/app/pkg/mock/worker.go@@ -40,3 +40,13 @@ func (w *Worker) Execute(task worker.Task) error {context.SetTenant(w.tenant)return task.Job(context)}++// NewNoopTask returns a worker task that does nothing+func NewNoopTask() worker.Task {+ return worker.Task{+ Name: "Noop Task",+ Job: func(c *worker.Context) error {+ return nil+ },+ }+}diff --git a/app/pkg/web/context.go b/app/pkg/web/context.goindex 70a840dd7..dbe62d72b 100644--- a/app/pkg/web/context.go+++ b/app/pkg/web/context.go@@ -48,6 +48,7 @@ var (authEndpointContextKey = preffixKey + "AUTH_ENDPOINT"transactionContextKey = preffixKey + "TRANSACTION"servicesContextKey = preffixKey + "SERVICES"+ tasksContextKey = preffixKey + "TASKS")//Context shared between http pipeline@@ -66,6 +67,33 @@ func (ctx *Context) Engine() *Engine {return ctx.engine}+//Commit everything that is pending on current context+func (ctx *Context) Commit() error {+ if trx := ctx.ActiveTransaction(); trx != nil {+ if err := trx.Commit(); err != nil {+ return err+ }+ }++ tasks, ok := ctx.Get(tasksContextKey).([]worker.Task)+ if ok {+ for _, task := range tasks {+ ctx.worker.Enqueue(task)+ }+ }++ return nil+}++//Rollback everything that is pending on current context+func (ctx *Context) Rollback() error {+ if trx := ctx.ActiveTransaction(); trx != nil {+ return trx.Rollback()+ }++ return nil+}+//Enqueue given task to be processed in backgroundfunc (ctx *Context) Enqueue(task worker.Task) {wrap := func(c *Context) worker.Job {@@ -77,10 +105,15 @@ func (ctx *Context) Enqueue(task worker.Task) {}}- ctx.worker.Enqueue(worker.Task{+ tasks, ok := ctx.Get(tasksContextKey).([]worker.Task)+ if !ok {+ tasks = make([]worker.Task, 0)+ }++ ctx.Set(tasksContextKey, append(tasks, worker.Task{Name: task.Name,Job: wrap(ctx),- })+ }))}//Tenant returns current tenant