fix: Contact conflict resolution

[lucas-a-pelegrino]

Proposed changes (including videos or screenshots)

This PR implements a new endpoint to resolve Livechat Contact's conflicts. The reason for this is to decrease the level of coupling inside the contacts.update endpoint, so specific business rules don't overlap each other.

Issue(s)

CTZ-154

Steps to test or reproduce

1. Setup a contact with conflicting fields (name, customFields, and/or contactManager);
2. Go the Contact's Information and resolve the conflicts through the review modal;

Further comments

[dionisio-bot]

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

[changeset-bot]

🦋 Changeset detected

Latest commit: b5acf0b

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 36 packages

Name	Type
@rocket.chat/meteor	Patch
@rocket.chat/rest-typings	Patch
@rocket.chat/api-client	Patch
@rocket.chat/core-services	Patch
@rocket.chat/ddp-client	Patch
@rocket.chat/models	Patch
@rocket.chat/ui-contexts	Patch
@rocket.chat/account-service	Patch
@rocket.chat/authorization-service	Patch
@rocket.chat/ddp-streamer	Patch
@rocket.chat/stream-hub-service	Patch
@rocket.chat/omnichannel-services	Patch
@rocket.chat/presence	Patch
rocketchat-services	Patch
@rocket.chat/omnichannel-transcript	Patch
@rocket.chat/presence-service	Patch
@rocket.chat/queue-worker	Patch
@rocket.chat/network-broker	Patch
@rocket.chat/livechat	Patch
@rocket.chat/mock-providers	Patch
@rocket.chat/cron	Patch
@rocket.chat/instance-status	Patch
@rocket.chat/uikit-playground	Patch
@rocket.chat/fuselage-ui-kit	Patch
@rocket.chat/gazzodown	Patch
@rocket.chat/ui-avatar	Patch
@rocket.chat/ui-client	Patch
@rocket.chat/ui-video-conf	Patch
@rocket.chat/ui-voip	Patch
@rocket.chat/web-ui-registration	Patch
@rocket.chat/core-typings	Patch
@rocket.chat/apps	Patch
@rocket.chat/freeswitch	Patch
@rocket.chat/model-typings	Patch
@rocket.chat/license	Patch
@rocket.chat/pdf-worker	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

[CLAassistant]

All committers have signed the CLA.

[github-actions]

PR Preview Action v1.6.1
🚀 View preview at https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-36019/
Built to branch gh-pages at 2025-05-19 22:39 UTC. Preview will be ready when the GitHub Pages deployment is complete.

[codecov]

Codecov Report

Attention: Patch coverage is 91.66667% with 1 line in your changes missing coverage. Please review.

Project coverage is 64.70%. Comparing base (824a953) to head (b5acf0b).
Report is 5 commits behind head on develop.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop   #36019      +/-   ##
===========================================
- Coverage    64.70%   64.70%   -0.01%     
===========================================
  Files         3107     3108       +1     
  Lines        93087    93098      +11     
  Branches     17740    17773      +33     
===========================================
+ Hits         60232    60237       +5     
  Misses       30068    30068              
- Partials      2787     2793       +6     

Flag	Coverage Δ
e2e	58.38% <91.66%> (-0.02%)	⬇️
unit	71.46% <ø> (+0.01%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

[lucas-a-pelegrino]

/backport 7.5.2

[dionisio-bot]

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-7.5.2-36019
git cherry-pick 6d334f21b97f0cb98d9af03be5167ff60198f6c1
// solve the conflict
git push

after that just run /backport 7.5.2 again

[lucas-a-pelegrino]

/backport 7.5.2

[dionisio-bot]

Pull request #36176 added to Project: "Patch 7.5.2"