FEAT #11275 TIME 0:20 fix entities TU

migration/19.12/1912.sql

@@ -17,6 +17,8 @@ DROP VIEW IF EXISTS view_folders;
 ALTER TABLE users DROP COLUMN IF EXISTS reset_token;
 ALTER TABLE users DROP COLUMN IF EXISTS change_password;
 ALTER TABLE users ADD COLUMN reset_token text;
+ALTER TABLE users DROP COLUMN IF EXISTS preferences;
+ALTER TABLE users ADD COLUMN preferences jsonb NOT NULL DEFAULT '{"documentEdition" : "java"}';
 
 /* FULL TEXT */
 DELETE FROM docservers where docserver_type_id = 'FULLTEXT';
@@ -431,10 +433,6 @@ CREATE TABLE contacts_parameters
 )
 WITH (OIDS=FALSE);
 
-/* USERS */
-ALTER TABLE users DROP COLUMN IF EXISTS preferences;
-ALTER TABLE users ADD COLUMN preferences jsonb NOT NULL DEFAULT '{"documentEdition" : "java"}';
-
 ALTER TABLE acknowledgement_receipts DROP COLUMN IF EXISTS contact_id;
 ALTER TABLE acknowledgement_receipts ADD COLUMN contact_id integer;
 ALTER TABLE contacts_groups_lists DROP COLUMN IF EXISTS contact_id;

test/unitTests/app/entity/EntityControllerTest.php

@@ -38,10 +38,13 @@ class EntityControllerTest extends TestCase
 
         $this->assertInternalType('array', $responseBody->entities);
 
+        $entityInfo = \Entity\models\EntityModel::getByEntityId(['entityId' => 'TEST-ENTITY123', 'select' => ['id']]);
+        self::$id = $entityInfo['id'];
+
         //  READ
         $environment    = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
         $request        = \Slim\Http\Request::createFromEnvironment($environment);
-        $response       = $entityController->getById($request, new \Slim\Http\Response(), ['id' => 'TEST-ENTITY123']);
+        $response       = $entityController->getById($request, new \Slim\Http\Response(), ['id' => self::$id]);
         $responseBody   = json_decode((string)$response->getBody());
 
         $this->assertSame('TEST-ENTITY123', $responseBody->entity_id);
@@ -76,7 +79,7 @@ class EntityControllerTest extends TestCase
         //  READ
         $environment    = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
         $request        = \Slim\Http\Request::createFromEnvironment($environment);
-        $response       = $entityController->getById($request, new \Slim\Http\Response(), ['id' => 'TEST-ENTITY123']);
+        $response       = $entityController->getById($request, new \Slim\Http\Response(), ['id' => self::$id]);
         $responseBody   = json_decode((string)$response->getBody());
 
         $this->assertSame('TEST-ENTITY123', $responseBody->entity_id);
@@ -107,7 +110,7 @@ class EntityControllerTest extends TestCase
         //  READ
         $environment    = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
         $request        = \Slim\Http\Request::createFromEnvironment($environment);
-        $response       = $entityController->getById($request, new \Slim\Http\Response(), ['id' => 'TEST-ENTITY123']);
+        $response       = $entityController->getById($request, new \Slim\Http\Response(), ['id' => self::$id]);
         $responseBody   = json_decode((string)$response->getBody());
 
         $this->assertSame('TEST-ENTITY123', $responseBody->entity_id);
@@ -129,7 +132,7 @@ class EntityControllerTest extends TestCase
         //  READ
         $environment    = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
         $request        = \Slim\Http\Request::createFromEnvironment($environment);
-        $response       = $entityController->getById($request, new \Slim\Http\Response(), ['id' => 'TEST-ENTITY123']);
+        $response       = $entityController->getById($request, new \Slim\Http\Response(), ['id' => self::$id]);
         $responseBody   = json_decode((string)$response->getBody());
 
         $this->assertSame('TEST-ENTITY123', $responseBody->entity_id);
@@ -197,7 +200,7 @@ class EntityControllerTest extends TestCase
         //  READ
         $environment    = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
         $request        = \Slim\Http\Request::createFromEnvironment($environment);
-        $response       = $entityController->getById($request, new \Slim\Http\Response(), ['id' => 'TEST-ENTITY123']);
+        $response       = $entityController->getById($request, new \Slim\Http\Response(), ['id' => self::$id]);
         $responseBody   = json_decode((string)$response->getBody());
 
         $this->assertSame('Entity not found', $responseBody->errors);