chore(contracts):1105 provided tables for all types of contracts to save th… #1191

ds-mwesener · 2024-07-09T08:30:32Z

…em accordingly.

Description

Pre-review checks

Please ensure to do as many of the following checks as possible, before asking for committer review:

DEPENDENCIES are up-to-date. Dash license tool. Committers can open IP issues for restricted libs.
Copyright and license header are present on all affected files

resolves #1105

…em accordingly.

github-actions · 2024-07-09T08:32:11Z

✅ No Dependency Check findings were found

github-actions · 2024-07-09T08:33:49Z

Integration Test Results

347 tests 346 ✅ 1m 52s ⏱️
41 suites 1 💤
41 files 0 ❌

Results for commit bc9e917.

♻️ This comment has been updated with latest results.

github-actions · 2024-07-09T08:33:55Z

Unit Test Results

209 tests 209 ✅ 21s ⏱️
58 suites 0 💤
58 files 0 ❌

Results for commit bc9e917.

♻️ This comment has been updated with latest results.

…rsistent

...pse/tractusx/traceability/contracts/infrastructure/model/ContractAgreementAsBuiltEntity.java

+@Setter
+@NoArgsConstructor
+@Entity
+@SuperBuilder


...e/tractusx/traceability/contracts/infrastructure/model/ContractAgreementAsPlannedEntity.java

+@Setter
+@NoArgsConstructor
+@Entity
+@SuperBuilder


...se/tractusx/traceability/integration/assets/infrastructure/base/IrsCallbackControllerIT.java

…rsistent

…rsistent # Conflicts: # CHANGELOG.md

…rsistent

…persistent' into feature/1105-contractagreement-persistent

...usx/traceability/contracts/infrastructure/repository/ContractNotificationRepositoryImpl.java

