feat: Contract Termination #996

ununhexium · 2024-07-12T09:31:21Z

The Scenario class was added as a helper class for e2e tests.

Its goal is to group all the common operations that are not user test in the e2e test cases.

The tests cases were changed to all use dynamic ports

E2e tests are now init with E2eTestExtension that groups all the e2e test boilerplate

The copyright headers were fixed to match the one in checkstyle

the ports allocation was changed, I think I made an off-by-one error in the previous implementation when a port was not available

Checklist

Give feedback

The PR title is short and expressive.
I have updated the CHANGELOG.md. See changelog_update.md for more information.
I have updated the Deployment Migration Notes Section in the CHANGELOG.md for any configuration / external API changes.
I have updated the Community Edition Postman-Collection if I changed existing APIs or added new APIs (e.g. for Management-API or API-Wrapper)
I have performed a self-review
Options

ununhexium

update

tests/src/test/java/de/sovity/edc/e2e/utils/Consumer.java

...ain/java/de/sovity/edc/extension/contacttermination/ContractAgreementTerminationService.java

...n/src/main/java/de/sovity/edc/extension/contacttermination/ContractTerminationExtension.java

.../edc/ext/wrapper/api/ui/pages/contract_agreements/services/ContractAgreementDataFetcher.java

extensions/postgres-flyway/src/main/resources/db/migration/V10__add_contract_termination.sql

...ess/src/main/java/de/sovity/edc/extension/db/directaccess/DatabaseDirectAccessExtension.java

...c/test/java/de/sovity/edc/extension/contacttermination/query/TerminateContractQueryTest.java

...ntract-termination/src/main/java/de/sovity/edc/extension/contacttermination/MapperUtils.java

docs/dev/checkstyle/checkstyle.md

...n/src/main/java/de/sovity/edc/extension/contacttermination/ContractTerminationExtension.java

...tion/src/main/java/de/sovity/edc/extension/contacttermination/ContractTerminationMapper.java

...ination/src/main/java/de/sovity/edc/extension/contacttermination/TransferProcessBlocker.java

extensions/wrapper/wrapper/build.gradle.kts

extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/UiResourceImpl.java

.../test/java/de/sovity/edc/ext/wrapper/api/ui/pages/policy/PolicyDefinitionApiServiceTest.java

extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/utils/ValidatorUtils.java

richardtreier

LGTM

already re-reviewed

richardtreier

LGTM

docs/dev/intellij/intelliJ.md

richardtreier

LGTM

ununhexium · 2024-07-18T12:48:03Z

@tmberthold
This PR doesn't contain a postman entry because the OpenAPI specification should be enough to tell the user how to use the new endpoint. Is this ok for you?

No - since we alreday had feedback in the past that our postman collection would not be up to date, to avoid that for the future, please update the postman collection when the PR made changes to existing APIs or added new ones. Else we will get this negative feedback again and we want to avoid that, having APIs in the collection that dont work anymore because of changes in the code or new APIs available but not beeing in the collection at all.

Updated in #1001

ununhexium changed the title ~~1163 api wrapper contract termination~~ feat: Contract Termination REST API Jul 12, 2024

ununhexium changed the title ~~feat: Contract Termination REST API~~ feat: Contract Termination Jul 12, 2024

kamilczaja self-requested a review July 15, 2024 12:12

ununhexium added 27 commits July 15, 2024 14:21

WiP agreement details query

96708d2

WiP agreement e2e tests failing because of DB access when not needed

dcaafa1

Cleanup database direct access dependencies

72003f7

WiP Tests back to passing

829e8bd

WiP Contract Termination REST API

b51ddad

Fix older tests

05fed2b

Fix tests

e6c0b41

EDC-CE-870 100% repro timeout

a2f7988

Migrate Catalog API Test

a85a4cf

Suspend test until merge with RT's PR

6eeb2ac

-cancel +terminate

0655430

Assert both sides

a7d8ee9

Format

0c8cece

Fix ContractAgreementTransferApiServiceTest

3b3a54a

Fix ContractDefinitionPageApiServiceTest

c10db0c

Fix DashboardPageApiServiceTest

a616334

Fix TransferHistoryPageApiServiceTest

faab3a4

Fix TransferProcessAssetApiServiceTest

08a4cb3

Fix KpiApiTest

7c5c89f

Fix PolicyDefinitionApiServiceTest

2225097

Fix SupportedPolicyApiTest

cf93fd5

Fix UseCaseApiWrapperTest

5a3f8ad

todos

f3de9d0

todos

740ee97

Limit reason and detail sizes

1fa2f1d

await instead of Thread.sleep()

74c8e6c

Add self/counterparty distinction

d518de1

ununhexium added 3 commits July 17, 2024 08:43

Code review 1

abd0777

Code review 2

f0820ce

Code review 3

4df58e8

ununhexium commented Jul 17, 2024

View reviewed changes

ununhexium requested review from kamilczaja and richardtreier July 17, 2024 10:39

richardtreier requested changes Jul 17, 2024

View reviewed changes

ununhexium added 2 commits July 17, 2024 15:21

Refactor: force transactions

5254471

Rm tmp line

cc35d71

kamilczaja mentioned this pull request Jul 17, 2024

Contract Termination UI sovity/edc-ui#767

Merged

ununhexium added 2 commits July 17, 2024 22:17

refactor

cb505d2

Increase timeout for GH

764f57b

ununhexium requested a review from richardtreier July 18, 2024 06:58

richardtreier requested changes Jul 18, 2024

View reviewed changes

extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/utils/ValidatorUtils.java Outdated Show resolved Hide resolved

richardtreier previously approved these changes Jul 18, 2024

View reviewed changes

richardtreier enabled auto-merge (squash) July 18, 2024 07:55

Code review 4

cbdf262

ununhexium dismissed richardtreier’s stale review via cbdf262 July 18, 2024 09:06

ununhexium requested a review from richardtreier July 18, 2024 09:17

richardtreier previously approved these changes Jul 18, 2024

View reviewed changes

docs/dev/intellij/intelliJ.md Outdated Show resolved Hide resolved

docs: fix wording

b4b4b73

richardtreier dismissed their stale review via b4b4b73 July 18, 2024 09:58

richardtreier approved these changes Jul 18, 2024

View reviewed changes

richardtreier disabled auto-merge July 18, 2024 09:59

richardtreier enabled auto-merge (squash) July 18, 2024 10:00

richardtreier merged commit 1582a43 into main Jul 18, 2024
18 checks passed

richardtreier deleted the 1163-api-wrapper-contract-termination branch July 18, 2024 10:08

ununhexium mentioned this pull request Jul 18, 2024

feat: Update postman and add details check #1001

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Contract Termination #996

feat: Contract Termination #996

ununhexium commented Jul 12, 2024 •

edited

Loading

Checklist

ununhexium left a comment

richardtreier left a comment

richardtreier left a comment

richardtreier left a comment

ununhexium commented Jul 18, 2024

feat: Contract Termination #996

feat: Contract Termination #996

Conversation

ununhexium commented Jul 12, 2024 • edited Loading

Checklist

ununhexium left a comment

Choose a reason for hiding this comment

richardtreier left a comment

Choose a reason for hiding this comment

richardtreier left a comment

Choose a reason for hiding this comment

richardtreier left a comment

Choose a reason for hiding this comment

ununhexium commented Jul 18, 2024

ununhexium commented Jul 12, 2024 •

edited

Loading