Revize ea92a5e5

+ Re #8081
+ tests environmnet prepared
+ fast fix in build script

.gitlab-ci.yml

@@ -2 +2 @@
 #     IMAGE_NAME: zcu-campus-life-app:$CI_COMMIT_REF_NAME
 
 stages:
-    - test
     - linter
     - build
+    - test
     - deploy
-
-unit_tests:
-    stage: test
-    tags:
-        - test
-    script:
-        - cd website
-        - composer require --dev symfony/phpunit-bridge
-        - php bin/phpunit
+    
 php_linter: 
     stage: linter
     tags:
@@ -23 +15 @@
         - cd website
         - composer require --dev squizlabs/php_codesniffer
         - ./vendor/bin/php-cs-fixer fix --dry-run --config .php_cs --stop-on-violation --using-cache=no
+
 build:
     stage: build
     tags:
         - build
     script:
         # Test whether container can be build or not
-        - docker-compose build
+        - ./scripts/build.sh
+        - docker-compose stop crawler nginx
         # We could also push docker image to some registry or docker hub
+
+tests:
+    stage: test
+    tags:
+        - test
+    script:
+        - cd website
+        - composer require --dev symfony/phpunit-bridge
+        - composer require --dev symfony/browser-kit symfony/css-selector 
+        - docker-compose exec -T php-fpm /bin/sh -c "export APP_ENV=test && cd ../symfony && php bin/phpunit"
+        - docker stop $(docker ps -q)
         
 deploy_prod:
     stage: deploy

scripts/dev/build.bat

@@ -2 +2 @@
 docker-compose exec php-fpm composer config extra.symfony.allow-contrib true --no-interaction --working-dir=/var/www/symfony
 docker-compose exec php-fpm composer install --no-interaction --working-dir=/var/www/symfony
 docker-compose exec php-fpm composer update --no-interaction --working-dir=/var/www/symfony
-docker-compose exec php-fpm /bin/sh -c 'cd /var/www/symfony && npm install'
+docker-compose exec php-fpm /bin/sh -c "cd /var/www/symfony && npm install"
 docker-compose exec crawler /bin/sh -c "cd /src && python docker_prepare_structure.py && echo '-all' | python force_update_datasets.py"

website/.gitignore

@@ -22 +22 @@
 
 
 /.php_cs.dist
-node_modules
+node_modules
+###> symfony/phpunit-bridge ###
+.phpunit
+.phpunit.result.cache
+/phpunit.xml
+###< symfony/phpunit-bridge ###

website/bin/phpunit

