Dedupe selected fields, simplify, removed greeting id fields #29632
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
🤖 Thank you for contributing to CiviCRM! ❤️ We will need to test and review this PR. 👷 Introduction for new contributors...
Quick links for reviewers...
|
colemanw
reviewed
Mar 6, 2024
Comment on lines
+181
to
+203
| $contactTypeFields = [ | ||
| 'Organization' => [ | ||
| 'legal_name' => 'Legal Name', | ||
| 'organization_name' => 'Organization Name', | ||
| 'sic_code' => 'Sic Code', | ||
| ], | ||
| 'Individual' => [ | ||
| 'birth_date' => 'Birth Date', | ||
| 'is_deceased' => 'Deceased', | ||
| 'deceased_date' => 'Deceased Date', | ||
| 'first_name' => 'First Name', | ||
| 'formal_title' => 'Formal Title', | ||
| 'gender_id' => 'Gender ID', | ||
| 'prefix_id' => 'Individual Prefix', | ||
| 'suffix_id' => 'Individual Suffix', | ||
| 'job_title' => 'Job Title', | ||
| 'last_name' => 'Last Name', | ||
| 'middle_name' => 'Middle Name', | ||
| ], | ||
| 'Household' => [ | ||
| 'household_name' => 'Household Name', | ||
| ], | ||
| ]; |
There was a problem hiding this comment.
This metadata already exists in DAO_Contact::getFields(). E.g. the household_name field has this:
civicrm-core/CRM/Contact/DAO/Contact.php
Line 1740 in 323a49a
There was a problem hiding this comment.
@colemanw yeah - but the point of hard-coding it in the test is to make sure it doesn't change at all & this is a static reference to id
There was a problem hiding this comment.
Ok sure. As long as the live code is reading from the metadata. Is it?
There was a problem hiding this comment.
@colemanw yep - the live code is readying from DAO::import() but I want to switch it to reading from the api
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Dedupe selected fields, simplify, removed greeting id fields
Before
The code was previously shared with import & is super confusing + has some stuff that is really for import, not dedupe.
Functionally the 3 fields that hold greeting IDs don't make sense for dedupe - ie email_greeting_id, postal_greeting_id, addressee_id could only really have crept into dedupe fields because they make sense for importing.
e.g in this image 'Addressee' disappears from the list
After
I removed the 3 greeting id fields & the complex code that adds them, but otherwise no change to returned fields, but added test cover to lock the results of this function in
Technical Details
Comments