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

Manufacturing Capability Hierarchical Element Fix 3.1.0 #671

Merged
merged 8 commits into from
Mar 12, 2024
Merged

Manufacturing Capability Hierarchical Element Fix 3.1.0 #671

merged 8 commits into from
Mar 12, 2024

Conversation

FlorianPatzerC0d3
Copy link
Contributor

@FlorianPatzerC0d3 FlorianPatzerC0d3 commented Feb 21, 2024 •
edited by agg3fe
Loading

Description

As discussed with @agg3fe, we needed to fix the representation of hierarchical elements in the Manufacturing Capability Aspect Model. This fix is a minor update and pulls the version from 3.0.0 to 3.1.0.

Closes #623

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

@github-actions GitHub Actions
Copy link

Validation Report for io.catenax.manufacturing_capability/3.1.0/ManufacturingCapability.ttl

Input model is valid

@github-actions GitHub Actions
Copy link

Validation Report for io.catenax.manufacturing_capability/3.0.0/ManufacturingCapability.ttl

Input model is valid

@FlorianPatzerC0d3 FlorianPatzerC0d3 mentioned this pull request Feb 21, 2024
Closed
agg3fe
agg3fe reviewed Feb 23, 2024
View reviewed changes
io.catenax.manufacturing_capability/3.0.0/ManufacturingCapability.ttl Outdated
@@ -13,6 +13,7 @@
# SPDX-License-Identifier: CC-BY-4.0
#######################################################################


@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.1.0#>.
Copy link
Contributor

Choose a reason for hiding this comment

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

Why are you making changes in 3.0.0 version when you are releasing 3.1.0 version?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good eye! The changes have been made in 3.0.0 before you suggested the 3.1.0. I refactored the changes to appear only in 3.1.0, but something obviously went wrong during a merge. I will fix it immediately.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

With commit d11fae4 there should not be any more changes in 3.0.0.

@github-actions GitHub Actions
Copy link

Validation Report for io.catenax.manufacturing_capability/3.1.0/ManufacturingCapability.ttl

Input model is valid

agg3fe
agg3fe reviewed Feb 23, 2024
View reviewed changes
io.catenax.manufacturing_capability/3.0.0/gen/ManufacturingCapability-schema.json Outdated
@@ -1,363 +1,400 @@
{
"$schema" : "http://json-schema.org/draft-04/schema",
Copy link
Contributor

Choose a reason for hiding this comment

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

you need to remove this file also. only folder 3.1.0 is required.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Folder 3.0.0 should not contain any changes anymore. Does this make the comment obsolete?

@github-actions GitHub Actions
Copy link

Validation Report for io.catenax.manufacturing_capability/3.1.0/ManufacturingCapability.ttl

Input model is valid

@agg3fe
Copy link
Contributor

agg3fe commented Feb 26, 2024

@FlorianPatzerC0d3 Will keep this PR on hold for now, as cyclic dependency issue needs to be resolved first.

@github-actions GitHub Actions
Copy link

Validation Report for io.catenax.manufacturing_capability/3.1.0/ManufacturingCapability.ttl

Validation failed:

@FlorianPatzerC0d3
Copy link
Contributor Author

Cyclic dependency: 3.1.0 of manufacturing capability model now references 1.1.0 from bill of process model, which will reference 3.1.0. Thus, with commit d098b00 the cyclic dependency is resolved as soon as bill of process model 1.1.0 is merged.

@agg3fe
Copy link
Contributor

agg3fe commented Feb 29, 2024

Cyclic dependency: 3.1.0 of manufacturing capability model now references 1.1.0 from bill of process model, which will reference 3.1.0. Thus, with commit d098b00 the cyclic dependency is resolved as soon as bill of process model 1.1.0 is merged.

@FlorianPatzerC0d3 Thanks for the change You can raise the issue and PR for bill of process 1.1.0 also. I will do the MS2 for both PRs then.

agg3fe
agg3fe approved these changes Feb 29, 2024
View reviewed changes
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
Copy link
Contributor

agg3fe commented Feb 29, 2024

This PR will be merged after the merge of bill of process 1.1.0.

@agg3fe agg3fe added the MS2_Approved Checklist "MS2 Valid Model" is approved. label Feb 29, 2024
agg3fe
agg3fe reviewed Mar 4, 2024
View reviewed changes
io.catenax.manufacturing_capability/RELEASE_NOTES.md Outdated
@@ -2,6 +2,11 @@

All notable changes to this model will be documented in this file.

## [3.1.0] - 2024-02-21
Copy link
Contributor

Choose a reason for hiding this comment

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

date 4th March

@agg3fe agg3fe added the MS3_Approved Checklist "MS3 Release Model" is approved. The associated pull request can be merged to the "main-br label Mar 4, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 5, 2024

Validation Report for io.catenax.manufacturing_capability/3.1.0/ManufacturingCapability.ttl

Input model is valid

@agg3fe agg3fe merged commit 4a62f88 into eclipse-tractusx:main Mar 12, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@agg3fe agg3fe agg3fe approved these changes

Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Model Issue]: Manufacturing Capability Model HierarchyElement misconception
3 participants
@FlorianPatzerC0d3 @agg3fe @fschoeppenthau