Git issue 4046 : Persist taskState/lifeCycleState & return in get task and get history task api #4218

jyotisahu9 · 2024-03-22T19:14:50Z

Git issue : #4046
Camunda forum issue : https://forum.camunda.io/t/task-state-in-camunda-7-vs-camunda-8/48746/3
Persist task state & update Get task & Get Tasks (Historic) api's to return task state.

Signed-off-by: Sahu, Jyoti <Jyoti.Sahu@fmr.com>

CLAassistant · 2024-03-22T19:14:56Z

All committers have signed the CLA.

…-enhancement Signed-off-by: Sahu, Jyoti <Jyoti.Sahu@fmr.com>

yanavasileva · 2024-03-25T07:38:16Z

Hi @jyotisahu9 ,

Thank you for raising this.
We will have a look at it and get back to you.

Best,
Yana

jyotisahu9 · 2024-04-03T18:48:48Z

Hi @yanavasileva ,

Did you get a chance to review the code changes.

Thanks,
Jyoti

yanavasileva · 2024-04-08T09:41:30Z

Hi @jyotisahu9, I will need more time to review the PR as the change is not trivial.
Please stay tuned and thank you for your patience in advance.

yanavasileva

👍 Overall you covered a lot of the changes in the first run, that's great! Nice work.
🔧 Could you please remove the GIT Issue line from the comments and the javadoc. With the modern IDE and github features, tracking the commit, the PR, and the issue is easier so I think it's redundant.
I left comments for what's missing or can be improved. Please have a look.

Thank you for your patience for the review.

engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/cockroachdb_engine_7.20_to_7.21.sql

...sources/org/camunda/bpm/engine/db/liquibase/baseline/liquibase.cockroachdb.create.engine.sql

engine/src/main/java/org/camunda/bpm/engine/task/Task.java

yanavasileva · 2024-04-17T15:42:05Z

engine/src/main/java/org/camunda/bpm/engine/impl/persistence/entity/TaskEntity.java

+  public static final String TASK_STATE_INIT = "Init";
+  public static final String TASK_STATE_CREATED = "Created";
+  public static final String TASK_STATE_COMPLETED = "Completed";
+  public static final String TASK_STATE_DELETED = "Deleted";
+  public static final String TASK_STATE_UPDATED = "Updated";


❌ Let's rename the existing TaskState enum to LifecycleState to be more explicit what is it about and create a new TaskState enum to contain those states.
❓ Is it possible to extend and reuse the existing TaskState enum? Will require avoiding handling of the new "Updated" state.

I have updated the logic to use existing taskState enum, additionally did some changes in enum itself to retain required taskstate text in DB. I have removed extra code related to previous implemented taskState like constants and new method.

yanavasileva · 2024-04-17T15:47:19Z

engine/src/main/java/org/camunda/bpm/engine/impl/persistence/entity/TaskEntity.java

👍 It's great that you managed to reuse the lifecycle state.
It's a bit pity that we can't simply extend it and persist it for your purposes. 🤔 Maybe you can give it another thought if that's possible without breaking the existing functionality. As the only difference is the updated state between lifecycle and newly introduced task state, right?

I tried to persist lifecycle state instead of taskState but then it saves values like STATE_CREATED, STATE_COMPLETED etc. in db. I can't change it existing value as its been used extensively in current logic, so I am trying to persist taskState but its using existing enum.

yanavasileva · 2024-04-17T15:49:59Z

engine/src/test/java/org/camunda/bpm/engine/test/history/HistoricTaskInstanceTest.java

❌ Missing test cases:

for runtime task - init?, created, updated

for historic task - init?, updated, deleted

failure during local run: HistoricTaskInstanceTest.testHistoricTaskInstance:94 expected:<[Cre]ated> but was:<[Upd]ated>

incorporated changes related to all points mentioned in comment.
Its not possible to cover init state as the object is in INIT state and then it immediately goes in CREATED state, so haven't been able to cover it.

I need to return the PR to adjust test cases for the runtime tasks (created, updated). Please see my latest comments.

engine/src/main/java/org/camunda/bpm/engine/impl/persistence/entity/TaskEntity.java

engine-rest/engine-rest-openapi/src/main/templates/paths/task/{id}/get.ftl