@@ +1 @@
+#!/usr/bin/env php
+<?php
+
+if (!file_exists(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
+    echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
+    exit(1);
+}
+
+if (false === getenv('SYMFONY_PHPUNIT_DIR')) {
+    putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
+}
+
+require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';

website/composer.json

@@ -20 +20 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.16",
-        "squizlabs/php_codesniffer": "^3.5"
+        "squizlabs/php_codesniffer": "^3.5",
+        "symfony/browser-kit": "5.0.*",
+        "symfony/css-selector": "5.0.*",
+        "symfony/phpunit-bridge": "^5.0"
     },
     "config": {
         "preferred-install": {

website/config/services.yaml

@@ -29 +29 @@
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones
 
-    App\OpenData\OpenDataManager: ~
-    App\OpenData\IOpenDataManager: '@App\OpenData\OpenDataManager'
+    App\Repository\OpenDataManager:
+        arguments:
+            $connectionString: '%env(resolve:DATABASE_CONNECTION_STRING)%'
+    App\Repository\IOpenDataManager: 
+        alias: 'App\Repository\OpenDataManager'
+        public: true
     App\Form\Type\DataSetType: ~

website/phpunit.xml.dist

@@ +1 @@
+<phpunit bootstrap="vendor/autoload.php">
+    <testsuites>
+            <testsuite name="Project Test Suite">
+                <directory>tests</directory>
+            </testsuite>
+    </testsuites>
+    <php>
+        <env name="APP_ENV" value="test" />
+        <env name="KERNEL_CLASS" value="App\Kernel" />
+        <env name="DATABASE_CONNECTION_STRING" value="mongodb://root:root@database" />
+    </php>
+</phpunit>

website/src/Calculator.php

@@ -1 @@
-<?php
-
-namespace App;
-
-class Calculator {
-    public function add($a, $b) {
-        return $a + $b;
-    }
-}

website/src/Controller/HeatmapController.php

@@ -4 +4 @@
 
 use App\Entity\DataSet;
 use App\Form\Type\DataSetType;
-use App\OpenData\IOpenDataManager;
+use App\Repository\IOpenDataManager;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;

website/src/Form/DataSetType.php

@@ -4 +4 @@
 
 use App\Utils\Utils;
 use App\Entity\DataSet;
-use App\OpenData\IOpenDataManager;
+use App\Repository\IOpenDataManager;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormInterface;

website/src/IOpenDataManager.php

@@ -1 @@
-<?php
-
-namespace App\OpenData;
-
-interface IOpenDataManager {
-    public function getCollectionDataByName($name, $date, $hour);
-
-    public function getAvailableCollections();
-
-    public function getAvailableCollectionsByDay($date);
-
-    public function isCollectionAvailable($name, $date);
-
-    public function getDatesWithAvailableCollection();
-
-    public function getMaxCollectionNumberAtDay($name, $date);
-
-    public function getDataSourcePositions($name);
-
-    public function getLastAvailableCollections();
-}

website/src/OpenDataManager.php

@@ -1 @@
-<?php
-
-namespace App\OpenData;
-
-use MongoDB\Driver\Query;
-use MongoDB\Driver\Manager;
-
-class OpenDataManager implements IOpenDataManager {
-    private $manager;
-
-    public function __construct() {
-        $this->manager = new Manager(
-            $_ENV['DATABASE_CONNECTION_STRING']
-        );
-    }
-
-    public function getCollectionDataByName($name, $date, $hour) {
-        $valh = $hour < 10 ? '0'.$hour : $hour;
-        $openData = $this->manager->executeQuery('open-data-db.'.$name.$date, new Query(['date' => $date.'-'.$valh], []));
-
-        $openData->setTypeMap([
-            'array' => 'array',
-            'document' => 'array',
-            'root' => 'array',
-        ]);
-
-        return $openData->toArray();
-    }
-
-    public function getAvailableCollections() {
-        $openData = $this->manager->executeQuery('open-data-db.DATASETS', new Query([], ['projection' => ['key-name' => 1, 'display-name' => 1, '_id' => 0]]));
-
-        $openData->setTypeMap([
-            'array' => 'array',
-            'document' => 'array',
-            'root' => 'array',
-        ]);
-
-        return $openData->toArray();
-    }
-
-    public function getAvailableCollectionsByDay($date) {
-        $availableInDate = [];
-        $available = $this->getAvailableCollections();
-        $index = 0;
-        foreach ($available as $key => $value) {
-            if ($this->isCollectionAvailable($value['key-name'], $date) && false == array_key_exists($value['key-name'], $availableInDate)) {
-                $availableInDate[$value['key-name']] = $value['display-name'];
-            }
-        }
-
-        return $availableInDate;
-    }
-
-    public function isCollectionAvailable($name, $date) {
-        $result = $this->manager->executeQuery('open-data-db.'.$name, new Query(['date' => $date], []));
-
-        return !empty($result->toArray());
-    }
-
-    public function getDatesWithAvailableCollection() {
-        $available = $this->getAvailableCollections();
-        $result = [];
-
-        foreach ($available as $key => $value) {
-            $dates = $this->manager->executeQuery('open-data-db.'.$value['key-name'], new Query([], ['projection' => ['date' => true, '_id' => false]]));
-            $dates->setTypeMap(['root' => 'array']);
-            $result = array_merge($result, array_map(function ($item) {return $item['date']; }, $dates->toArray()));
-        }
-
-        return array_values(array_unique($result));
-    }
-
-    public function getLastAvailableCollections() {
-        $available = $this->getAvailableCollections();
-        $result = [];
-
-        foreach ($available as $key => $value) {
-            $date = $this->manager->executeQuery('open-data-db.'.$value['key-name'], new Query([], ['sort' => ['date' => -1], 'limit' => 1, 'projection' => ['date' => true, '_id' => false]]));
-            $date->setTypeMap(['root' => 'array']);
-
-            $date_array = $date->toArray();
-            if (!empty($date_array)) {
-                $result[$value['key-name']] = $date_array[0]['date'];
-            }
-        }
-
-        return $result;
-    }
-
-    public function getMaxCollectionNumberAtDay($name, $date) {
-        $max = $this->manager->executeQuery('open-data-db.'.$name.$date, new Query([], ['sort' => ['number' => -1], 'limit' => 1]));
-
-        $max->setTypeMap([
-            'array' => 'array',
-            'document' => 'array',
-            'root' => 'array',
-        ]);
-
-        $result = $max->toArray();
-
-        return empty($result) ? 1 : $result[0]['number'];
-    }
-
-    public function getDataSourcePositions($name = 'NONE') {
-        $positions = $this->manager->executeQuery('open-data-db.'.$name.'DEVICES', new Query([], []));
-
-        $positions->setTypeMap([
-            'array' => 'array',
-            'document' => 'array',
-            'root' => 'array',
-        ]);
-
-        return $positions->toArray();
-    }
-}

website/src/Repository/IOpenDataManager.php

@@ +1 @@
+<?php
+
+namespace App\Repository;
+
+interface IOpenDataManager {
+    public function getCollectionDataByName($name, $date, $hour);
+
+    public function getAvailableCollections();
+
+    public function getAvailableCollectionsByDay($date);
+
+    public function isCollectionAvailable($name, $date);
+
+    public function getDatesWithAvailableCollection();
+
+    public function getMaxCollectionNumberAtDay($name, $date);
+
+    public function getDataSourcePositions($name);
+
+    public function getLastAvailableCollections();
+}

website/src/Repository/OpenDataManager.php

@@ +1 @@
+<?php
+
+namespace App\Repository;
+
+use MongoDB\Driver\Query;
+use MongoDB\Driver\Manager;
+
+class OpenDataManager implements IOpenDataManager {
+    private $manager;
+
+    public function __construct($connectionString) {
+        $this->manager = new Manager(
+            $connectionString
+            // $_ENV['DATABASE_CONNECTION_STRING']
+        );
+    }
+
+    public function getCollectionDataByName($name, $date, $hour) {
+        $valh = $hour < 10 ? '0'.$hour : $hour;
+        $openData = $this->manager->executeQuery('open-data-db.'.$name.$date, new Query(['date' => $date.'-'.$valh], []));
+
+        $openData->setTypeMap([
+            'array' => 'array',
+            'document' => 'array',
+            'root' => 'array',
+        ]);
+
+        return $openData->toArray();
+    }
+
+    public function getAvailableCollections() {
+        $openData = $this->manager->executeQuery('open-data-db.DATASETS', new Query([], ['projection' => ['key-name' => 1, 'display-name' => 1, '_id' => 0]]));
+
+        $openData->setTypeMap([
+            'array' => 'array',
+            'document' => 'array',
+            'root' => 'array',
+        ]);
+
+        return $openData->toArray();
+    }
+
+    public function getAvailableCollectionsByDay($date) {
+        $availableInDate = [];
+        $available = $this->getAvailableCollections();
+        $index = 0;
+        foreach ($available as $key => $value) {
+            if ($this->isCollectionAvailable($value['key-name'], $date) && false == array_key_exists($value['key-name'], $availableInDate)) {
+                $availableInDate[$value['key-name']] = $value['display-name'];
+            }
+        }
+
+        return $availableInDate;
+    }
+
+    public function isCollectionAvailable($name, $date) {
+        $result = $this->manager->executeQuery('open-data-db.'.$name, new Query(['date' => $date], []));
+
+        return !empty($result->toArray());
+    }
+
+    public function getDatesWithAvailableCollection() {
+        $available = $this->getAvailableCollections();
+        $result = [];
+
+        foreach ($available as $key => $value) {
+            $dates = $this->manager->executeQuery('open-data-db.'.$value['key-name'], new Query([], ['projection' => ['date' => true, '_id' => false]]));
+            $dates->setTypeMap(['root' => 'array']);
+            $result = array_merge($result, array_map(function ($item) {return $item['date']; }, $dates->toArray()));
+        }
+
+        return array_values(array_unique($result));
+    }
+
+    public function getLastAvailableCollections() {
+        $available = $this->getAvailableCollections();
+        $result = [];
+
+        foreach ($available as $key => $value) {
+            $date = $this->manager->executeQuery('open-data-db.'.$value['key-name'], new Query([], ['sort' => ['date' => -1], 'limit' => 1, 'projection' => ['date' => true, '_id' => false]]));
+            $date->setTypeMap(['root' => 'array']);
+
+            $date_array = $date->toArray();
+            if (!empty($date_array)) {
+                $result[$value['key-name']] = $date_array[0]['date'];
+            }
+        }
+
+        return $result;
+    }
+
+    public function getMaxCollectionNumberAtDay($name, $date) {
+        $max = $this->manager->executeQuery('open-data-db.'.$name.$date, new Query([], ['sort' => ['number' => -1], 'limit' => 1]));
+
+        $max->setTypeMap([
+            'array' => 'array',
+            'document' => 'array',
+            'root' => 'array',
+        ]);
+
+        $result = $max->toArray();
+
+        return empty($result) ? 1 : $result[0]['number'];
+    }
+
+    public function getDataSourcePositions($name = 'NONE') {
+        $positions = $this->manager->executeQuery('open-data-db.'.$name.'DEVICES', new Query([], []));
+
+        $positions->setTypeMap([
+            'array' => 'array',
+            'document' => 'array',
+            'root' => 'array',
+        ]);
+
+        return $positions->toArray();
+    }
+}

website/tests/CalculatorTest.php

@@ -1 @@
-<?php
-
-namespace App\tests;
-
-use App\Calculator;
-use PHPUnit\Framework\TestCase;
-
-class CalculatorTest extends TestCase
-{
-    public function testAdd()
-    {
-        $calculator = new Calculator();
-        $result = $calculator->add(30, 12);
-
-        // assert that your calculator added the numbers correctly!
-        $this->assertEquals(42, $result);
-    }
-}

website/tests/Controller/HeatmapControllerTest.php

@@ +1 @@
+<?php
+
+namespace App\Tests\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+class HatmapControllerTest extends WebTestCase {
+
+    public function testMainPage() {
+        $client = static::createClient();
+        $client->request('GET', '/heatmap');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+    }
+}

website/tests/Controller/HomeControllerTest.php

@@ +1 @@
+<?php
+
+namespace App\Tests\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+class HomeControllerTest extends WebTestCase {
+
+    public function testMainPage() {
+        $client = static::createClient();
+        $client->request('GET', '/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+    }
+}

website/tests/Repository/OpenDataManagerTest.php

@@ +1 @@
+<?php
+
+namespace App\Test\Repository;
+
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use App\Repository\OpenDataManager;
+
+class OpenDataManagerTest extends KernelTestCase {
+
+    private $manager;
+
+    protected function setUp() : void {
+       $kernel = self::bootKernel();
+       $this->manager = $kernel->getContainer()->get('App\Repository\IOpenDataManager');
+    }
+    
+    public function testAvailableCollections() {
+        $this->assertCount(3, $this->manager->getAvailableCollections());
+    }
+}

website/tests/bootstrap.php

@@ +1 @@
+<?php
+
+use Symfony\Component\Dotenv\Dotenv;
+
+require dirname(__DIR__).'/vendor/autoload.php';
+
+if (file_exists(dirname(__DIR__).'/config/bootstrap.php')) {
+    require dirname(__DIR__).'/config/bootstrap.php';
+} elseif (method_exists(Dotenv::class, 'bootEnv')) {
+    (new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
+}