Skip to content

Commit

Permalink
[Import] Check subtype validity in validate rather than wait for 'imp…
Browse files Browse the repository at this point in the history 
…ort', test
  • Loading branch information
@eileenmcnaughton
eileenmcnaughton committed May 20, 2022
1 parent 92414c6 commit 1c5a23d
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 72 deletions.
64 changes: 14 additions & 50 deletions CRM/Contact/Import/Parser/Contact.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Import_Parser {
*/
protected $metadataHandledFields = [
'gender_id',
'contact_type',
'contact_sub_type',
];

/**
Expand Down Expand Up @@ -434,34 +436,21 @@ public function import($onDuplicate, &$values) {
}

$params = $this->getMappedRow($values);
$formatted = [
'contact_type' => $this->getContactType(),
];
$formatted = array_filter(array_intersect_key($params, array_fill_keys($this->metadataHandledFields, 1)));

$contactFields = CRM_Contact_DAO_Contact::import();

$params['contact_sub_type'] = $this->getContactSubType() ?: ($params['contact_sub_type'] ?? NULL);

if ($params['contact_sub_type']) {
if (CRM_Contact_BAO_ContactType::isExtendsContactType($params['contact_sub_type'], $this->getContactType(), FALSE, 'label')) {
// I think this bit is switching a passed in label to
// a name.
$subTypes = CRM_Contact_BAO_ContactType::subTypePairs($this->getContactType(), FALSE, NULL);
$params['contact_sub_type'] = array_search($params['contact_sub_type'], $subTypes);
}
}

try {
if ($params['contact_sub_type'] && !CRM_Contact_BAO_ContactType::isExtendsContactType($params['contact_sub_type'], $this->getContactType())) {
throw new CRM_Core_Exception('Mismatched or Invalid Contact Subtype.', CRM_Import_Parser::NO_MATCH);
}
$params['id'] = $formatted['id'] = $this->lookupContactID($params, ($this->isSkipDuplicates() || $this->isIgnoreDuplicates()));
}
catch (CRM_Core_Exception $e) {
$statuses = [CRM_Import_Parser::DUPLICATE => 'DUPLICATE', CRM_Import_Parser::ERROR => 'ERROR', CRM_Import_Parser::NO_MATCH => 'invalid_no_match'];
$this->setImportStatus((int) $values[count($values) - 1], $statuses[$e->getErrorCode()], $e->getMessage());
return FALSE;
}

// Get contact id to format common data in update/fill mode,
// prioritising a dedupe rule check over an external_identifier check, but falling back on ext id.

Expand Down Expand Up @@ -919,21 +908,7 @@ private static function legacyCreateMultiple($params, $ids = []) {
* Contact DAO fields.
*/
private function formatCommonData($params, &$formatted, $contactFields) {
$csType = [
CRM_Utils_Array::value('contact_type', $formatted),
];

//CRM-5125
//add custom fields for contact sub type
if (!empty($this->_contactSubType)) {
$csType = $this->_contactSubType;
}

if ($relCsType = CRM_Utils_Array::value('contact_sub_type', $formatted)) {
$csType = $relCsType;
}

$customFields = CRM_Core_BAO_CustomField::getFields($formatted['contact_type'], FALSE, FALSE, $csType);
$customFields = CRM_Core_BAO_CustomField::getFields($formatted['contact_type'], FALSE, FALSE, $formatted['contact_sub_type'] ?? NULL);

$addressCustomFields = CRM_Core_BAO_CustomField::getFields('Address');
$customFields = $customFields + $addressCustomFields;
Expand Down Expand Up @@ -1243,6 +1218,10 @@ public static function isErrorInCustomData($params, &$errorMessage, $csType = NU
*/
public function isErrorInCoreData($params, &$errorMessage) {
$errors = [];
if (!empty($params['contact_sub_type']) && !CRM_Contact_BAO_ContactType::isExtendsContactType($params['contact_sub_type'], $params['contact_type'])) {
$errors[] = ts('Mismatched or Invalid Contact Subtype.');
}

foreach ($params as $key => $value) {
if ($value === 'invalid_import_value') {
$errors[] = $this->getFieldMetadata($key)['title'];
Expand Down Expand Up @@ -2014,16 +1993,6 @@ public function deprecated_contact_check_params(
$dupeCheck = TRUE,
$dedupeRuleGroupID = NULL) {

if (isset($params['id']) && is_numeric($params['id'])) {
// @todo - ensure this is tested & remove - expectation is api call further
// down validates it.
if ($csType = CRM_Utils_Array::value('contact_sub_type', $params)) {
if (!(CRM_Contact_BAO_ContactType::isExtendsContactType($csType, $params['contact_type']))) {
throw new CRM_Core_Exception("Invalid or Mismatched Contact Subtype: " . implode(', ', (array) $csType));
}
}
}

if ($dupeCheck) {
// @todo switch to using api version
// $dupes = civicrm_api3('Contact', 'duplicatecheck', (array('match' => $params, 'dedupe_rule_id' => $dedupeRuleGroupID)));
Expand Down Expand Up @@ -2704,7 +2673,7 @@ public function getMappedFieldLabel(array $mappedField): string {
if ($mappedField['relationship_type_id']) {
$title[] = $this->getRelationshipLabel($mappedField['relationship_type_id'], $mappedField['relationship_direction']);
}
$title[] = $this->getImportableFieldsMetadata()[$mappedField['name']]['title'];
$title[] = $this->getFieldMetadata($mappedField['name'])['title'];
if ($mappedField['location_type_id']) {
$title[] = CRM_Core_PseudoConstant::getLabel('CRM_Core_BAO_Address', 'location_type_id', $mappedField['location_type_id']);
}
Expand Down Expand Up @@ -2763,6 +2732,9 @@ protected function getRelationshipLabel(int $id, string $direction): string {
public function getMappedRow(array $values): array {
$params = $this->getParams($values);
$params['contact_type'] = $this->getContactType();
if ($this->getContactSubType()) {
$params['contact_sub_type'] = $this->getContactSubType();
}
return $params;
}

Expand Down Expand Up @@ -2802,16 +2774,8 @@ public function validateValues(array $values): void {
//date-format part ends

$errorMessage = NULL;

//CRM-5125
//add custom fields for contact sub type
$csType = NULL;
if (!empty($this->_contactSubType)) {
$csType = $this->_contactSubType;
}

//checking error in custom data
$this->isErrorInCustomData($params, $errorMessage, $csType);
$this->isErrorInCustomData($params, $errorMessage, $params['contact_sub_type'] ?? NULL);

//checking error in core data
$this->isErrorInCoreData($params, $errorMessage);
Expand Down
10 changes: 7 additions & 3 deletions CRM/Import/Parser.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ abstract class CRM_Import_Parser {
*/
const CONTACT_INDIVIDUAL = 1, CONTACT_HOUSEHOLD = 2, CONTACT_ORGANIZATION = 4;


/**
* User job id.
*
Expand Down Expand Up @@ -1221,12 +1220,17 @@ protected function getFieldOptions(string $fieldName) {
*
* @param string $fieldName
* @param bool $loadOptions
* @param bool $limitToContactType
* Only show fields for the type to import (not appropriate when looking up
* related contact fields).
*
*
* @return array
* @throws \API_Exception
* @throws \Civi\API\Exception\NotImplementedException
*/
protected function getFieldMetadata(string $fieldName, bool $loadOptions = FALSE): array {
$fieldMetadata = $this->getImportableFieldsMetadata()[$fieldName];
protected function getFieldMetadata(string $fieldName, bool $loadOptions = FALSE, $limitToContactType = FALSE): array {
$fieldMetadata = $this->getImportableFieldsMetadata()[$fieldName] ?? ($limitToContactType ? NULL : CRM_Contact_BAO_Contact::importableFields('All')[$fieldName]);
if ($loadOptions && !isset($fieldMetadata['options'])) {
if (empty($fieldMetadata['pseudoconstant'])) {
$this->importableFieldsMetadata[$fieldName]['options'] = FALSE;
Expand Down
8 changes: 8 additions & 0 deletions tests/phpunit/CRM/Contact/Import/Form/data/individual_contact_sub_types.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
first_name,Last Name,Organization,Contact Subtype,Organization SubType,expected
Joe,Green,Greenfingers,baby,,Valid
Joe,Green,Greenfingers,Infant,,Valid
Joe,Green,Greenfingers,infant,,Valid
Joe,Green,Greenfingers,rando,,Invalid
Joe,Green,Greenfingers,,baby,Invalid
Joe,Green,Greenfingers,,Infant,Invalid
Joe,Green,Greenfingers,,infant,Invalid
64 changes: 45 additions & 19 deletions tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

use Civi\Api4\Address;
use Civi\Api4\Contact;
use Civi\Api4\ContactType;
use Civi\Api4\RelationshipType;
use Civi\Api4\UserJob;

Expand All @@ -41,6 +42,7 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase {
public function tearDown(): void {
$this->quickCleanup(['civicrm_address', 'civicrm_phone', 'civicrm_email', 'civicrm_user_job', 'civicrm_relationship'], TRUE);
RelationshipType::delete()->addWhere('name_a_b', '=', 'Dad to')->execute();
ContactType::delete()->addWhere('name', '=', 'baby')->execute();
parent::tearDown();
}

Expand Down Expand Up @@ -987,7 +989,7 @@ public function importDataProvider(): array {
'csv' => 'individual_invalid_contact_sub_type.csv',
'mapper' => [['first_name'], ['last_name'], ['contact_sub_type']],
'expected_error' => '',
'expected_outcomes' => [CRM_Import_Parser::NO_MATCH => 1],
'expected_outcomes' => [CRM_Import_Parser::ERROR => 1],
],
];
}
Expand All @@ -1011,22 +1013,8 @@ public function testImportGenders(): void {
['do_not_import'],
];
$csv = 'individual_genders.csv';
/* @var CRM_Import_DataSource_CSV $dataSource */
/* @var \CRM_Contact_Import_Parser_Contact $parser */
[$dataSource, $parser] = $this->getDataSourceAndParser($csv, $mapper, []);
while ($values = $dataSource->getRow()) {
try {
$parser->validateValues(array_values($values));
if ($values['expected'] !== 'Valid') {
$this->fail($values['gender'] . ' should not have been valid');
}
}
catch (CRM_Core_Exception $e) {
if ($values['expected'] !== 'Invalid') {
$this->fail($values['gender'] . ' should have been valid');
}
}
}
$field = 'gender';
$this->validateMultiRowCsv($csv, $mapper, $field);

$this->importCSV($csv, $mapper);
$contacts = Contact::get()
Expand Down Expand Up @@ -1063,15 +1051,53 @@ public function testValidateDateData(): void {
// Date types should be picked up from submitted values but still some clean up to do.
CRM_Core_Session::singleton()->set('dateTypes', $dateType);
$this->validateMultiRowCsv($csv, $mapper, 'custom_' . $addressCustomFieldID, ['dateFormats' => $dateType]);
$fields = ['contact_id.birth_date', 'contact_id.deceased_date', 'contact_id.custom_' . $contactCustomFieldID, $addressCustomFieldID];
$contacts = Address::get()->addWhere('contact_id.first_name', '=', 'Joe')->setSelect($fields)->execute();
$fields = [
'contact_id.birth_date',
'contact_id.deceased_date',
'contact_id.custom_' . $contactCustomFieldID,
$addressCustomFieldID
];
$contacts = Address::get()
->addWhere('contact_id.first_name', '=', 'Joe')
->setSelect($fields)
->execute();
foreach ($contacts as $contact) {
foreach ($fields as $field) {
$this->assertEquals('2008-09-01', $contact[$field]);
}
}
}

/**
* @throws \API_Exception
*/
public function testImportContactSubTypes(): void {
ContactType::create()->setValues([
'name' => 'baby',
'label' => 'Infant',
'parent_id:name' => 'Individual',
])->execute();
$mapper = [
['first_name'],
['last_name'],
['5_a_b', 'organization_name'],
['contact_sub_type'],
['5_a_b', 'contact_sub_type'],
];
$csv = 'individual_contact_sub_types.csv';
$field = 'contact_sub_type';

$this->validateMultiRowCsv($csv, $mapper, $field);
$this->importCSV($csv, $mapper);
$contacts = Contact::get()
->addWhere('last_name', '=', 'Green')
->addSelect('contact_sub_type:name')->execute();
foreach ($contacts as $contact) {
$this->assertEquals(['baby'], $contact['contact_sub_type:name']);
}
$this->assertCount(3, $contacts);
}

/**
* Test that setting duplicate action to fill doesn't blow away data
* that exists, but does fill in where it's empty.
Expand Down

0 comments on commit 1c5a23d

Please sign in to comment.