diff --git a/lib/workload_service/aggregates/task.ex b/lib/workload_service/aggregates/task.ex index 6dd3c86..4cf791d 100644 --- a/lib/workload_service/aggregates/task.ex +++ b/lib/workload_service/aggregates/task.ex @@ -33,8 +33,7 @@ defmodule WorkloadService.Aggregates.Task do :task_info, :submission, :attachments, - :status, - :version + :status ] @impl Aggregate @@ -99,8 +98,7 @@ defmodule WorkloadService.Aggregates.Task do application_id: e.application_id, task_info: e.task_info, attachments: e.attachments, - status: "created", - version: agg.version + 1 + status: "created" } end @@ -110,8 +108,7 @@ defmodule WorkloadService.Aggregates.Task do agg | submission: e.submission, attachments: e.attachments || [], - status: "draft", - version: agg.version + 1 + status: "draft" } end @@ -119,8 +116,7 @@ defmodule WorkloadService.Aggregates.Task do def apply(%__MODULE__{} = agg, %WorkloadService.Events.SubmissionApproved{}) do %{ agg - | status: "approved", - version: agg.version + 1 + | status: "approved" } end @@ -128,8 +124,7 @@ defmodule WorkloadService.Aggregates.Task do def apply(%__MODULE__{} = agg, %WorkloadService.Events.TaskCompleted{}) do %{ agg - | status: "completed", - version: agg.version + 1 + | status: "completed" } end diff --git a/lib/workload_service/projections/task.ex b/lib/workload_service/projections/task.ex index b87eed1..200a16c 100644 --- a/lib/workload_service/projections/task.ex +++ b/lib/workload_service/projections/task.ex @@ -19,7 +19,6 @@ defmodule WorkloadService.Projections.Task do field(:submission, :map) field(:attachments, {:array, :string}) field(:status, :string) - field(:version, :integer, default: 1) timestamps(type: :utc_datetime) end @@ -41,8 +40,7 @@ defmodule WorkloadService.Projections.Task do :task_info, :submission, :attachments, - :status, - :version + :status ]) |> validate_required([ :id, diff --git a/lib/workload_service_web/controllers/task_controller.ex b/lib/workload_service_web/controllers/task_controller.ex index 179a582..01dcf58 100644 --- a/lib/workload_service_web/controllers/task_controller.ex +++ b/lib/workload_service_web/controllers/task_controller.ex @@ -260,7 +260,6 @@ defmodule WorkloadServiceWeb.TaskController do submission: t.submission, attachments: t.attachments, status: t.status, - version: t.version, created_at: t.inserted_at, updated_at: t.updated_at } diff --git a/lib/workload_service_web/schemas/task.ex b/lib/workload_service_web/schemas/task.ex index 3fa33da..2721ac1 100644 --- a/lib/workload_service_web/schemas/task.ex +++ b/lib/workload_service_web/schemas/task.ex @@ -95,7 +95,6 @@ defmodule WorkloadServiceWeb.Schemas.Task do submission: %Schema{type: :object, nullable: true}, attachments: %Schema{type: :array, items: %Schema{type: :string}}, status: %Schema{type: :string, enum: ["created", "draft", "approved", "completed"]}, - version: %Schema{type: :integer}, created_at: %Schema{type: :string, format: :"date-time"}, updated_at: %Schema{type: :string, format: :"date-time"} } diff --git a/priv/repo/migrations/20240101000001_create_tasks.exs b/priv/repo/migrations/20240101000001_create_tasks.exs index 3935424..5d71cd8 100644 --- a/priv/repo/migrations/20240101000001_create_tasks.exs +++ b/priv/repo/migrations/20240101000001_create_tasks.exs @@ -10,7 +10,6 @@ defmodule WorkloadService.Repo.Migrations.CreateTasks do add(:submission, :map) add(:attachments, {:array, :string}, default: []) add(:status, :string, null: false, default: "created") - add(:version, :integer, default: 1) timestamps(type: :utc_datetime) end