[REF] Simplify error handling in contribution import #24351
Conversation
|
(Standard links)
|
| @@ -626,19 +615,14 @@ private function deprecatedFormatParams($params, &$values, $create = FALSE) { | |||
|
|
|||
| switch ($key) { | |||
| case 'contact_id': | |||
| if (!CRM_Utils_Rule::integer($value)) { | |||
| return civicrm_api3_create_error("contact_id not valid: $value"); | |||
There was a problem hiding this comment.
@eileenmcnaughton why not just throw an exception here?
There was a problem hiding this comment.
Cos it has already happened earlier on - that is a redundant check that was done during validate
742b29d to
be79c37
Compare
|
Well merging that suggestion caused syntax errors so I decided to ride with the scope creep & fully remove that check to a sane place using shared code. |
| } | ||
| $values['contribution_campaign_id'] = $params['contribution_campaign_id']; |
There was a problem hiding this comment.
@eileenmcnaughton is there a reason for removing the campaign id validation here?
There was a problem hiding this comment.
yep - because it is already done in the validate stage (so is the email validation now I look - that should come out too)
|
Dang it has passed now - AND it's stale. I guess I might as well pull out that redundant email validation (validation is done before all the legacy code is hit - the legacy code doesn't do much but there is a lot of it :-) |
Update CRM/Contribute/Import/Parser/Contribution.php Co-authored-by: Seamus Lee <seamuslee001@gmail.com>
be79c37 to
87bfdf5
Compare
Overview
[REF] Simplify error handling in contribution import
Before
private function deprecatedFormatParams($params, &$values, $create = FALSE)returns an array which is converted into an exception & thrown
After
The exception is just thrown directly
Technical Details
Although there is handling for different types of error those were not being hit - so this doesn't change that (just throws the type of error it was winding up being.) I also removed a validate on the campaign as that is checked in the
validateprocess as is the fact the contact_id is an integer (although I cast it to an int as good practice when using in a query)Comments