From 9899dd091136d5e5c580d557b42a79ebc420186d Mon Sep 17 00:00:00 2001 From: eutopian Date: Thu, 29 Aug 2024 12:19:39 -0400 Subject: [PATCH] skip deleted proposals when checking `isJobManaged` --- .changeset/tricky-eagles-knock.md | 5 +++++ core/services/feeds/orm.go | 1 + core/services/feeds/orm_test.go | 8 ++++++++ 3 files changed, 14 insertions(+) create mode 100644 .changeset/tricky-eagles-knock.md diff --git a/.changeset/tricky-eagles-knock.md b/.changeset/tricky-eagles-knock.md new file mode 100644 index 00000000000..cbb4d4d8c71 --- /dev/null +++ b/.changeset/tricky-eagles-knock.md @@ -0,0 +1,5 @@ +--- +"chainlink": patch +--- + +skip checking isJobManaged if the proposal in fms has already been deleted #changed diff --git a/core/services/feeds/orm.go b/core/services/feeds/orm.go index 7f1e0194170..a49882ccf5f 100644 --- a/core/services/feeds/orm.go +++ b/core/services/feeds/orm.go @@ -826,6 +826,7 @@ SELECT exists ( FROM job_proposals INNER JOIN jobs ON job_proposals.external_job_id = jobs.external_job_id WHERE jobs.id = $1 + AND job_proposals.status <> 'deleted' ); ` diff --git a/core/services/feeds/orm_test.go b/core/services/feeds/orm_test.go index 4ff1a85aea6..976465f37f0 100644 --- a/core/services/feeds/orm_test.go +++ b/core/services/feeds/orm_test.go @@ -1653,6 +1653,14 @@ func Test_ORM_IsJobManaged(t *testing.T) { isManaged, err = orm.IsJobManaged(ctx, int64(j.ID)) require.NoError(t, err) assert.True(t, isManaged) + + // delete the proposal + err = orm.DeleteProposal(ctx, jpID) + require.NoError(t, err) + + isManaged, err = orm.IsJobManaged(ctx, int64(j.ID)) + require.NoError(t, err) + assert.False(t, isManaged) } // Helpers