+
+    private final JpaContractAgreementNotificationRepository contractAgreementRepository;
+
+    public ContractNotificationRepositoryImpl(EdcContractAgreementService edcContractAgreementService, ObjectMapper objectMapper, EdcContractAgreementService edcContractAgreementService1, JpaContractAgreementNotificationRepository contractAgreementRepository) {


...se/tractusx/traceability/contracts/infrastructure/repository/ContractViewRepositoryImpl.java

+
+    private final JpaContractAgreementViewRepository contractAgreementRepository;
+
+    public ContractViewRepositoryImpl(EdcContractAgreementService edcContractAgreementService, ObjectMapper objectMapper, EdcContractAgreementService edcContractAgreementService1, JpaContractAgreementViewRepository contractAgreementRepository, ObjectMapper objectMapper1) {


...se/tractusx/traceability/contracts/infrastructure/repository/ContractViewRepositoryImpl.java

+
+    private final JpaContractAgreementViewRepository contractAgreementRepository;
+
+    public ContractViewRepositoryImpl(EdcContractAgreementService edcContractAgreementService, ObjectMapper objectMapper, EdcContractAgreementService edcContractAgreementService1, JpaContractAgreementViewRepository contractAgreementRepository, ObjectMapper objectMapper1) {


ds-lcapellino · 2024-07-18T11:20:09Z

...java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/JobRepositoryImpl.java

            repository.save(asset);
        } catch (DataIntegrityViolationException ex) {
            //retry save in case of ERROR: duplicate key value violates unique constraint "asset_pkey"
            log.info("Asset with id {} already exists in the database. The record will be updated instead.", asset.getId());
+            enrichAssetBaseByContractAgreements(repository, asset);


wouldn't this cause the contract to be added twice to the assets? Or is it handled via contract agreement id?

In case of an exception there will be a rollback correct? Therefore I assumed that this will not be duplicated.

ds-lcapellino · 2024-07-18T11:26:40Z

.../eclipse/tractusx/traceability/contracts/domain/service/ContractNotificationServiceImpl.java

@@ -0,0 +1,28 @@
+package org.eclipse.tractusx.traceability.contracts.domain.service;


License header

ds-lcapellino · 2024-07-18T11:26:48Z

...org/eclipse/tractusx/traceability/contracts/domain/service/ContractAsPlannedServiceImpl.java

@@ -0,0 +1,28 @@
+package org.eclipse.tractusx.traceability.contracts.domain.service;


license header

ds-lcapellino · 2024-07-18T11:26:59Z

...a/org/eclipse/tractusx/traceability/contracts/domain/service/ContractAsBuiltServiceImpl.java

@@ -0,0 +1,28 @@
+package org.eclipse.tractusx.traceability.contracts.domain.service;


license header

ds-lcapellino · 2024-07-18T11:27:11Z

...java/org/eclipse/tractusx/traceability/contracts/domain/service/ContractViewServiceImpl.java

@@ -0,0 +1,31 @@
+package org.eclipse.tractusx.traceability.contracts.domain.service;


license header

.../traceability/contracts/infrastructure/repository/ContractAgreementAsBuiltSpecification.java

...raceability/contracts/infrastructure/repository/ContractAgreementAsPlannedSpecification.java

...eability/contracts/infrastructure/repository/ContractAgreementNotificationSpecification.java

ds-lcapellino · 2024-07-18T11:43:33Z

tx-backend/src/main/resources/db/migration/R__create_contract_agreement_view.sql

@@ -1,2 +1,33 @@
-- Drop the view if it exists
-DROP VIEW IF EXISTS contract_agreement_view;
+CREATE VIEW contract_agreement_full AS


Do we need a license header here?

…rsistent # Conflicts: # tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/ApplicationStartupConfig.java

…tracts/infrastructure/repository/ContractAgreementAsBuiltSpecification.java Co-authored-by: Lucas Capellino <137265091+ds-lcapellino@users.noreply.github.com>

Co-authored-by: Lucas Capellino <137265091+ds-lcapellino@users.noreply.github.com>

…rsistent

sonarcloud · 2024-07-18T12:48:01Z

Quality Gate passed for 'eclipse-tractusx_traceability-foss-frontend'

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

sonarcloud · 2024-07-18T12:48:59Z

Quality Gate failed for 'Trace-X Root'

Failed conditions
66.6% Coverage on New Code (required ≥ 80%)

See analysis details on SonarCloud

ds-lcapellino

LGTM

chore(irs):1105 provided tables for all types of contracts to save th…

f478634

…em accordingly.

ds-mwesener added 4 commits July 10, 2024 09:09

Merge branch 'refs/heads/main' into feature/1105-contractagreement-pe…

fdd1898

…rsistent

Merge branch 'refs/heads/main' into feature/1105-contractagreement-pe…

fe0663a

…rsistent

chore(irs):1105 Added contractAgreementIds to asset domain.

8f99ddb

Merge branch 'refs/heads/main' into feature/1105-contractagreement-pe…

ee5a4cf

…rsistent

github-advanced-security bot found potential problems Jul 11, 2024

View reviewed changes

ds-mwesener changed the title ~~chore(irs):1105 provided tables for all types of contracts to save th…~~ chore(contracts):1105 provided tables for all types of contracts to save th… Jul 11, 2024

ds-mwesener and others added 20 commits July 11, 2024 13:35

chore(irs):1105 Added contractAgreementIds to asset domain.

fd2fb69

chore(irs):1105 Added contractAgreementIds to asset domain.

361019c

chore(irs):1105 Added contractAgreementIds to asset domain.

f1fd134

Merge branch 'refs/heads/main' into feature/1105-contractagreement-pe…

924db25

…rsistent

chore(irs):1105 Added contractAgreementIds to asset domain.

be3731f

chore(irs):1105 Added contractAgreementIds to asset domain.

fa639ca

chore(irs):1105 Added contractAgreementIds to asset domain.

9a03a7a

chore(irs):1105 Added logging.

3732990

chore(irs):1105 Added logging.

21714a6

chore(irs):1105 Renamed bean.

a8aec7c

Merge branch 'refs/heads/main' into feature/1105-contractagreement-pe…

20bb037

…rsistent # Conflicts: # CHANGELOG.md

Merge branch 'refs/heads/main' into feature/1105-contractagreement-pe…

64989d8

…rsistent

chore(irs):1105 Fixed issues.

cfc603b

feature: #1221 #1196 update IRS to 7.3.1 and EDC to 0.7.3

6fc2472

feature: #1221 #1193 update CHANGELOG.md

68844e0

chore(irs):1105 Added globalAssetId to contract response.

c2e526c

Merge remote-tracking branch 'eclipse/feature/1105-contractagreement-…

cb9768c

…persistent' into feature/1105-contractagreement-persistent

chore(irs):1105 Fixed policy of testdata.

e64ce83

chore(irs):1105 Fixed mapper.

b439aea

chore(irs):1105 Fixed mapper.

bb48d77

chore(irs):1105 Refactored.

47efd8d

github-advanced-security bot found potential problems Jul 17, 2024

View reviewed changes

ds-mwesener added 8 commits July 18, 2024 08:22

chore(irs):1105 Refactored.

89e0474

chore(irs):1105 Refactored.

560cd33

chore(contracts):1105 Refactored.

4816269

chore(contracts):1105 Refactored.

6ab83f1

chore(contracts):1105 Refactored.

2312262

chore(contracts):1105 Refactored.

8b01314

chore(contracts):1105 Refactored.

7fd8f0e

chore(contracts):1105 Refactored.

87ef392

ds-lcapellino reviewed Jul 18, 2024

View reviewed changes

.../traceability/contracts/infrastructure/repository/ContractAgreementAsBuiltSpecification.java Outdated Show resolved Hide resolved

ds-lcapellino reviewed Jul 18, 2024

View reviewed changes

...raceability/contracts/infrastructure/repository/ContractAgreementAsPlannedSpecification.java Outdated Show resolved Hide resolved

ds-lcapellino reviewed Jul 18, 2024

View reviewed changes

...eability/contracts/infrastructure/repository/ContractAgreementNotificationSpecification.java Outdated Show resolved Hide resolved

ds-lcapellino reviewed Jul 18, 2024

View reviewed changes

ds-mwesener and others added 6 commits July 18, 2024 14:35

Merge branch 'refs/heads/main' into feature/1105-contractagreement-pe…

876148b

…rsistent # Conflicts: # tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/ApplicationStartupConfig.java

chore(contracts):1105 Merged main.

bc149b9

Update tx-backend/src/main/java/org/eclipse/tractusx/traceability/con…

dd92f33

…tracts/infrastructure/repository/ContractAgreementAsBuiltSpecification.java Co-authored-by: Lucas Capellino <137265091+ds-lcapellino@users.noreply.github.com>

Apply suggestions from code review

55bfde9

Co-authored-by: Lucas Capellino <137265091+ds-lcapellino@users.noreply.github.com>

Merge branch 'refs/heads/main' into feature/1105-contractagreement-pe…

13520dd

…rsistent

chore(contracts):1105 Code Review

bc9e917

ds-lcapellino approved these changes Jul 18, 2024

View reviewed changes

ds-mwesener merged commit c1b5528 into main Jul 18, 2024
25 of 26 checks passed

ds-mwesener deleted the feature/1105-contractagreement-persistent branch July 18, 2024 13:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(contracts):1105 provided tables for all types of contracts to save th… #1191

chore(contracts):1105 provided tables for all types of contracts to save th… #1191

ds-mwesener commented Jul 9, 2024 •

edited

Loading

github-actions bot commented Jul 9, 2024 •

edited

Loading

github-actions bot commented Jul 9, 2024 •

edited

Loading

github-actions bot commented Jul 9, 2024 •

edited

Loading

ds-lcapellino Jul 18, 2024

ds-mwesener Jul 18, 2024

ds-lcapellino Jul 18, 2024

ds-lcapellino Jul 18, 2024

ds-lcapellino Jul 18, 2024

ds-lcapellino Jul 18, 2024

ds-lcapellino Jul 18, 2024

sonarcloud bot commented Jul 18, 2024

sonarcloud bot commented Jul 18, 2024

ds-lcapellino left a comment


		private final JpaContractAgreementNotificationRepository contractAgreementRepository;

		public ContractNotificationRepositoryImpl(EdcContractAgreementService edcContractAgreementService, ObjectMapper objectMapper, EdcContractAgreementService edcContractAgreementService1, JpaContractAgreementNotificationRepository contractAgreementRepository) {


		private final JpaContractAgreementViewRepository contractAgreementRepository;

		public ContractViewRepositoryImpl(EdcContractAgreementService edcContractAgreementService, ObjectMapper objectMapper, EdcContractAgreementService edcContractAgreementService1, JpaContractAgreementViewRepository contractAgreementRepository, ObjectMapper objectMapper1) {

		@@ -0,0 +1,28 @@
		package org.eclipse.tractusx.traceability.contracts.domain.service;

		@@ -0,0 +1,31 @@
		package org.eclipse.tractusx.traceability.contracts.domain.service;

chore(contracts):1105 provided tables for all types of contracts to save th… #1191

chore(contracts):1105 provided tables for all types of contracts to save th… #1191

Conversation

ds-mwesener commented Jul 9, 2024 • edited Loading

Description

Pre-review checks

github-actions bot commented Jul 9, 2024 • edited Loading

✅ No Dependency Check findings were found

github-actions bot commented Jul 9, 2024 • edited Loading

Integration Test Results

github-actions bot commented Jul 9, 2024 • edited Loading

Unit Test Results

ds-lcapellino Jul 18, 2024

Choose a reason for hiding this comment

ds-mwesener Jul 18, 2024

Choose a reason for hiding this comment

ds-lcapellino Jul 18, 2024

Choose a reason for hiding this comment

ds-lcapellino Jul 18, 2024

Choose a reason for hiding this comment

ds-lcapellino Jul 18, 2024

Choose a reason for hiding this comment

ds-lcapellino Jul 18, 2024

Choose a reason for hiding this comment

ds-lcapellino Jul 18, 2024

Choose a reason for hiding this comment

sonarcloud bot commented Jul 18, 2024

Quality Gate passed for 'eclipse-tractusx_traceability-foss-frontend'

sonarcloud bot commented Jul 18, 2024

Quality Gate failed for 'Trace-X Root'

ds-lcapellino left a comment

Choose a reason for hiding this comment

ds-mwesener commented Jul 9, 2024 •

edited

Loading

github-actions bot commented Jul 9, 2024 •

edited

Loading

github-actions bot commented Jul 9, 2024 •

edited

Loading

github-actions bot commented Jul 9, 2024 •

edited

Loading