[REF] [Import] Minor simplification #23464
Merged
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
At this stage value already holds the phone_type_id, location_type_id, im_provider_id, website_type_id if any, so we don't need to throw it away & start again.
|
(Standard links)
|
| @@ -2345,8 +2345,6 @@ private function getParams(array $values): array { | |||
| $relatedContactType = $this->getRelatedContactType($mappedField['relationship_type_id'], $mappedField['relationship_direction']); | |||
| $relatedContactLocationTypeID = $relatedContactKey ? $mappedField['location_type_id'] : NULL; | |||
| $relatedContactWebsiteTypeID = $relatedContactKey ? $mappedField['website_type_id'] : NULL; | |||
| $relatedContactIMProviderID = $relatedContactKey ? $mappedField['provider_id'] : NULL; | |||
| $relatedContactPhoneTypeID = $relatedContactKey ? $mappedField['phone_type_id'] : NULL; | |||
|
|
|||
| $locationFields = ['location_type_id', 'phone_type_id', 'provider_id', 'website_type_id']; | |||
| $value = array_filter(array_intersect_key($mappedField, array_fill_keys($locationFields, 1))); | |||
There was a problem hiding this comment.
here is where $value is formed
|
Makes sense |
|
thanks! |
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
[REF] [Import] Minor simplification
Before
More code
After
Less code
Technical Details
At this stage value already holds the phone_type_id, location_type_id, im_provider_id, website_type_id
if any, so we don't need to throw it away & start again.
The main thing this clarifies is that if website_type_id is set at this point the field will be 'url' and we don't need to check for that - obviously there may have been some past ambiguity but we now load the code from the civicrm_mapping_field table & on checking the 2 go together
Comments
There is still more simplification here to do - some of it still confuses me even thought it seems like a simple function.
However, my feeling is that in the end the function would ALSO map option values to ids & reformat dates, leaving less work for the validation function