engine/src/main/java/org/camunda/bpm/engine/impl/persistence/entity/TaskEntity.java

.../test/java/org/camunda/bpm/engine/rest/history/HistoricTaskInstanceRestServiceQueryTest.java

jyotisahu9 · 2024-04-17T17:13:04Z

👍 Overall you covered a lot of the changes in the first run, that's great! Nice work. 🔧 Could you please remove the GIT Issue line from the comments and the javadoc. With the modern IDE and github features, tracking the commit, the PR, and the issue is easier so I think it's redundant. I left comments for what's missing or can be improved. Please have a look.

Thank you for your patience for the review.

Thanks @yanavasileva for your review comments. I am going through them and would do the needful.

related to camunda#4180

camunda#3746

related to camunda#4190

* set false as default value for initializeTelemetry and switch to primitive * engine tests: test default value * LoginIT: remove telemetry close modal * initializeTelemetryProperty: add null check related to camunda#4167

…amunda#4230) camunda/team-automation-platform#126

…a#4228) in installation path camunda#4227

related to camunda#3830

Related to camunda#3848 Co-authored-by: Daniel Kelemen <danielkelemen@users.noreply.github.com>

related to camunda#4239

Related-to: camunda#3860

Related to camunda#4188

related to camunda#4243

related to: camunda#2604

related to: camunda#4185

