Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge from catenaX repository #302

Merged
merged 68 commits into from
Nov 21, 2023
Merged

Merge from catenaX repository #302

merged 68 commits into from
Nov 21, 2023

Conversation

ds-psosnowski
Copy link
Contributor

@ds-psosnowski ds-psosnowski commented Nov 20, 2023 •
edited by ds-jhartmann
Loading

Description

  • Added 'hops' parameter to SupplyChainImpacted Aspect model - contains relative distance in the supply chain
  • Added impactedSuppliersOnFirstTier parameter to Supply SupplyChainImpacted Aspect model - contains information of first level supply
  • Added cache mechanism for ConnectorEndpointService for fetchConnectorEndpoints method cache
  • Commit message check update
  • Test data update

Pre-review checks

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

ds-ext-kmassalski and others added 30 commits October 27, 2023 10:31
@ds-ext-kmassalski
feat(impl):[TRI-1641] hops implementation
62ecb05
@ds-ext-kmassalski
feat(impl):[TRI-1641] fixes and improvements
77fa64c
@ds-ext-kmassalski
feat(impl):[TRI-1641] tool fixes
0999bf6
@ds-ext-kmassalski
feat(impl):[TRI-1641] fixes&adjustments
470030d
@ds-ext-kmassalski
feat(impl):[TRI-1641] fixes&adjustments
6345adb
@ds-ext-kmassalski
feat(impl):[TRI-1641] fixes&adjustments
29b4a3b
@ds-ext-kmassalski
feat(impl):[TRI-1641] fixes&adjustments
207fd84
@ds-ext-kmassalski
feat(impl):[TRI-1641] fix spotbugs
7bb3036
@ds-ext-kmassalski
feat(impl):[TRI-1641] merge main
9844ea9
@ds-ext-kmassalski
feat(impl):[TRI-1641] add changelog
94f232b
@ds-ext-kmassalski
feat(impl):[TRI-1641] fix pmds
3dd9ac3
@ds-ext-kmassalski
feat(impl):[TRI-1641] refactoring
2e1d69f
@ds-ext-kmassalski
feat(impl):[TRI-1641] adjustments and test
a941604
@ds-ext-kmassalski
feat(impl):[TRI-1641] adjustments review comments
16c0519
@ds-ext-kmassalski
feat(impl):[TRI-1641] send hop in notification
6b2cebe
@ds-ext-kmassalski
Merge branch 'main' into feature/TRI-1641-implementation-of-hops
6524a74
@ds-ext-kmassalski
feat(impl):[TRI-1641] fix DEP file
4e71336
@ds-psosnowski
feat(impl):[TRI-1658] added bpn number of the first level chain
a48f914
@ds-psosnowski
feat(impl):[TRI-1658] changed bpn in notification callback to sender bpn
e4d7ac5
@ds-psosnowski
feat(impl):[TRI-1658] extended unanswered notification to contain bpn…
2523f1e 
… number
@ds-psosnowski
feat(impl):[TRI-1658] added checkstyle fixes
9db1421
@ds-psosnowski
feat(impl):[TRI-1658] added checkstyle fixes for tabs
d439917
@ds-psosnowski
feat(impl):[TRI-1658] fixed problem with missing notification bpn
a0fe225
@ds-alexander-bulgakov
TRI-1658: Corrected Vehicle D assets in ESS_Testdata_v2.0.0-AsPlanned…
8cfe9de 
….json
@ds-psosnowski
feat(impl):[TRI-1658] added tests, code clean up
e2c8d08
@ds-psosnowski
feat(impl):[TRI-1658] added tests and code clean up
41a00a1
@ds-alexander-bulgakov
TRI-1658 (#246 and #244): Added tavern tests and according helpers fo…
78f79fa 
…r supplyChainFirstLevelBpn and hops
@ds-alexander-bulgakov
refacroting: refactored tavern-helpers for supplyChainImpacted checks
d6da7f8
@ds-alexander-bulgakov
feat(impl):[244] changed tavern method name
72314b0
@ds-psosnowski
feat(impl):[244] changed approach for first level supplier incident f…
979ae74 
…or bpn and hops
ds-ext-kmassalski and others added 25 commits November 15, 2023 15:08
@ds-ext-kmassalski
Merge pull request #640 from catenax-ng/feature/TRI-279-fix-returned-…
bd01bdb 
…http-status

feat(impl):[TRI-279] fix returned http status
@ds-jhartmann
chore(charts): Fix healthcheck template
ec62c76
@ds-jhartmann
chore(docs): Update CHANGELOG.md
29837db
@ds-ext-kmassalski
Merge pull request #647 from catenax-ng/chore/fix-healthcheck-template
b35f240 
Chore/fix healthcheck template
@mkanal
fix(document):[#204] fix headings of documentation
8c8650f
@ds-psosnowski
feat(irs-api):[#246] First level supply chain changed to show only lo…
214f291 
…west level of hops, code clean up, added test
@ds-psosnowski
Merge remote-tracking branch 'origin/feature/TRI-1658-infected-supply…
00e0f02 
…-chain-on-first-tier-level' into feature/TRI-1658-infected-supply-chain-on-first-tier-level
@ds-alexander-bulgakov
feat(impl):[279] adjusted and added tavern test for http code 206
5ebc0c9
@ds-ext-kmassalski
feat(impl):[TRI-201] cucumber
871d0a6
@ds-ext-kmassalski
feat(impl):[TRI-201] cucumber
8465ee8
@ds-ext-kmassalski
feat(impl):[TRI-201] cucumber
3a85574
@ds-ext-kmassalski
Merge pull request #650 from catenax-ng/feature/TRI-201-cucumber
1631c44 
feat(impl):[TRI-201] cucumber
@ds-alexander-bulgakov
Merge pull request #649 from catenax-ng/feature/#279_adjust-tavern-te…
ed552e3 
…sts-to-http-206-code

feature/#279: Added and adjusted tavern tests to http code 206 for running jobs
@ds-psosnowski
feat(git):[#000] Updated git message check, added documentation
a995dc8
@ds-psosnowski
feat(git):[#000] corrected documentation
366cd1d
@mkanal
Merge pull request #648 from catenax-ng/chore/#204-Runtime-view-adapt…
812b85b 
…ions-for-ESS-UseCase

fix(document):[#204] fix headings of documentation
@ds-psosnowski
Merge branch 'main' into feat/#210-extend-helm-config
c13cd15
@ds-psosnowski
Merge pull request #618 from catenax-ng/feature/TRI-1658-infected-sup…
1fa8ef5 
…ply-chain-on-first-tier-level

feat(impl):[#244] Show infected supply chain on first tier level + feat(impl):[#246] Show hops number for impacted supply chain
@ds-psosnowski
chore(irs-api):[#000] chron value change for tests
7d64dd2
@ds-psosnowski
chore(irs-api):[#000] changed cache value to string and back to iso f…
c5f9d7a 
…ormat
@ds-psosnowski
chore(irs-api):[#000] fixed CONTRIBUTING.md file
d65f367
@ds-psosnowski
chore(irs-api):fixed CONTRIBUTING.md file
e334121
@ds-psosnowski
chore(irs-api):fixed CONTRIBUTING.md file
1e9ed38
@ds-psosnowski
Merge pull request #636 from catenax-ng/feat/#210-extend-helm-config
efcd7da 
feat(irs-api):[#244] Fixed chron duration to be in ISO format, added …
@ds-psosnowski
chore(irs-api):[#210] Added documentation for cache in edc endpoint s…
2911aa2 
…ervice
ds-jhartmann
ds-jhartmann approved these changes Nov 21, 2023
View reviewed changes
Copy link
Contributor

@ds-jhartmann ds-jhartmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ds-jhartmann ds-jhartmann merged commit 6444446 into eclipse-tractusx:main Nov 21, 2023
21 of 22 checks passed
@ds-jhartmann ds-jhartmann deleted the feat/210-add-documentation-for-cache-mechanism-in-edc-service-discovery branch November 21, 2023 08:30
ds-jhartmann added a commit that referenced this pull request Feb 22, 2024
@ds-jhartmann
Merge pull request #302 from catenax-ng/feature/update-dev-registry-c…
8b6f478 
…harts

Feature/update dev registry charts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ds-jhartmann ds-jhartmann ds-jhartmann approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ds-psosnowski @ds-jhartmann @ds-ext-kmassalski @ds-alexander-bulgakov @mkanal