Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1390 - Support Common Field Types During Merging #1406

Merged

Conversation

kodinkat
Copy link
Contributor

@kodinkat kodinkat commented Jun 3, 2021

Implementation Summary

Updated and provided additional merge support for the following post field types:

  • multi_select
  • key_select
  • text
  • textarea
  • number
  • date
  • array
  • boolean
  • tags
  • location_meta
  • connection
  • communication_channel
  • tasks
  • private fields

@corsacca corsacca linked an issue Jun 4, 2021 that may be closed by this pull request
@corsacca
Copy link
Member

corsacca commented Jun 4, 2021

I get an error: Sorry, something went wrong: Missing required lng or lat when merging a contact that has a location (added with mapbox enabled)

@corsacca
Copy link
Member

corsacca commented Jun 4, 2021

Note: there is both the location and the locaction_meta field type. A quick test shows that the locations (without a mabbox key) are not being merged.

@kodinkat
Copy link
Contributor Author

kodinkat commented Jun 7, 2021

I get an error: Sorry, something went wrong: Missing required lng or lat when merging a contact that has a location (added with mapbox enabled)

Safeguards now put in place to ensure lng/lat coordinates are present.

@kodinkat
Copy link
Contributor Author

kodinkat commented Jun 7, 2021

Note: there is both the location and the locaction_meta field type. A quick test shows that the locations (without a mabbox key) are not being merged.

location field type now supported.

@corsacca
Copy link
Member

no mapbox key:
location_grid fields should be merged like tags. Ie if there is location1 on contactA and location2 on contactB, then the merged record should have location1 and location2
Some for location_grid_meta

@corsacca
Copy link
Member

Everything else Is working beautifully!

@kodinkat
Copy link
Contributor Author

no mapbox key:
location_grid fields should be merged like tags. Ie if there is location1 on contactA and location2 on contactB, then the merged record should have location1 and location2
Some for location_grid_meta

@corsacca ok cool, will refresh memory and take another look at it tomorrow! :)

@corsacca
Copy link
Member

@kodinkat is the last commit to fix the locations behavior?

@kodinkat
Copy link
Contributor Author

@kodinkat is the last commit to fix the locations behavior?

@corsacca Yep! Should now be good to go! contactB's location2 is also appended to contactA's location1. Let me know if anything...

@corsacca
Copy link
Member

@kodinkat Do you know why
Merging
image
into
image
produces:
image

It added an entry for "Toledo"

@corsacca
Copy link
Member

Thanks @kodinkat !

@corsacca corsacca merged commit 676ba41 into DiscipleTools:master Jul 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merging: Not all fields are being merged when 2 contacts are merged.
2 participants