@@ -58,21 +58,21 @@ discard block |
||
| 58 | 58 | if (count($pks) == 1) { |
| 59 | 59 | $pks = array_keys($pks); |
| 60 | 60 | return [ |
| 61 | - $tableMap::TABLE_NAME . '.' . $pks[0] => Api::API_MODEL_KEY_FIELD |
|
| 61 | + $tableMap::TABLE_NAME.'.'.$pks[0] => Api::API_MODEL_KEY_FIELD |
|
| 62 | 62 | ]; |
| 63 | 63 | } elseif (count($pks) > 1) { |
| 64 | 64 | $apiPks = []; |
| 65 | 65 | $principal = ''; |
| 66 | 66 | $sep = 'CONCAT('; |
| 67 | 67 | foreach ($pks as $pk) { |
| 68 | - $apiPks[$tableMap::TABLE_NAME . '.' . $pk->getName()] = $pk->getPhpName(); |
|
| 69 | - $principal .= $sep . $tableMap::TABLE_NAME . '.' . $pk->getName(); |
|
| 70 | - $sep = ', "' . Api::API_PK_SEPARATOR . '", '; |
|
| 68 | + $apiPks[$tableMap::TABLE_NAME.'.'.$pk->getName()] = $pk->getPhpName(); |
|
| 69 | + $principal .= $sep.$tableMap::TABLE_NAME.'.'.$pk->getName(); |
|
| 70 | + $sep = ', "'.Api::API_PK_SEPARATOR.'", '; |
|
| 71 | 71 | } |
| 72 | 72 | $principal .= ')'; |
| 73 | 73 | $apiPks[$principal] = Api::API_MODEL_KEY_FIELD; |
| 74 | 74 | return $apiPks; |
| 75 | - } else { |
|
| 75 | + }else { |
|
| 76 | 76 | throw new ApiException(_('El modelo de la API no está debidamente mapeado, no hay Primary Key o es compuesta')); |
| 77 | 77 | } |
| 78 | 78 | } |
@@ -95,10 +95,10 @@ discard block |
||
| 95 | 95 | $pks = ''; |
| 96 | 96 | $sep = ''; |
| 97 | 97 | foreach ($tableMap->getPrimaryKeys() as $pk) { |
| 98 | - $pks .= $sep . $pk->getFullyQualifiedName(); |
|
| 98 | + $pks .= $sep.$pk->getFullyQualifiedName(); |
|
| 99 | 99 | $sep = ', "|", '; |
| 100 | 100 | } |
| 101 | - $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = Api::API_LIST_NAME_FIELD; |
|
| 101 | + $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = Api::API_LIST_NAME_FIELD; |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | /** |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | } |
| 121 | 121 | if (null !== $column) { |
| 122 | 122 | $this->extraColumns[$column->getFullyQualifiedName()] = Api::API_LIST_NAME_FIELD; |
| 123 | - } else { |
|
| 123 | + }else { |
|
| 124 | 124 | $this->addClassListName($tableMap); |
| 125 | 125 | } |
| 126 | 126 | } |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | * @param ModelCriteria $query |
| 133 | 133 | * @param string $action |
| 134 | 134 | */ |
| 135 | - private function addExtraColumns(ModelCriteria &$query, $action) |
|
| 135 | + private function addExtraColumns(ModelCriteria & $query, $action) |
|
| 136 | 136 | { |
| 137 | 137 | if (Api::API_ACTION_LIST === $action) { |
| 138 | 138 | $this->addDefaultListField(); |
@@ -160,21 +160,21 @@ discard block |
||
| 160 | 160 | /** |
| 161 | 161 | * @param ModelCriteria $query |
| 162 | 162 | */ |
| 163 | - protected function checkI18n(ModelCriteria &$query) |
|
| 163 | + protected function checkI18n(ModelCriteria & $query) |
|
| 164 | 164 | { |
| 165 | 165 | $model = $this->getModelNamespace(); |
| 166 | - $modelI18n = $model . 'I18n'; |
|
| 166 | + $modelI18n = $model.'I18n'; |
|
| 167 | 167 | if (method_exists($query, 'useI18nQuery')) { |
| 168 | 168 | $default_language = explode('_', Config::getParam('default.language', 'es_ES')); |
| 169 | 169 | $query->useI18nQuery(Request::header('X-API-LANG', $default_language[0])); |
| 170 | - $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n) . 'TableMap'; |
|
| 170 | + $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n).'TableMap'; |
|
| 171 | 171 | /** @var TableMap $modelI18nTableMap */ |
| 172 | 172 | $modelI18nTableMap = $modelI18nTableMapClass::getTableMap(); |
| 173 | - foreach($modelI18nTableMap->getColumns() as $columnMap) { |
|
| 174 | - if(!$columnMap->isPrimaryKey()) { |
|
| 175 | - $query->withColumn($modelI18nTableMapClass::TABLE_NAME . '.' . $columnMap->getName(), $columnMap->getPhpName()); |
|
| 176 | - } elseif(!$columnMap->isForeignKey()) { |
|
| 177 | - $query->withColumn('IFNULL(' . $modelI18nTableMapClass::TABLE_NAME . '.' . $columnMap->getName() . ', "'.Request::header('X-API-LANG', 'es').'")', $columnMap->getPhpName()); |
|
| 173 | + foreach ($modelI18nTableMap->getColumns() as $columnMap) { |
|
| 174 | + if (!$columnMap->isPrimaryKey()) { |
|
| 175 | + $query->withColumn($modelI18nTableMapClass::TABLE_NAME.'.'.$columnMap->getName(), $columnMap->getPhpName()); |
|
| 176 | + } elseif (!$columnMap->isForeignKey()) { |
|
| 177 | + $query->withColumn('IFNULL('.$modelI18nTableMapClass::TABLE_NAME.'.'.$columnMap->getName().', "'.Request::header('X-API-LANG', 'es').'")', $columnMap->getPhpName()); |
|
| 178 | 178 | } |
| 179 | 179 | } |
| 180 | 180 | } |
@@ -184,23 +184,23 @@ discard block |
||
| 184 | 184 | * @param ActiveRecordInterface $model |
| 185 | 185 | * @param array $data |
| 186 | 186 | */ |
| 187 | - protected function hydrateModelFromRequest(ActiveRecordInterface &$model, array $data = []) { |
|
| 187 | + protected function hydrateModelFromRequest(ActiveRecordInterface & $model, array $data = []) { |
|
| 188 | 188 | $model->fromArray($data); |
| 189 | 189 | $tableMap = $this->getTableMap(); |
| 190 | 190 | try { |
| 191 | - $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n'); |
|
| 192 | - if(null !== $relateI18n) { |
|
| 191 | + $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n'); |
|
| 192 | + if (null !== $relateI18n) { |
|
| 193 | 193 | $i18NTableMap = $relateI18n->getLocalTable(); |
| 194 | - foreach($i18NTableMap->getColumns() as $columnMap) { |
|
| 195 | - $method = 'set' . $columnMap->getPhpName(); |
|
| 196 | - if(!($columnMap->isPrimaryKey() && $columnMap->isForeignKey()) |
|
| 194 | + foreach ($i18NTableMap->getColumns() as $columnMap) { |
|
| 195 | + $method = 'set'.$columnMap->getPhpName(); |
|
| 196 | + if (!($columnMap->isPrimaryKey() && $columnMap->isForeignKey()) |
|
| 197 | 197 | &&array_key_exists($columnMap->getPhpName(), $data) |
| 198 | 198 | && method_exists($model, $method)) { |
| 199 | 199 | $model->$method($data[$columnMap->getPhpName()]); |
| 200 | 200 | } |
| 201 | 201 | } |
| 202 | 202 | } |
| 203 | - } catch(\Exception $e) { |
|
| 203 | + }catch (\Exception $e) { |
|
| 204 | 204 | Logger::log($e->getMessage(), LOG_WARNING); |
| 205 | 205 | } |
| 206 | 206 | } |