Drop Workflow Id From Snapshot When Pulling With CLI (#2467)

CHANGELOG.md

@@ -26,6 +26,9 @@ and this project adheres to
 
 ### Fixed
 
+- Fix `workflow_id` presence in state.json during Github sync
+  [#2445](https://github.com/OpenFn/lightning/issues/2445)
+
 ## [v2.8.2] - 2024-09-04
 
 ### Added

lib/lightning_web/controllers/api/provisioning_json.ex

@@ -47,6 +47,9 @@ defmodule LightningWeb.API.ProvisioningJSON do
 
     workflow_or_snapshot
     |> Ecto.embedded_dump(:json)
+    |> Map.take(
+      ~w(id name inserted_at updated_at deleted_at lock_version concurrency)a
+    )
     |> Map.put(:id, workflow_id)
     |> Map.put(
       :jobs,

test/integration/cli_deploy_test.exs

@@ -298,7 +298,17 @@ defmodule Lightning.CliDeployTest do
   end
 
   defp expected_workflow_state(workflow) do
-    state = Map.take(workflow, Lightning.Workflows.Workflow.__schema__(:fields))
+    state =
+      workflow
+      |> Map.take([
+        :id,
+        :name,
+        :inserted_at,
+        :updated_at,
+        :deleted_at,
+        :lock_version,
+        :concurrency
+      ])
 
     jobs =
       Map.new(workflow.jobs, fn job ->

test/lightning_web/controllers/api/provisioning_controller_test.exs

@@ -795,7 +795,16 @@ defmodule LightningWeb.API.ProvisioningControllerTest do
 
       assert project.name == "test-project"
 
-      assert workflows |> Enum.all?(&match?(%{"project_id" => ^project_id}, &1)),
+      workflow_ids = Enum.map(workflows, fn w -> w["id"] end)
+
+      parent_project_ids =
+        from(w in Workflow,
+          where: w.id in ^workflow_ids
+        )
+        |> Repo.all()
+        |> Enum.map(fn w -> w.project_id end)
+
+      assert parent_project_ids |> Enum.all?(&match?(^project_id, &1)),
              "All workflows should belong to the same project"
 
       workflow =