fix: contact being marked as known when updating custom fields or conflicts #36116

lucas-a-pelegrino · 2025-05-30T19:15:42Z

Proposed changes (including videos or screenshots)

This PR adds a new model function (.updateContactCustomFields) that allows updating contact custom fields or adding conflicting fields without overlapping other business rules.

Issue(s)

CTZ-179

Steps to test or reproduce

Further comments

This PR is a additional improvement to #36097

dionisio-bot · 2025-05-30T19:15:46Z

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

changeset-bot · 2025-05-30T19:15:47Z

🦋 Changeset detected

Latest commit: 93b7a7e

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/model-typings	Patch
@rocket.chat/models	Patch
@rocket.chat/apps	Patch
@rocket.chat/account-service	Patch
@rocket.chat/authorization-service	Patch
@rocket.chat/ddp-streamer	Patch
@rocket.chat/omnichannel-transcript	Patch
@rocket.chat/presence-service	Patch
@rocket.chat/queue-worker	Patch
@rocket.chat/stream-hub-service	Patch
@rocket.chat/omnichannel-services	Patch
rocketchat-services	Patch
@rocket.chat/core-services	Patch
@rocket.chat/cron	Patch
@rocket.chat/instance-status	Patch
@rocket.chat/presence	Patch
@rocket.chat/network-broker	Patch
@rocket.chat/core-typings	Patch
@rocket.chat/rest-typings	Patch
@rocket.chat/uikit-playground	Patch
@rocket.chat/api-client	Patch
@rocket.chat/ddp-client	Patch
@rocket.chat/freeswitch	Patch
@rocket.chat/fuselage-ui-kit	Patch
@rocket.chat/gazzodown	Patch
@rocket.chat/livechat	Patch
@rocket.chat/ui-contexts	Patch
@rocket.chat/license	Patch
@rocket.chat/pdf-worker	Patch
@rocket.chat/mock-providers	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

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

github-actions · 2025-05-30T19:39:46Z

PR Preview Action v1.6.1
🚀 View preview at https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-36116/
Built to branch `gh-pages` at 2025-06-04 14:24 UTC. Preview will be ready when the GitHub Pages deployment is complete.

packages/models/src/models/LivechatContacts.ts

ggazzo

What would be the regression in this case?

lucas-a-pelegrino · 2025-05-30T20:13:23Z

What would be the regression in this case?

Hello, this regression was added as an additional improvement for original PR fixing a bug with contacts conflicting fields being saved with nullish values.

You can check the full fix here: #36097

Co-authored-by: Guilherme Gazzo <[email protected]>

codecov · 2025-05-30T21:01:03Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 64.97%. Comparing base (c008401) to head (93b7a7e).
Report is 1 commits behind head on develop.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop   #36116      +/-   ##
===========================================
- Coverage    64.97%   64.97%   -0.01%     
===========================================
  Files         3112     3113       +1     
  Lines        93795    93802       +7     
  Branches     17810    17809       -1     
===========================================
  Hits         60944    60944              
- Misses       30065    30075      +10     
+ Partials      2786     2783       -3

