From 49fec0e0abda01c9160eb298a2025b0ac1c66265 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Thu, 3 Sep 2020 17:27:16 +0200
Subject: [PATCH] FEAT #14458 TIME 2:25 import contacts custom fields
---
.../contact/controllers/ContactController.php | 88 ++++++++++++++-----
src/lang/lang-en.json | 6 +-
src/lang/lang-fr.json | 4 +-
3 files changed, 71 insertions(+), 27 deletions(-)
diff --git a/src/app/contact/controllers/ContactController.php b/src/app/contact/controllers/ContactController.php
index 075fa157f73..b1c7b1aba6c 100755
--- a/src/app/contact/controllers/ContactController.php
+++ b/src/app/contact/controllers/ContactController.php
@@ -1212,9 +1212,19 @@ class ContactController
return $response->withStatus(400)->withJson(['errors' => 'Body contacts is empty or not an array']);
}
+ $contactCustoms = ContactCustomFieldListModel::get(['select' => ['id', 'type']]);
+ $customTypes = array_column($contactCustoms, 'type', 'id');
+
+ $contactCustoms = array_column($contactCustoms, 'id');
+
+ foreach ($contactCustoms as $contactCustom) {
+ $contactCustoms['contactCustomField_' . $contactCustom] = (string)$contactCustom;
+ }
+
+
$contactFields = ContactController::MAPPING_FIELDS;
+ $contactFields = array_merge($contactFields, $contactCustoms, ['communicationMeans' => 'communication_means']);
- // TODO custom fields
$errors = [];
foreach ($body['contacts'] as $key => $contact) {
if (!empty($contact['email']) && (!filter_var($contact['email'], FILTER_VALIDATE_EMAIL) || !Validator::length(1, 255)->validate($contact['email']))) {
@@ -1225,64 +1235,94 @@ class ContactController
continue;
}
+ // Check format of fields
foreach ($contactFields as $frontField => $backField) {
- if (!empty($contact[$frontField]) && (!Validator::stringType()->validate($contact[$frontField]) || !Validator::length(1, 255)->validate($contact[$frontField]))) {
- $errors[] = ['error' => "Argument {$frontField} is not a string for contact {$key}", 'index' => $key, 'lang' => 'argumentLastnameNotString'];
- continue 2;
+ if (!empty($contact[$frontField])) {
+ if (strpos($frontField, 'contactCustomField_') !== false) {
+ $customId = explode('_', $frontField)[1];
+ // Check custom field format
+ $type = $customTypes[(string)$customId];
+ if (in_array($type, ['checkbox', 'select', 'radio']) && !Validator::arrayType()->validate($contact[$frontField])) {
+ $errors[] = ['error' => "Argument {$frontField} is not an array for contact {$key}", 'index' => $key, 'lang' => 'argumentNotAnArray']; // TODO lang
+ continue 2;
+ } elseif ($customTypes[$customId] == 'integer' && !Validator::intVal()->validate($contact[$frontField])) {
+ $errors[] = ['error' => "Argument {$frontField} is not an integer for contact {$key}", 'index' => $key, 'lang' => 'argumentNotAnInteger'];
+ continue 2;
+ } elseif ($customTypes[$customId] == 'date' && !Validator::date()->validate($contact[$frontField])) {
+ $errors[] = ['error' => "Argument {$frontField} is not a date for contact {$key}", 'index' => $key, 'lang' => 'argumentNotDate'];
+ continue 2;
+ } elseif ($customTypes[$customId] == 'string' && !Validator::stringType()->validate($contact[$frontField]) || !Validator::length(1, 255)->validate($contact[$frontField])) {
+ $errors[] = ['error' => "Argument {$frontField} is not a string for contact {$key}", 'index' => $key, 'lang' => 'argumentNotString'];
+ continue 2;
+ }
+ } else {
+ if (!Validator::stringType()->validate($contact[$frontField]) || !Validator::length(1, 255)->validate($contact[$frontField])) {
+ $errors[] = ['error' => "Argument {$frontField} is not a string for contact {$key}", 'index' => $key, 'lang' => 'argumentNotString'];
+ continue 2;
+ }
+ }
}
}
+ // Replace civility label by civility id
if (!empty($contact['civility'])) {
$civility = ContactModel::getCivilityId(['civilityLabel' => $contact['civility']]);
if (empty($civility)) {
- $errors[] = ['error' => "Argument civility is not a valid civility for contact {$key}", 'index' => $key, 'lang' => 'argumentPhoneNotCorrect']; // TODO lang
+ $errors[] = ['error' => "Argument civility is not a valid civility for contact {$key}", 'index' => $key, 'lang' => 'argumentCivilityNotCorrect'];
continue;
}
$contact['civility'] = $civility;
}
+ // If no id, then we create a new contact
if (empty($contact['id'])) {
if (empty($contact['lastname']) && empty($contact['company'])) {
- $errors[] = ['error' => "Argument lastname and company are empty for contact {$key}", 'index' => $key, 'lang' => 'argumentFirstnameEmpty'];
+ $errors[] = ['error' => "Argument lastname and company are empty for contact {$key}", 'index' => $key, 'lang' => 'argumentLastnameAndCompanyEmpty'];
continue;
}
$mandatoryParameters = ContactParameterModel::get(['select' => ['identifier'], 'where' => ['mandatory = ?', 'identifier not in (?)'], 'data' => [true, ['lastname', 'company']]]);
foreach ($mandatoryParameters as $mandatoryParameter) {
-// if (strpos($mandatoryParameter['identifier'], 'contactCustomField_') !== false) {
-// $customId = explode('_', $mandatoryParameter['identifier'])[1];
-// if (empty($body['customFields'][$customId])) {
-// $errors[] = ['error' => "Argument {$mandatoryParameter['identifier']} is empty for contact {$key}", 'index' => $key, 'lang' => 'argumentMailEmpty']; // TODO lang
-// continue;
-// }
-// } else {
if (empty($contact[$mandatoryParameter['identifier']])) {
$errors[] = ['error' => "Argument {$mandatoryParameter['identifier']} is empty for contact {$key}", 'index' => $key, 'lang' => 'argumentMailEmpty']; // TODO lang
- continue;
+ continue 2;
}
-// }
}
- $contactToCreate = ['creator' => $GLOBALS['id']];
+ $contactToCreate = ['creator' => $GLOBALS['id'], 'custom_fields' => []];
foreach ($contactFields as $frontField => $backField) {
if (isset($contact[$frontField])) {
- $contactToCreate[$backField] = $contact[$frontField];
+ if (strpos($frontField, 'contactCustomField_') !== false) {
+ $contactToCreate['custom_fields'][$backField] = $contact[$frontField];
+ } else {
+ $contactToCreate[$backField] = $contact[$frontField];
+ }
}
}
- if (isset($contact['customFields'])) {
- $contactToCreate['custom_fields'] = json_encode($contact['customFields']);
- }
+ $contactToCreate['custom_fields'] = json_encode($contactToCreate['custom_fields']);
ContactModel::create($contactToCreate);
} else {
- $set = ['modification_date' => 'CURRENT_TIMESTAMP'];
+ // If id, then we update the contact
+ $set = ['modification_date' => 'CURRENT_TIMESTAMP', 'custom_fields' => []];
foreach ($contactFields as $frontField => $backField) {
if (isset($contact[$frontField])) {
- $set[$backField] = $contact[$frontField];
+ if (strpos($frontField, 'contactCustomField_') !== false) {
+ $set['custom_fields'][$backField] = $contact[$frontField];
+ } else {
+ $set[$backField] = $contact[$frontField];
+ }
}
}
- if (isset($contact['customFields'])) {
- $set['custom_fields'] = json_encode($contact['customFields']);
+
+ if (empty($set['custom_fields'])) {
+ unset($set['custom_fields']);
+ } else {
+ $oldContact = ContactModel::getById(['id' => $contact['id'], 'select' => ['custom_fields']]);
+ if (!empty($oldContact['custom_fields'])) {
+ $set['custom_fields'] = $set['custom_fields'] + json_decode($oldContact['custom_fields'], true);
+ }
+ $set['custom_fields'] = json_encode($set['custom_fields']);
}
if (!empty($set)) {
diff --git a/src/lang/lang-en.json b/src/lang/lang-en.json
index 17e40b0eb27..49a956ebe04 100644
--- a/src/lang/lang-en.json
+++ b/src/lang/lang-en.json
@@ -1978,5 +1978,7 @@
"registeredMail_SPD": "Inactive",
"requiredForRegisteredMail": "Fields required to generate registered mails.",
"registeredMailNumberRangeCreation": "Registered mail number range creation",
- "registeredMailNumberRangeModification": "Registered mail number range modification"
-}
\ No newline at end of file
+ "registeredMailNumberRangeModification": "Registered mail number range modification",
+ "argumentCivilityNotCorrect": "Argument Civility is not a valid civility for a contact",
+ "argumentLastnameAndCompanyEmpty": "Arguments lastname and company are empty for a contact"
+}
diff --git a/src/lang/lang-fr.json b/src/lang/lang-fr.json
index fb19fc4a0a6..13415827b02 100644
--- a/src/lang/lang-fr.json
+++ b/src/lang/lang-fr.json
@@ -1976,5 +1976,7 @@
"arAlreadyReceived": "Cet AR a déjà été reçu",
"contactsOfFile": "Contact du fichier",
"infoImportcontacts": "La colonne <b>id</b> est utilisée pour identifier un contact",
- "importContacts": "Importer des contacts"
+ "importContacts": "Importer des contacts",
+ "argumentCivilityNotCorrect": "La donnée civility n'est pas une civilité valide pour un contact",
+ "argumentLastnameAndCompanyEmpty": "Les données lastname et company sont vides pour un contact"
}
--
GitLab