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

Merge branch 'develop'

debug-branch
iglocska 2023-02-21 13:50:58 +01:00
parent bf3f657603 ce42bd7726
commit 648291b30e
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
3 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Command/FastUserEnrolmentCommand.php
View File

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

34
src/Controller/Component/CRUDComponent.php
View File

@ -73,7 +73,11 @@ class CRUDComponent extends Component
$query->select($options['fields']);
}
if (!empty($options['order'])) {
$orderFields = array_keys($options['order']);
if ($this->_validOrderFields($orderFields)) {
$query->order($options['order']);
$this->Controller->paginate['order'] = $options['order'];
}
}
if ($this->Controller->ParamHandler->isRest()) {
if ($this->metaFieldsSupported()) {
@ -1581,4 +1585,34 @@ class CRUDComponent extends Component
}
return $typeMap;
}
protected function _validOrderFields($fields): bool
{
if (!is_array($fields)) {
$fields = [$fields];
}
foreach ($fields as $field) {
$exploded = explode('.', $field);
if (count($exploded) > 1) {
$model = $exploded[0];
$subField = $exploded[1];
if ($model == $this->Table->getAlias()) {
if (empty($this->Table->getSchema()->typeMap()[$subField])) {
return false;
}
} else {
$association = $this->Table->associations()->get($model);
$associatedTable = $association->getTarget();
if (empty($associatedTable->getSchema()->typeMap()[$subField])) {
return false;
}
}
} else {
if (empty($this->Table->getSchema()->typeMap()[$field])) {
return false;
}
}
}
return true;
}
}

2
src/VERSION.json
View File

@ -1,4 +1,4 @@
{
"version": "1.11",
"version": "1.12",
"application": "Cerebrate"
}