…tance (camunda#4285) Related to camunda#3710

…etch and lock Related to camunda#4051

…rrays Related to camunda#4067

…-enhancement

…rn in get api

Signed-off-by: Sahu, Jyoti <Jyoti.Sahu@fmr.com>

…rn in get api

jyotisahu9 · 2024-05-07T18:06:50Z

Hi @yanavasileva,

Latest code changes for review comments have been pushed. I have resolved few of the review conversation, for few I have added my comments and it can be closed once you are good with them.

Please review the code whenever you get a chance and let me know in case of any issues.

Thanks,
Jyoti

yanavasileva · 2024-05-14T11:12:11Z

@jyotisahu9, thank you for considering my input. I will have a look at made changes and get back to you next week.

yanavasileva · 2024-05-22T15:47:11Z

👍 Overall the changes look good, I want to have a look again at the tests, then I will merge the PR.

...n/resources/org/camunda/bpm/engine/db/liquibase/baseline/liquibase.mariadb.create.engine.sql

engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/oracle_engine_7.21_to_7.22.sql

engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/mssql_engine_7.21_to_7.22.sql

…-enhancement

jyotisahu9 · 2024-05-23T22:29:51Z

Hi @yanavasileva,

Sql script corrections are banked. Request you to review them and merge the PR.

Thanks,
Jyoti

engine/src/test/java/org/camunda/bpm/engine/test/history/HistoricTaskInstanceTest.java

yanavasileva · 2024-05-24T12:33:18Z

engine/src/test/java/org/camunda/bpm/engine/test/history/HistoricTaskInstanceTest.java

I need to return the PR to adjust test cases for the runtime tasks (created, updated). Please see my latest comments.

yanavasileva

The tests need to be modified.
Please note, that I am not able to commit to your branch/fork, so I can't do the changes on my own.

jyotisahu9 · 2024-05-26T01:08:33Z

The tests need to be modified. Please note, that I am not able to commit to your branch/fork, so I can't do the changes on my own.

Hi @yanavasileva ,

I went through the review comment. Do you want me to just remove the assertion from HistoricTaskInstanceTest file ?

Thanks,
Jyoti

yanavasileva · 2024-05-27T13:02:59Z

Hi Jyoti,

Do you want me to just remove the assertion from HistoricTaskInstanceTest file ?

No. Beside the suggested removal of the assertion, I expect to add similar test assertion for runtime tasks where the state is created and updated. I suggest to add the assertions to TaskServiceTest.

Best,
Yana

…-enhancement

jyotisahu9 · 2024-05-29T15:43:23Z

Hi @yanavasileva ,

Pushed the test case review comments fixes.
Please review and merge the PR

Thanks

jyotisahu9 and others added 6 commits March 15, 2024 11:35

ENTDAPCOE-68:Add task state to get task & history task api

eb42049

ENTDAPCOE-68:Add task state to get task & history task api

31f6b95

ENTDAPCOE-68:Add task state to get task & history task api

82bb44c

ENTDAPCOE-68:Add task state to get task & history task api

3dab013

ENTDAPCOE-68:Add task state to get task & history task api

21e67a9

Update TaskEntity.java

57a7ed4

Signed-off-by: Sahu, Jyoti <Jyoti.Sahu@fmr.com>

Merge branch 'master' into git-issue-4046-get-task-api-lifecyclestate…

9da5390

…-enhancement Signed-off-by: Sahu, Jyoti <Jyoti.Sahu@fmr.com>

jyotisahu9 mentioned this pull request Mar 22, 2024

update GET rest api for task - /task/{id} to add lifecycleState as output field #4046

Open

1 task

yanavasileva assigned jyotisahu9 Mar 25, 2024

yanavasileva self-requested a review March 25, 2024 07:38

yanavasileva requested changes Apr 17, 2024

View reviewed changes

danielkelemen and others added 14 commits April 17, 2024 12:40

feat(webapp): add more metrics improvements

07b3010

related to camunda#4180

chore(ci): Remove CockroachDB References (camunda#4211)

158a37e

camunda#3746

fix(webapps): fix copy variable value not type string (camunda#4220)

b04f5ca

related to camunda#4190

chore(engine): disable telemetry by default (camunda#4208)

a803de9

* set false as default value for initializeTelemetry and switch to primitive * engine tests: test default value * LoginIT: remove telemetry close modal * initializeTelemetryProperty: add null check related to camunda#4167

chore(release): Prepare release: set version to 7.21.0-alpha5

2d67a9b

chore(release): Prepare next development version: 7.21.0-SNAPSHOT

2c7c271

fix(engine/tests): fix concurrent telemetry test with default value (c…

1946919

…amunda#4230) camunda/team-automation-platform#126

fix(run): fix Camunda Run not launching using JDK with spaces (camund…

6a10b59

…a#4228) in installation path camunda#4227

chore(license-book): update license book for 7.21.0 (camunda#4189)

4a1de98

related to camunda#3830

chore(release): update German webapp translations (camunda#4238)

f4b5f26

Related to camunda#3848 Co-authored-by: Daniel Kelemen <danielkelemen@users.noreply.github.com>

fix(webapp): remove target blank

49df8dc

related to camunda#4239

chore(release): Prepare release: set version to 7.21.0

5674b1a

chore(release): Prepare next development version: 7.22.0-SNAPSHOT

da92914

chore(project): Prepare Codebase for 7.22.0 Release (camunda#4242)

feaa3dd

Related-to: camunda#3860

joaquinfelici and others added 13 commits April 17, 2024 12:40

fix(wildfly): updated graalVM modules

58b6211

Related to camunda#4188

fix(client): fix setVariables property

9dd0e7f

related to camunda#4243

fix(engine): tests fails when build runs on UTC timezone

972c6d2

related to: camunda#2604

fix(client): tests fails when build runs on UTC timezone

29e4e60

related to: camunda#4185

fix(engine-rest): tests fails when build runs on UTC timezone

7f39906

related to: camunda#4185

fix(webapps): tests fails when build runs on UTC timezone

3aabd78

related to: camunda#4185

fix(engine-rest): fix a typo in OpenAPI spec of /history/decision-ins…

e3f8c3c

…tance (camunda#4285) Related to camunda#3710

fix(engine-rest): return bad request for invalid sorting option for f…

150874a

…etch and lock Related to camunda#4051

fix(db2): Reduce batch execution time by filtering out queried byte a…

36deaf6

…rrays Related to camunda#4067

Merge branch 'master' into git-issue-4046-get-task-api-lifecyclestate…

6108de3

…-enhancement

PR:4218 review comments for Git issue 4046 : Persist taskState & retu…

2e87b6f

…rn in get api

Update get.ftl

2d7e5c8

Signed-off-by: Sahu, Jyoti <Jyoti.Sahu@fmr.com>

PR:4218 review comments for Git issue 4046 : Persist taskState & retu…

c7f927c

…rn in get api

brianwarner force-pushed the git-issue-4046-get-task-api-lifecyclestate-enhancement branch from 2d38833 to c7f927c Compare May 7, 2024 14:41

yanavasileva reviewed May 23, 2024

View reviewed changes

...n/resources/org/camunda/bpm/engine/db/liquibase/baseline/liquibase.mariadb.create.engine.sql Outdated Show resolved Hide resolved

yanavasileva reviewed May 23, 2024

View reviewed changes

engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/oracle_engine_7.21_to_7.22.sql Outdated Show resolved Hide resolved

yanavasileva reviewed May 23, 2024

View reviewed changes

engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/mssql_engine_7.21_to_7.22.sql Outdated Show resolved Hide resolved

jyotisahu9 added 2 commits May 23, 2024 10:47

Merge branch 'master' into git-issue-4046-get-task-api-lifecyclestate…

db186f0

…-enhancement

PR:4218 sql correction review comments for Git issue 4046

3a0ebbf

yanavasileva reviewed May 24, 2024

View reviewed changes

yanavasileva requested changes May 24, 2024

View reviewed changes

jyotisahu9 added 2 commits May 29, 2024 08:40

Merge branch 'master' into git-issue-4046-get-task-api-lifecyclestate…

104f426

…-enhancement

PR:4218 test cases modification

fbd6bb7

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Git issue 4046 : Persist taskState/lifeCycleState & return in get task and get history task api #4218

Git issue 4046 : Persist taskState/lifeCycleState & return in get task and get history task api #4218

jyotisahu9 commented Mar 22, 2024

CLAassistant commented Mar 22, 2024 •

edited

yanavasileva commented Mar 25, 2024

jyotisahu9 commented Apr 3, 2024

yanavasileva commented Apr 8, 2024

yanavasileva left a comment •

edited

yanavasileva Apr 17, 2024

jyotisahu9 May 7, 2024

yanavasileva Apr 17, 2024

jyotisahu9 May 7, 2024

yanavasileva Apr 17, 2024

jyotisahu9 May 7, 2024

yanavasileva May 24, 2024 •

edited

jyotisahu9 commented Apr 17, 2024

jyotisahu9 commented May 7, 2024

yanavasileva commented May 14, 2024

yanavasileva commented May 22, 2024

jyotisahu9 commented May 23, 2024 •

edited

yanavasileva May 24, 2024 •

edited

yanavasileva left a comment •

edited

jyotisahu9 commented May 26, 2024

yanavasileva commented May 27, 2024

jyotisahu9 commented May 29, 2024

Git issue 4046 : Persist taskState/lifeCycleState & return in get task and get history task api #4218

Are you sure you want to change the base?

Git issue 4046 : Persist taskState/lifeCycleState & return in get task and get history task api #4218

Conversation

jyotisahu9 commented Mar 22, 2024

CLAassistant commented Mar 22, 2024 • edited

yanavasileva commented Mar 25, 2024

jyotisahu9 commented Apr 3, 2024

yanavasileva commented Apr 8, 2024

yanavasileva left a comment • edited

Choose a reason for hiding this comment

yanavasileva Apr 17, 2024

Choose a reason for hiding this comment

jyotisahu9 May 7, 2024

Choose a reason for hiding this comment

yanavasileva Apr 17, 2024

Choose a reason for hiding this comment

jyotisahu9 May 7, 2024

Choose a reason for hiding this comment

yanavasileva Apr 17, 2024

Choose a reason for hiding this comment

jyotisahu9 May 7, 2024

Choose a reason for hiding this comment

yanavasileva May 24, 2024 • edited

Choose a reason for hiding this comment

jyotisahu9 commented Apr 17, 2024

jyotisahu9 commented May 7, 2024

yanavasileva commented May 14, 2024

yanavasileva commented May 22, 2024

jyotisahu9 commented May 23, 2024 • edited

yanavasileva May 24, 2024 • edited

Choose a reason for hiding this comment

yanavasileva left a comment • edited

Choose a reason for hiding this comment

jyotisahu9 commented May 26, 2024

yanavasileva commented May 27, 2024

jyotisahu9 commented May 29, 2024

CLAassistant commented Mar 22, 2024 •

edited

yanavasileva left a comment •

edited

yanavasileva May 24, 2024 •

edited

jyotisahu9 commented May 23, 2024 •

edited

yanavasileva May 24, 2024 •

edited

yanavasileva left a comment •

edited