Flag	Coverage Δ
e2e	`58.41% <ø> (-0.01%)`	⬇️
unit	`71.69% <100.00%> (-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.

packages/models/src/models/LivechatContacts.ts

fixed

lucas-a-pelegrino · 2025-06-06T18:44:53Z

/backport 7.5.2

dionisio-bot · 2025-06-06T18:45:23Z

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-36116
git cherry-pick 2f8213e4c5b64201eb11c97e6e33d2488df9089d
// solve the conflict
git push

after that just run /backport 7.5.2 again

KevLehman · 2025-06-11T17:03:27Z

/patch

…flicts (#36116)

dionisio-bot · 2025-06-11T17:04:04Z

Pull request #36200 added to Project: "undefined"

feat: adds new model function to update contact custom fields

1fec2df

tests: updates unit tests to use new model function

25d3a95

ggazzo reviewed May 30, 2025

View reviewed changes

packages/models/src/models/LivechatContacts.ts Outdated Show resolved Hide resolved

ggazzo previously requested changes May 30, 2025

View reviewed changes

chore: adds pull request review suggestion

c0a81df

Co-authored-by: Guilherme Gazzo <[email protected]>

lucas-a-pelegrino requested a review from ggazzo May 30, 2025 20:13

fix: fixes return type for updateContactCustomFields

405061a

sampaiodiego requested changes May 30, 2025

View reviewed changes

packages/models/src/models/LivechatContacts.ts Outdated Show resolved Hide resolved

chore: removes type casting from model function

c345f55

lucas-a-pelegrino requested a review from sampaiodiego June 2, 2025 16:57

lucas-a-pelegrino marked this pull request as ready for review June 2, 2025 16:57

lucas-a-pelegrino requested review from a team as code owners June 2, 2025 16:57

docs: adds changeset

b650341

sampaiodiego approved these changes Jun 3, 2025

View reviewed changes

sampaiodiego changed the title ~~regression: adds new model function to update contact custom fields~~ fix: contact being marked as known when updating custom fields or conflicts Jun 3, 2025

sampaiodiego added this to the 7.8.0 milestone Jun 3, 2025

sampaiodiego added the stat: QA assured Means it has been tested and approved by a company insider label Jun 3, 2025

dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jun 3, 2025

kodiakhq bot added 2 commits June 3, 2025 19:49

Merge branch 'develop' into regression/CTZ-179

04c4e0f

Merge branch 'develop' into regression/CTZ-179

93b7a7e

kodiakhq bot merged commit 2f8213e into develop Jun 4, 2025
43 checks passed

kodiakhq bot deleted the regression/CTZ-179 branch June 4, 2025 15:19

dionisio-bot bot pushed a commit that referenced this pull request Jun 11, 2025

fix: contact being marked as known when updating custom fields or con…

88f3726

…flicts (#36116)

dionisio-bot bot mentioned this pull request Jun 11, 2025

fix: contact being marked as known when updating custom fields or conflicts #36200

Merged

This was referenced Jun 20, 2025

Release 7.8.0 #36262

Merged

Release 7.8.0 #36280

Merged

Release 7.7.2 #36255

Merged

rocketchat-github-ci mentioned this pull request Jul 8, 2025

Release 7.8.0 #36380

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: contact being marked as known when updating custom fields or conflicts #36116

fix: contact being marked as known when updating custom fields or conflicts #36116

Uh oh!

lucas-a-pelegrino commented May 30, 2025 •

edited

Loading

Uh oh!

dionisio-bot bot commented May 30, 2025 •

edited

Loading

Uh oh!

changeset-bot bot commented May 30, 2025 •

edited

Loading

Uh oh!

github-actions bot commented May 30, 2025 •

edited

Loading

Built to branch `gh-pages` at 2025-06-04 14:24 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

Uh oh!

Uh oh!

ggazzo left a comment

Uh oh!

lucas-a-pelegrino commented May 30, 2025

Uh oh!

codecov bot commented May 30, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

lucas-a-pelegrino commented Jun 6, 2025

Uh oh!

dionisio-bot bot commented Jun 6, 2025

Uh oh!

KevLehman commented Jun 11, 2025

Uh oh!

dionisio-bot bot commented Jun 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

fix: contact being marked as known when updating custom fields or conflicts #36116

fix: contact being marked as known when updating custom fields or conflicts #36116

Uh oh!

Conversation

lucas-a-pelegrino commented May 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

Uh oh!

dionisio-bot bot commented May 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

changeset-bot bot commented May 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

github-actions bot commented May 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Built to branch gh-pages at 2025-06-04 14:24 UTC. Preview will be ready when the GitHub Pages deployment is complete.

Uh oh!

Uh oh!

ggazzo left a comment

Choose a reason for hiding this comment

Uh oh!

lucas-a-pelegrino commented May 30, 2025

Uh oh!

codecov bot commented May 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

lucas-a-pelegrino commented Jun 6, 2025

Uh oh!

dionisio-bot bot commented Jun 6, 2025

Uh oh!

KevLehman commented Jun 11, 2025

Uh oh!

dionisio-bot bot commented Jun 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

lucas-a-pelegrino commented May 30, 2025 •

edited

Loading

dionisio-bot bot commented May 30, 2025 •

edited

Loading

changeset-bot bot commented May 30, 2025 •

edited

Loading

github-actions bot commented May 30, 2025 •

edited

Loading

Built to branch `gh-pages` at 2025-06-04 14:24 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

codecov bot commented May 30, 2025 •

edited

Loading