cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: [command:fastEnrolment] Coorrectly display missing organisation instead of throwing an error

refacto/CRUDComponent
Sami Mokaddem 2023-01-19 10:27:23 +01:00 committed by Sami Mokaddem
parent ee6913d7f0
commit 5caf1659cf
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Command/FastUserEnrolmentCommand.php
View File

@ -199,20 +199,22 @@ class FastUserEnrolmentCommand extends Command
$this->loadModel('Organisations'); $this->loadModel('Organisations');
$updatedData = []; $updatedData = [];
foreach ($data as $entry) { foreach ($data as $entry) {
$new = [ $individual = $this->getIndividualByEmail($entry[$this->individual_email_column]);
'individual_id' => $this->getIndividualByEmail($entry[$this->individual_email_column]), $organisation = $this->getOrganisationsByName($entry[$this->organisation_name_column]);
'organisation_id' => $this->getOrganisationsByName($entry[$this->organisation_name_column]), if (empty($individual)) {
'type' => $this->alignment_type,
'individual_email' => $entry[$this->individual_email_column],
];
if (empty($new['organisation_id'])) {
$this->io->error("Error while parsing source data. Could not find organisation with name: " . $entry[$this->organisation_name_column]); $this->io->error("Error while parsing source data. Could not find organisation with name: " . $entry[$this->organisation_name_column]);
die(1); die(1);
} }
if (empty($new['individual_id'])) { if (empty($organisation)) {
$this->io->error("Error while parsing source data. Could not find individuals with email: " . $entry[$this->individual_email_column]); $this->io->error("Error while parsing source data. Could not find individuals with email: " . $entry[$this->individual_email_column]);
die(1); die(1);
} }
$new = [
'individual_id' => $individual->id,
'organisation_id' => $organisation->id,
'type' => $this->alignment_type,
'individual_email' => $entry[$this->individual_email_column],
];
$new['individual_id'] = $new['individual_id']['id']; $new['individual_id'] = $new['individual_id']['id'];
$new['organisation_id'] = $new['organisation_id']['id']; $new['organisation_id'] = $new['organisation_id']['id'];
$updatedData[] = $new; $updatedData[] = $new;
@ -224,14 +226,14 @@ class FastUserEnrolmentCommand extends Command
{ {
return $this->Individuals->find()->where([ return $this->Individuals->find()->where([
'email' => $email, 'email' => $email,
])->first()->toArray(); ])->first();
} }
private function getOrganisationsByName($name) private function getOrganisationsByName($name)
{ {
return $this->Organisations->find()->where([ return $this->Organisations->find()->where([
'name' => $name, 'name' => $name,
])->first()->toArray(); ])->first();
} }
private function getDataFromFile($path) private function getDataFromFile($path)