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.

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

[Model Update]: essIncident #572 #592

Merged
merged 6 commits into from
Feb 20, 2024

Conversation

birgitZF
Copy link
Contributor

@birgitZF birgitZF commented Feb 2, 2024

update changes to essIncident data model acc. to industry core

Description

[3.0.0] - 2024-02-19

Changed

  • updated version of model
  • update reference to shared aspect address
  • update BPN-L/S/A and refer to shared model
  • update IDs and refer to shared Uuidv4Characteristic
  • delete product number
  • adjust copyright info

Closes #572

MS2 Criteria

(to be filled out by PR reviewer)

  • the model validates with the SAMM SDS SDK in the version specified in the Readme.md of this repository by the time of the MS2 check (e.g., 'java -jar samm-cli.jar aspect <path-to-aspect-model> validate ). The SAMM CLI is available here and in GitHub
  • use Camel-Case (e.g., "MyModelElement" or "TimeDifferenceGmtId", when in doubt follow https://google.github.io/styleguide/javaguide.html#s5.3-camel-case)
  • the identifiers for all model elements start with a capital letter except for properties
  • the identifier for properties starts with a small letter
  • all model elements at least contain the fields "preferred name" and "description" in English language. The description must be comprehensible. It is not required to write full sentences but style should be consistent over the whole model
  • Property and the referenced Characteristic should not have the same name
  • the versioning in the URN follows semantic versioning, where minor version bumps are backwards compatible and major version bumps are not backwards compatible.
  • use abbreviations only when necessary and if these are sufficiently common
  • avoid redundant prefixes in property names (consider adding properties to an enclosing Entity or even adapt the namespace of the model elements, e.g., instead of having two properties DismantlerId and DismantlerName use an Entity Dismantler with the properties name and id or use a URN like io.catenax.dismantler:0.0.1)
  • fields preferredName and description are not the same
  • preferredName should be human readable and follow normal orthography (e.g., no camel case but normal word separation)
  • name of aspect is singular except if it only has one property which is a Collection, List or Set. In theses cases, the aspect name is plural.
  • units are referenced from the SAMM unit catalog whenever possible
  • use constraints to make known constraints from the use case explicit in the aspect model
  • when relying on external standards, they are referenced through a "see" element
  • all properties with an simple type have an example value
  • metadata.json exists with status "release"
  • generated json schema validates against example json payload
  • file RELEASE_NOTES.md exists and contains entries for proposed model changes
  • all contributors to this model are mentioned in copyright header of model file

MS3 Criteria

(to be filled out by semantic modeling team before merge to main-branch)

  • All required reviewers have approved this PR (see reviewers section)
  • The new aspect (version) will be implemented by at least one data provider
  • The new aspect (version) will be consumed by at least one data consumer
  • There exists valid test data
  • In case of a new (incompatible) major version to an existing version, a migration strategy has been developed
  • The model has at least version '1.0.0'
  • If a previous model exists, model deprecation has been checked for previous model
  • The release date in the Release Note is set to the date of the MS3 approval

update changes to essIncident data model acc. to industry core
Copy link

github-actions bot commented Feb 6, 2024

Validation Report for io.catenax.essincident/3.0.0/EssIncident.ttl

Input model is valid

Copy link

github-actions bot commented Feb 6, 2024

Validation Report for io.catenax.essincident/3.0.0/EssIncident.ttl

Input model is valid

samm:dataType xsd:string ;
samm-c:values ( "Child labour" "Forced labour" "Slavery" "Work safety" "Freedom of association" "Discrimination" "Minimum wage" "Environmental pollution" "Forced eviction" "Force by state security" "Usage of Mercury" "Usage of harmful chemicals" "Non-environmental friendly handling of waste" "Import and export of hazardous waste" ) .

:IdTrait a samm-c:Trait ;
Copy link
Contributor

Choose a reason for hiding this comment

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

you can make use of shared aspect uuid here and dont need to define your own trait for uuidv4.
https://github.com/eclipse-tractusx/sldt-semantic-models/blob/main/io.catenax.shared.uuid/2.0.0/Uuid.ttl#L35

Copy link
Contributor

@agg3fe agg3fe left a comment

Choose a reason for hiding this comment

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

please check my comment

@birgitZF
Copy link
Contributor Author

birgitZF commented Feb 7, 2024

please check update, I added reference to UUID-characteristic

Copy link

github-actions bot commented Feb 7, 2024

Validation Report for io.catenax.essincident/3.0.0/EssIncident.ttl

Input model is valid

:incidentId a samm:Property ;
samm:preferredName "Incident ID"@en ;
samm:description "Unique identifier for an incident in the context of ESS (Environmental and Social Standards)"@en ;
samm:characteristic ext-uuid:Uuidv4Characteristic ;
Copy link
Contributor

Choose a reason for hiding this comment

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

If you want you can directly link trait instead of Characteristic. It will add the usage of constraint automatically at the same time.
example https://github.com/eclipse-tractusx/sldt-semantic-models/pull/600/files#diff-1c4db0c94a76620747c6f8dcc2656113dcb1aac2a932d9b964e6a514a4bb8824R43

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I linked shared trait (symbol T in aspect modeler) with my Property (symbol P in aspect modeler) and then tried to link the shared trait (symbol T in aspect modeler) with my Characteristic (symbol C in aspect modeler). Received error message "cannot connect external reference".
I could not open the model example itemstock 2.0.0 you linked above. Can you advise?

Copy link
Contributor

Choose a reason for hiding this comment

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

just add this as a characteristic in all three properties.
samm:characteristic ext-uuid:UuidV4Trait;
Let me know if you still face problem.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sorry, I was ill thius week so I could not get back to you earlier. That was exactly what I did in the latest version of the model (link the characteristic to the properties), but I am not sure if this is what you expected when you asked to add the trait to the properties.
it looks like this: see screenshot
screenshot
Let me know if this is not what you meant. Thanks

Copy link
Contributor

Choose a reason for hiding this comment

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

Actually you are still linking the Uuidv4Characteristic to your property. You need to attach the UuidV4Trait from Uuid shared model to your property directly. After that it would look like this:
Screenshot 2024-02-16 at 16 27 32
Let me know if you don't find it, then I will push the commit from my side.

Copy link
Contributor Author

@birgitZF birgitZF Feb 19, 2024

Choose a reason for hiding this comment

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

Thanks for the hint, got it now and committed the changes with referencec to trait.
Nevertheless the coding still shows @Prefix ext-uuid: urn:samm:io.catenax.shared.uuid:2.0.0# .

@agg3fe
Copy link
Contributor

agg3fe commented Feb 16, 2024

@birgitZF please let me know if you need any further help on this.

Copy link

Validation Report for io.catenax.essincident/3.0.0/EssIncident.ttl

Input model is valid

Copy link
Contributor

@agg3fe agg3fe left a comment

Choose a reason for hiding this comment

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

LGTM

@agg3fe agg3fe added MS2_Approved Checklist "MS2 Valid Model" is approved. MS3_Approved Checklist "MS3 Release Model" is approved. The associated pull request can be merged to the "main-br labels Feb 19, 2024
update date for version 3.0.0
Copy link

Validation Report for io.catenax.essincident/3.0.0/EssIncident.ttl

Input model is valid

@agg3fe agg3fe merged commit 8460272 into eclipse-tractusx:main Feb 20, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
MS2_Approved Checklist "MS2 Valid Model" is approved. MS3_Approved Checklist "MS3 Release Model" is approved. The associated pull request can be merged to the "main-br
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Model Update]: essIncident
2 participants