search

MauroDataMapper / mdm-core

The backend of MDM
Apache License 2.0
7 stars 3 forks source link

gh-475 Edit history for merged items under versioned folders #480

Closed pjmonks closed 4 months ago

pjmonks commented 4 months ago

Resolves #475

Track at an item level changes that have happened to items under a versioned folder during a merge:

This then results in a visible change history at the item level, as well as the CHANGELOG entry recorded on the versioned folder itself.

image

I have adjusted the mdm-testing-functional tests for Versioned Folder merging to carry out some spot checks to ensure that these MERGE history entries are at least being recorded.

pjmonks commented 4 months ago

I have pushed some fixes due to failed tests, part of my changes broke parameter lists and overridden methods in the ModelService. All the merge tests pass now, but one new test has failed for ProfileFunctionalSpec in mdm-testing-functional. This originally passed before and passes locally on my machine, I'm hoping this is an outlier.

jamesrwelch commented 4 months ago

The code changes look good and the tests look sensible. I've just tried it myself, on a minimal versioned folder, and I'm not getting any MERGE edits for the PrimitiveType that I've modified. Have I done something wrong?

pjmonks commented 4 months ago

@jamesrwelch I've found the cause of your issue, the data type is recording the edit history during the merge correctly, as you can see in Postgres:

image

The problem is actually the UI, it's requesting a resource type of dataTypes but needs to be more specific like primitiveTypes, so it is not fetching the history correctly.

Here are the current known issues related to merging and the change history: