feat(#653): add --merge-primary-contacts flag for merge-contacts action

[kennsippell]

Description

When --merge-primary-contacts is present during merge-contacts:

• If both source and destination have a primary contact, the source primary contacts are deleted and all of their reports reassigned to the destination primary contact
• If either source or destination don't have a primary contact, then the source primary contact is moved normally with no reports reassigned
• If the destination has no primary contact, I considered updating the destination doc to use the source primary contact. Currently, nothing ever results in the destination contact being updated so I decided this might be overstepping.

Closes #653

Base branch is #652

Code review items

• Readable: Concise, well named, follows the style guide, documented if necessary.
• Documented: Configuration and user documentation on cht-docs
• Tested: Unit and/or integration tests where appropriate
• Backwards compatible: Works with existing data and configuration. Any breaking changes documented in the release notes.

License

The software is provided under AGPL-3.0. Contributions to this project are accepted under the same license.

[kennsippell]

One last review for these related PRs. Thanks @sugat009!

[freddieptf]

@sugat009 @kennsippell what's pending here? Would be great to get this merged as UMT is relying on this branch which is problematic when targeting cht >= v5

[sugat009]

@freddieptf I'm not sure. It was already approved.

[andrablaj]

@sugat009 can we revive this PR and merge if ready I see the CI is not passing - any idea why?

[sugat009]

@sugat009 can we revive this PR and merge if ready I see the CI is not passing - any idea why?

sure, let me check.

[sugat009]

The issues are all in the test layer. The feature code itself is correct and unchanged:

1. Missing apiStub configuration: The merge with main brought in the Nouveau/version check code path. The --merge-primary-contacts tests weren't updated to set up apiStub.giveCommonResponse(...), causing API version check retries that exceed the 2000ms Mocha timeout.
2. Incorrect test fixture expectations: The beforeEach report has patientId: 'district_2' (the place), but the assertions expected primary contact reassignment (person to person). A separate report with patientId: ''district_2_contact' is needed to exercise that logic.
3. Missing 5.0.0 test counterparts: Every other merge test has both a 4.15.0 (CouchDB view) and 5.0.0 (Nouveau) variant. The --merge-primary-contacts tests need these as well.

[andrablaj]

Thank you for the analysis @sugat009! Would it be a big effort to ship this and make any necessary updates?

[sugat009]

Thank you for the analysis @sugat009! Would it be a big effort to ship this and make any necessary updates?

Not really. It's mostly fixing the tests and data structures there. I have the fixed tests ready when debugging this. Should I push to this branch?

[andrablaj]

Should I push to this branch?

Yes, please and let's have this shipped to support @freddieptf and team! Thank you so much!

[sugat009]

@freddieptf The CI is green now. Would you mind doing a quick round of testing before I merge this to main?

[freddieptf]

@sugat009 sure, let me test it right now and see if everything works

[freddieptf]

@sugat009 LGTM

[sugat009]

Thanks @freddieptf for testing! Merging to main.

[medic-ci]

🎉 This PR is included in version 6.1.0 🎉

The release is available on:

• npm package (@latest dist-tag)
• GitHub release

Your semantic-release bot 📦🚀