Improve json import database model

starker-xp · Oct 31, 2018 · e9a2c91 · e9a2c91
1 parent 5d479db
commit e9a2c91
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 19 deletions.
diff --git a/src/Exception/JsonInvalidFormatException.php b/src/Exception/JsonInvalidFormatException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Starkerxp\DatabaseChecker\Exception;
+
+
+class JsonInvalidFormatException extends \Exception
+{
+
+}
diff --git a/src/Factory/JsonDatabaseFactory.php b/src/Factory/JsonDatabaseFactory.php
@@ -2,6 +2,7 @@
 
 namespace Starkerxp\DatabaseChecker\Factory;
 
+use Starkerxp\DatabaseChecker\Exception\JsonInvalidFormatException;
 use Starkerxp\DatabaseChecker\Exception\TablenameHasNotDefinedException;
 use Starkerxp\DatabaseChecker\LoggerTrait;
 use Starkerxp\DatabaseChecker\Structure\MysqlDatabase;
@@ -42,12 +43,11 @@ public function __construct($json)
     public function generate($databaseName): MysqlDatabase
     {
         $tables = [];
+        $mysqlDatabase = new MysqlDatabase($databaseName);
         try {
             $dataTables = $this->resolve();
         } catch (\Exception $e) {
-            $this->error('An unexpected error are throw when you check json syntax');
-
-            return [];
+            throw new JsonInvalidFormatException('An unexpected error are throw when you check json syntax');
         }
         foreach ($dataTables as $tableName => $dataTable) {
             try {
@@ -58,30 +58,30 @@ public function generate($databaseName): MysqlDatabase
             if (isset($dataTable['collate'])) {
                 $table->setCollate($dataTable['collate']);
             }
-            foreach ((array)$dataTable['columns'] as $columnName => $row) {
+            foreach ((array) $dataTable['columns'] as $columnName => $row) {
                 $column = new MysqlDatabaseColumn($columnName, $row['type'], $row['length'], $row['nullable'], $row['defaultValue'], $row['extra']);
                 if (isset($row['collate']) || $table->getCollate()) {
                     $column->setCollate($row['collate']);
                 }
                 $table->addColumn($column);
 
             }
-            foreach ((array)$dataTable['indexes'] as $row) {
+            foreach ((array) $dataTable['indexes'] as $row) {
                 $table->addIndex($row['columns'], $row['name']);
             }
             if (isset($dataTable['primary'])) {
-                $table->addPrimary((array)$dataTable['primary']);
+                $table->addPrimary((array) $dataTable['primary']);
             }
-            foreach ((array)$dataTable['uniques'] as $row) {
+            foreach ((array) $dataTable['uniques'] as $row) {
                 $table->addUnique($row['columns'], $row['name']);
             }
             $tables[] = $table;
         }
 
-        $mysqlDatabase = new MysqlDatabase($databaseName);
-        foreach($tables as $table){
+        foreach ($tables as $table) {
             $mysqlDatabase->addTable($table);
         }
+
         return $mysqlDatabase;
     }
 
@@ -136,17 +136,14 @@ protected function resolve(): array
         );
         $export = [];
         $data = $data['tables'];
-        if(empty($data['tables'])){
-            return [];
-        }
 
         foreach ($data as $nomTable => $table) {
             $dataTable = $resolverTable->resolve($table);
-            foreach ((array)$dataTable['columns'] as $columnName => $column) {
+            foreach ((array) $dataTable['columns'] as $columnName => $column) {
                 $dataTable['columns'][$columnName] = $resolverColumns->resolve($column);
             }
             foreach (['indexes', 'uniques'] as $indexKey) {
-                foreach ((array)$dataTable[$indexKey] as $keyIndex => $index) {
+                foreach ((array) $dataTable[$indexKey] as $keyIndex => $index) {
                     $dataTable[$indexKey][$keyIndex] = $resolverIndex->resolve($index);
                 }
             }

diff --git a/tests/Factory/JsonDatabaseFactoryTest.php b/tests/Factory/JsonDatabaseFactoryTest.php
@@ -4,6 +4,7 @@
 
 
 use PHPUnit\Framework\TestCase;
+use Starkerxp\DatabaseChecker\Exception\JsonInvalidFormatException;
 use Starkerxp\DatabaseChecker\Factory\JsonDatabaseFactory;
 use Starkerxp\DatabaseChecker\Structure\MysqlDatabaseColumn;
 use Starkerxp\DatabaseChecker\Structure\MysqlDatabaseTable;
@@ -79,15 +80,23 @@ public function testGenerateEmptyTablenameSinceJsonException(): void
      * @group factory
      * @group exception
      */
-    public function testGenerateInvalidJsonException(): void
+    public function testGenerateNullJsonException(): void
     {
         $factoryJsonDatabase = new JsonDatabaseFactory(null);
-        $tableOut = $factoryJsonDatabase->generate('myTestDatabase');
-        $this->assertEquals([], $tableOut);
+        $this->expectException(JsonInvalidFormatException::class);
+        $factoryJsonDatabase->generate('myTestDatabase');
+    }
 
+    /**
+     * @group factory
+     * @group exception
+     */
+    public function testGenerateInvalidJsonException(): void
+    {
         $factoryJsonDatabase = new JsonDatabaseFactory('"');
-        $tableOut = $factoryJsonDatabase->generate('myTestDatabase');
-        $this->assertEquals([], $tableOut);
+        $this->expectException(JsonInvalidFormatException::class);
+        $factoryJsonDatabase->generate('myTestDatabase');
+
     }
 
 }