Fixes #3967 : Improve change request merge check: #326
Conversation
|
I started by refactoring all the logic in one method, so the logic is no more repeated, but I don't really like the result ... |
|
François, if it's ok tell me so i can rebase it! |
| ) extends Changes[Directive, ChangeRequestDirectiveDiff, DirectiveChangeItem] { | ||
| val changes = OnlyDirectiveChange(directivesChanges.changes) | ||
| val changeHistory = directivesChanges.changeHistory.map(OnlyDirectiveChange) | ||
| } | ||
| //////////////////// Node Part ////////////////////////////////////////////// |
There was a problem hiding this comment.
I'm not sur I can agree with that. If the change request needs Technique, Directive and SectionSpec, I don't wan't to limitate the comparison check to Directive. What happens if the sectionSpec changed ?
There was a problem hiding this comment.
If the section spec has changed, it means that parameters of the Directive have changed and/or the Technique version has changed, so the unmergability will be found)
The Technique can't changed, (or only if LDAP/archive data has been checked so they don't need to be checked)
We only keep the root section and the technique to be able to display the value in the webapp, and are used to verify that parameters are well formed
for the merge, we were onoly compaiting directive, i wanted to restrict to the same level.
There was a problem hiding this comment.
OK, so with some more explanation, I would like to have these two classes as internal, hidden tools of the CommitAndDeployChangeRequestServiceImpl class (or even of the methods actually using them).
There was a problem hiding this comment.
I can't move them... Traits Change and Changes are sealed so we can't create them outside this file
There was a problem hiding this comment.
We decided to use an Option instead of a Change, much easier too read and to use!
Ldap datas are transformed in XML, then checked, before being unserialised to their types
…lize_ldap_into_xmll Fixes #3967 : Improve change request merge check:
Ldap datas are transformed in XML, then checked, before being
unserialised to their types
http://www.rudder-project.org/redmine/issues/3967