Error202
/
yii2-save-relations-behavior
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Refactoring

tags/1.5.0
Alban Jubert 7 years ago
parent
279fdf0cdd
commit
aef5f41a2e
1 changed files with 55 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 125
      src/SaveRelationsBehavior.php

125
src/SaveRelationsBehavior.php
Unescape View File

@ -337,7 +337,7 @@ class SaveRelationsBehavior extends Behavior
*/ */
protected function saveModelRecord(BaseActiveRecord $model, ModelEvent $event, $pettyRelationName, $relationName) protected function saveModelRecord(BaseActiveRecord $model, ModelEvent $event, $pettyRelationName, $relationName)
{ {
$this->validateRelationModel($pettyRelationName, $relationName, $model, $event); $this->validateRelationModel($pettyRelationName, $relationName, $model);
if ($event->isValid && (count($model->dirtyAttributes) || $model->isNewRecord)) { if ($event->isValid && (count($model->dirtyAttributes) || $model->isNewRecord)) {
Yii::debug("Saving {$pettyRelationName} relation model", __METHOD__); Yii::debug("Saving {$pettyRelationName} relation model", __METHOD__);
$model->save(false); $model->save(false);
@ -523,65 +523,63 @@ class SaveRelationsBehavior extends Behavior
$owner = $this->owner; $owner = $this->owner;
$relation = $owner->getRelation($relationName); $relation = $owner->getRelation($relationName);
if ($this->_hasActiveRelationTrait($relation)) { // Process new relations
// Process new relations $existingRecords = [];
$existingRecords = []; /** @var ActiveQuery $relationModel */
/** @var ActiveQuery $relationModel */ foreach ($owner->{$relationName} as $i => $relationModel) {
foreach ($owner->{$relationName} as $i => $relationModel) { if ($relationModel->isNewRecord) {
if ($relationModel->isNewRecord) { if ($relation->via !== null) {
if ($relation->via !== null) {
if ($relationModel->validate()) {
$relationModel->save();
} else {
$pettyRelationName = Inflector::camel2words($relationName, true) . " #{$i}";
$this->_addError($relationModel, $owner, $relationName, $pettyRelationName);
throw new DbException("Related record {$pettyRelationName} could not be saved.");
}
}
$junctionTableColumns = $this->_getJunctionTableColumns($relationName, $relationModel);
$owner->link($relationName, $relationModel, $junctionTableColumns);
} else {
$existingRecords[] = $relationModel;
}
if (count($relationModel->dirtyAttributes)) {
if ($relationModel->validate()) { if ($relationModel->validate()) {
$relationModel->save(); $relationModel->save();
} else { } else {
$pettyRelationName = Inflector::camel2words($relationName, true); $pettyRelationName = Inflector::camel2words($relationName, true) . " #{$i}";
$this->_addError($relationModel, $owner, $relationName, $pettyRelationName); $this->_addError($relationModel, $owner, $relationName, $pettyRelationName);
throw new DbException("Related record {$pettyRelationName} could not be saved."); throw new DbException("Related record {$pettyRelationName} could not be saved.");
} }
} }
$junctionTableColumns = $this->_getJunctionTableColumns($relationName, $relationModel);
$owner->link($relationName, $relationModel, $junctionTableColumns);
} else {
$existingRecords[] = $relationModel;
}
if (count($relationModel->dirtyAttributes)) {
if ($relationModel->validate()) {
$relationModel->save();
} else {
$pettyRelationName = Inflector::camel2words($relationName, true);
$this->_addError($relationModel, $owner, $relationName, $pettyRelationName);
throw new DbException("Related record {$pettyRelationName} could not be saved.");
}
} }
$junctionTablePropertiesUsed = array_key_exists($relationName, $this->_relationsExtraColumns); }
$junctionTablePropertiesUsed = array_key_exists($relationName, $this->_relationsExtraColumns);
// Process existing added and deleted relations // Process existing added and deleted relations
list($addedPks, $deletedPks) = $this->_computePkDiff( list($addedPks, $deletedPks) = $this->_computePkDiff(
$this->_oldRelationValue[$relationName], $this->_oldRelationValue[$relationName],
$existingRecords, $existingRecords,
$junctionTablePropertiesUsed $junctionTablePropertiesUsed
); );
// Deleted relations // Deleted relations
$initialModels = ArrayHelper::index($this->_oldRelationValue[$relationName], function (BaseActiveRecord $model) { $initialModels = ArrayHelper::index($this->_oldRelationValue[$relationName], function (BaseActiveRecord $model) {
return implode('-', $model->getPrimaryKey(true)); return implode('-', $model->getPrimaryKey(true));
}); });
$initialRelations = $owner->{$relationName}; $initialRelations = $owner->{$relationName};
foreach ($deletedPks as $key) { foreach ($deletedPks as $key) {
$owner->unlink($relationName, $initialModels[$key], true); $owner->unlink($relationName, $initialModels[$key], true);
} }
// Added relations // Added relations
$actualModels = ArrayHelper::index( $actualModels = ArrayHelper::index(
$junctionTablePropertiesUsed ? $initialRelations : $owner->{$relationName}, $junctionTablePropertiesUsed ? $initialRelations : $owner->{$relationName},
function (BaseActiveRecord $model) { function (BaseActiveRecord $model) {
return implode('-', $model->getPrimaryKey(true)); return implode('-', $model->getPrimaryKey(true));
}
);
foreach ($addedPks as $key) {
$junctionTableColumns = $this->_getJunctionTableColumns($relationName, $actualModels[$key]);
$owner->link($relationName, $actualModels[$key], $junctionTableColumns);
} }
);
foreach ($addedPks as $key) {
$junctionTableColumns = $this->_getJunctionTableColumns($relationName, $actualModels[$key]);
$owner->link($relationName, $actualModels[$key], $junctionTableColumns);
} }
} }
@ -591,31 +589,18 @@ class SaveRelationsBehavior extends Behavior
private function _afterSaveHasOneRelation($relationName) private function _afterSaveHasOneRelation($relationName)
{ {
$owner = $this->owner; $owner = $this->owner;
$relation = $owner->getRelation($relationName);
if ($this->_hasActiveRelationTrait($relation)) { if ($this->_oldRelationValue[$relationName] !== $owner->{$relationName}) {
if ($this->_oldRelationValue[$relationName] !== $owner->{$relationName}) {
if ($owner->{$relationName} instanceof BaseActiveRecord) {
$owner->link($relationName, $owner->{$relationName});
} else {
if ($this->_oldRelationValue[$relationName] instanceof BaseActiveRecord) {
$owner->unlink($relationName, $this->_oldRelationValue[$relationName]);
}
}
}
if ($owner->{$relationName} instanceof BaseActiveRecord) { if ($owner->{$relationName} instanceof BaseActiveRecord) {
$owner->{$relationName}->save(); $owner->link($relationName, $owner->{$relationName});
} else {
if ($this->_oldRelationValue[$relationName] instanceof BaseActiveRecord) {
$owner->unlink($relationName, $this->_oldRelationValue[$relationName]);
}
} }
} }
} if ($owner->{$relationName} instanceof BaseActiveRecord) {
$owner->{$relationName}->save();
/** }
* @param ActiveQuery $relation
* @return bool
*/
private function _hasActiveRelationTrait(ActiveQuery $relation)
{
$relationTraits = class_uses($relation);
return in_array('yii\db\ActiveRelationTrait', $relationTraits);
} }
} }

Write Preview
Loading…
Cancel
Save