Minor cleanup on import return codes #23626
Conversation
|
(Standard links)
|
b09a473 to
abbea1e
Compare
abbea1e to
ea153fc
Compare
| array_unshift($values, $errorMessage); | ||
| $this->setImportStatus((int) $values[count($values) - 1], 'ERROR', $errorMessage); | ||
| return CRM_Import_Parser::ERROR; | ||
| $this->setImportStatus((int) $values[count($values) - 1], 'ERROR', $relatedNewContact['error_message']); |
There was a problem hiding this comment.
These could be $rowNumber - I didn't change them all cos I added that later on in the piece - but I've got a bunch of PRs that would need to be rebased if I change it in this PR - so I think it might be a post-cleanup
| $this->assertEquals(CRM_Import_Parser::ERROR, $parser->import(CRM_Import_Parser::DUPLICATE_UPDATE, $values), 'Return code from parser import was not as expected'); | ||
| $parser->init(); | ||
| $parser->import(CRM_Import_Parser::DUPLICATE_UPDATE, $values); | ||
| $this->assertEquals(1, $dataSource->getRowCount([CRM_Import_Parser::ERROR])); |
There was a problem hiding this comment.
The other tests already use this method - ie check the actual import table not the return code (which there no longer is)
ea153fc to
2940ddb
Compare
|
@monishdeb if you have time to look - this is the first in the chain & then it reaches right up to #23622 - which gets us to almost where I am hoping to be for the rc |
|
Did r-run on my local, works fine. Code changes look good. test-build passes for the updated UT. Hence merging. |
|
Thanks @monishdeb - if you are looking at others in the chain do you want me to rebase them now? |
|
the next one doesn't actually require a rebase - #23623 |
Overview
Minor cleanup on import return codes
Before
importwas ignoring all return codes exceptNO_MATCHandUNPARSED_ADDRESS_WARNINGhowever, wrangling was going on for the past version where it had to extract the error message which had been pushed onto$valuesAfter
$returnCodeonly returned & handled forUNPARSED_ADDRESS_WARNINGwhich I still need to work through. No crazy$valueswrangling because it is ignored.NO_MATCHhandled within import, like (almost) all the others are.Technical Details
This has test cover - checking what is actually logged
Comments