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

Feat/improve samm mapping #52

Merged
merged 9 commits into from
Oct 16, 2023
Merged

Feat/improve samm mapping #52

merged 9 commits into from
Oct 16, 2023

Conversation

eschrewe
Copy link
Contributor

@eschrewe eschrewe commented Oct 9, 2023

Description

  • ProductStockSammDto now supports MeasurementUnit enum instead of String representation
  • Mapping Annotation added to MeasurementUnit
  • Stock and its sub classes now support Sites and Addresses
  • Incoming data from ProductStockSammDto's will now be merged with other PartnerProductStocks if locationId, locationIdType and MeasurementUnit are matching

tom-rm-meyer-ISST
tom-rm-meyer-ISST requested changes Oct 10, 2023
View reviewed changes
Copy link
Contributor

@tom-rm-meyer-ISST tom-rm-meyer-ISST left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Great effort. Please incorporate reviews + merge / rebase to main branch + rerun dependencies check for both, frontend and backend.

...main/java/org/eclipse/tractusx/puris/backend/stock/logic/adapter/ProductStockSammMapper.java Outdated Show resolved Hide resolved
...main/java/org/eclipse/tractusx/puris/backend/stock/logic/adapter/ProductStockSammMapper.java Outdated Show resolved Hide resolved
@tom-rm-meyer-ISST
Copy link
Contributor

@eschrewe plese merge the conflicts for the backend dependencies with the main branch

@eschrewe
Merge branch 'main' into feat/improve_samm_mapping
69ab001 
# Conflicts:
#	DEPENDENCIES_BACKEND
#	backend/DEPENDENCIES
@eschrewe
Copy link
Contributor Author

Done

tom-rm-meyer-ISST
tom-rm-meyer-ISST requested changes Oct 16, 2023
View reviewed changes
Copy link
Contributor

@tom-rm-meyer-ISST tom-rm-meyer-ISST left a comment

Choose a reason for hiding this comment

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

Please switch order of customer material number and supplier material number during search.

...main/java/org/eclipse/tractusx/puris/backend/stock/logic/adapter/ProductStockSammMapper.java Outdated
if(samm.getMaterialNumberCatenaX().isPresent()) {
material = materialService.findByMaterialNumberCx(samm.getMaterialNumberCatenaX().get());
}
if(material == null && samm.getMaterialNumberCustomer() != null) {
Copy link
Contributor

Choose a reason for hiding this comment

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

The cascade of which material number must be used must be as follows:

  • catena-x
  • supplier
  • customer

Please switch

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

tom-rm-meyer-ISST
tom-rm-meyer-ISST approved these changes Oct 16, 2023
View reviewed changes
Copy link
Contributor

@tom-rm-meyer-ISST tom-rm-meyer-ISST left a comment

Choose a reason for hiding this comment

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

Great work! LGTM, Quality check is related to helm chart structure

@tom-rm-meyer-ISST tom-rm-meyer-ISST merged commit 197e591 into eclipse-tractusx:main Oct 16, 2023
10 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tom-rm-meyer-ISST tom-rm-meyer-ISST tom-rm-meyer-ISST 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.
2 participants
@eschrewe @tom-rm-meyer-ISST