Merge pull request #76 from jeyroik/v6

added setParamValue method
jeyroik · Jul 16, 2023 · 1c3c280 · 1c3c280
2 parents d055711 + 1b5dd3e
commit 1c3c280
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 6.22.0
+
+- Added method `IHaveParams::setParamValue(string $paramName, mixed $value): static`.
+
 # 6.21.3
 
 - Added output for already existing records on `updateAndThrowIfExist(...)`.

diff --git a/src/components/installers/InstallerEntities.php b/src/components/installers/InstallerEntities.php
@@ -4,12 +4,16 @@
 use extas\components\exceptions\AlreadyExist;
 use extas\components\Plugins;
 use extas\components\SystemContainer;
+use extas\components\THasOutput;
+use extas\interfaces\IHaveOutput;
 use extas\interfaces\repositories\IRepository;
 use extas\interfaces\stages\IStageBeforeInstallEntity;
 use extas\interfaces\stages\IStageIsToInstallEntity;
 
-class InstallerEntities
+class InstallerEntities implements IHaveOutput
 {
+    use THasOutput;
+
     protected const FIELD__NAME = 'name';
 
     protected array $app = [];
@@ -84,5 +88,7 @@ protected function installTable(string $tableName, array $entities): void
                 continue;
             }
         }
+
+        $this->appendOutput($repo->getOutput(), $tableName . '_repo');
     }
 }
diff --git a/src/components/parameters/THasParams.php b/src/components/parameters/THasParams.php
@@ -1,6 +1,7 @@
 <?php
 namespace extas\components\parameters;
 
+use extas\components\exceptions\MissedOrUnknown;
 use extas\interfaces\parameters\IHaveParams;
 use extas\interfaces\parameters\IParam;
 use extas\interfaces\parameters\IParams;
@@ -39,4 +40,17 @@ public function getParamsValues(): array
     {
         return array_column($this->getParams(), IParam::FIELD__VALUE, IParam::FIELD__NAME);
     }
+
+    public function setParamValue(string $paramName, mixed $value): static
+    {
+        $params = $this->buildParams();
+
+        if (!$params->hasOne($paramName)) {
+            throw new MissedOrUnknown('parameter "' . $paramName . '"');
+        }
+
+        $this->config[IHaveParams::FIELD__PARAMS][$paramName][IParam::FIELD__VALUE] = $value;
+
+        return $this;
+    }
 }
diff --git a/src/components/repositories/RepoItem.php b/src/components/repositories/RepoItem.php
@@ -52,22 +52,13 @@ public static function updateAndThrowIfExist(IRepository $repo, IHaveConfig &$it
         $exists = $repo->one($where);
 
         if ($exists) {
-            $changed = false;
-            $repo->appendOutput(['Record already exists:' . print_r($exists->__toArray(), true)], 'repo-item');
             foreach ($item as $field => $value) {
-                if ($exists[$field] == $value) {
-                    continue;
-                }
-
-                $repo->appendOutput(['replace "' . $field . '" with ' . print_r($value, true)], 'repo-item');
                 $exists[$field] = $value;
-                $changed = true;
-            }
-            if ($changed) {
-                $repo->update($exists);
-                $repo->appendOutput(['Update existing record, new state is ' . print_r($exists->__toArray(), true)], 'repo-item');
             }
 
+            $repo->update($exists);
+            $repo->appendOutput(['Updated existing record, new state is ' . print_r($exists->__toArray(), true)], 'repo-item');
+
             throw new AlreadyExist($repo->getName());
         }
     }

diff --git a/src/interfaces/parameters/IHaveParams.php b/src/interfaces/parameters/IHaveParams.php
@@ -10,4 +10,5 @@ public function setParams(array $params): static;
     public function addParam(IParam $param): static;
     public function buildParams(): IParams;
     public function getParamsValues(): array;
+    public function setParamValue(string $paramName, mixed $value): static;
 }
diff --git a/tests/parameters/ParamsTest.php b/tests/parameters/ParamsTest.php
@@ -39,7 +39,7 @@ public function testParams()
                 IParametred::FIELD__NAME => 'p1',
                 IParametred::FIELD__PARAMS => [
                     'par1' => [
-                        'name' => 'par1'
+                        IParam::FIELD__NAME => 'par1'
                     ]
                 ]
             ]
@@ -105,5 +105,8 @@ protected function getSubjectForExtension(): string
         ]);
 
         $this->assertCount(1, $withParams->getParams());
+
+        $withParams->setParamValue('test3', 'new_test_value_3');
+        $this->assertEquals('new_test_value_3', $withParams->buildParams()->buildOne('test3')->getValue());
     }
 }
diff --git a/tests/toolkit/RepoItemTest.php b/tests/toolkit/RepoItemTest.php
@@ -79,7 +79,11 @@ public function testUpdateAndThrowIfExist(): void
         $obj = new class ([
             'id' => 1,
             'test' => 1,
-            'other' => 1
+            'other' => [
+                'sub' => [
+                    'value' => 1
+                ]
+            ]
         ]) extends Item{
             protected function getSubjectForExtension(): string
             {
@@ -90,15 +94,32 @@ protected function getSubjectForExtension(): string
         $repo = $obj->tests();
         $repo->create($obj);
 
-        $obj['other'] = 2;
+        $obj2 = new class ([
+            'test' => 1,
+            'other' => [
+                'sub' => [
+                    'value' => 2
+                ]
+            ]
+        ]) extends Item{
+            protected function getSubjectForExtension(): string
+            {
+                return '';
+            }
+        };
+
+        $catched = false;
 
         try {
-            RepoItem::updateAndThrowIfExist($repo, $obj, ['test']);
+            RepoItem::updateAndThrowIfExist($repo, $obj2, ['test']);
         } catch(AlreadyExist $e) {
             $this->assertEquals('Tests already exists', $e->getMessage());
             $objFromDb = $repo->one(['test' => 1]);
-            $this->assertEquals(2, $objFromDb['other']);
+            $this->assertEquals(2, $objFromDb['other']['sub']['value']);
+            $this->assertEquals(['repo-item: Updated existing record, new state is '.print_r($objFromDb->__toArray(), true)], $repo->getOutput());
+            $catched = true;
         }
+        $this->assertTrue($catched);
         $this->deleteRepo('tests');
     }