From 7282d8d7bcffe7ea812caedd54a91f63421c34e9 Mon Sep 17 00:00:00 2001 From: gearnode Date: Fri, 28 Mar 2025 14:26:34 +0100 Subject: [PATCH] Fix create task Signed-off-by: gearnode --- pkg/coredata/migrations/20250328T142200Z.sql | 1 + pkg/probo/task_service.go | 46 ++++++++++---------- 2 files changed, 23 insertions(+), 24 deletions(-) create mode 100644 pkg/coredata/migrations/20250328T142200Z.sql diff --git a/pkg/coredata/migrations/20250328T142200Z.sql b/pkg/coredata/migrations/20250328T142200Z.sql new file mode 100644 index 000000000..440f5ae00 --- /dev/null +++ b/pkg/coredata/migrations/20250328T142200Z.sql @@ -0,0 +1 @@ +ALTER TABLE tasks DROP COLUMN content_ref; \ No newline at end of file diff --git a/pkg/probo/task_service.go b/pkg/probo/task_service.go index 12fdc4c7d..e864d01f4 100644 --- a/pkg/probo/task_service.go +++ b/pkg/probo/task_service.go @@ -51,41 +51,39 @@ func (s TaskService) Create( ctx context.Context, req CreateTaskRequest, ) (*coredata.Task, error) { - mitigation := &coredata.Mitigation{} + now := time.Now() + taskID, err := gid.NewGID(s.svc.scope.GetTenantID(), coredata.TaskEntityType) + if err != nil { + return nil, fmt.Errorf("cannot generate id: %w", err) + } - err := s.svc.pg.WithTx( + task := &coredata.Task{ + ID: taskID, + MitigationID: req.MitigationID, + Name: req.Name, + Description: req.Description, + TimeEstimate: req.TimeEstimate, + AssignedToID: req.AssignedToID, + State: coredata.TaskStateTodo, + CreatedAt: now, + UpdatedAt: now, + } + + err = s.svc.pg.WithTx( ctx, func(conn pg.Conn) error { - if err := mitigation.LoadByID(ctx, conn, s.svc.scope, req.MitigationID); err != nil { - return fmt.Errorf("cannot load mitigation %q: %w", req.MitigationID, err) + if err := task.Insert(ctx, conn, s.svc.scope); err != nil { + return fmt.Errorf("cannot insert task: %w", err) } - now := time.Now() - taskID, err := gid.NewGID(s.svc.scope.GetTenantID(), coredata.TaskEntityType) - if err != nil { - return fmt.Errorf("cannot generate id: %w", err) - } - - task := &coredata.Task{ - ID: taskID, - MitigationID: req.MitigationID, - Name: req.Name, - Description: req.Description, - TimeEstimate: req.TimeEstimate, - AssignedToID: req.AssignedToID, - State: coredata.TaskStateTodo, - CreatedAt: now, - UpdatedAt: now, - } - - return task.Insert(ctx, conn, s.svc.scope) + return nil }, ) if err != nil { return nil, fmt.Errorf("cannot create task: %w", err) } - return s.Get(ctx, req.MitigationID) + return task, nil } func (s TaskService) Get(