From 1bdfefaec7e4655f0b47d4ec33f483ade14ac16b Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Tue, 3 Sep 2019 16:48:27 +0300
Subject: [PATCH 001/183] add createVisitAggregate listener

---
 .../app/Actions/Visits/CreateVisitAction.php  |  7 +++---
 .../app/Aggregates/Contracts/Aggregate.php    |  9 ++++++++
 .../VisitorsFlow/VisitorsFlowAggregate.php    | 21 ++++++++++++++++++
 .../app/Listeners/CreateVisitAggregate.php    | 22 +++++++++++++++++++
 .../app/Providers/EventServiceProvider.php    |  2 ++
 .../VisitorsFlow/FlowAggregateService.php     | 18 +++++++++++++++
 6 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 backend/app/Aggregates/Contracts/Aggregate.php
 create mode 100644 backend/app/Aggregates/VisitorsFlow/VisitorsFlowAggregate.php
 create mode 100644 backend/app/Listeners/CreateVisitAggregate.php
 create mode 100644 backend/app/Services/VisitorsFlow/FlowAggregateService.php

diff --git a/backend/app/Actions/Visits/CreateVisitAction.php b/backend/app/Actions/Visits/CreateVisitAction.php
index 5c4d3968..9e714f9b 100644
--- a/backend/app/Actions/Visits/CreateVisitAction.php
+++ b/backend/app/Actions/Visits/CreateVisitAction.php
@@ -55,7 +55,6 @@ public function execute(CreateVisitRequest $request): void
     {
         JWTAuth::setToken(Str::after($request->token(), 'Bearer '));
         $visitorId = JWTAuth::getPayload()->get('visitor_id');
-
         $visitor = $this->visitorRepository->getById($visitorId);
         $this->visitorRepository->updateLastActivity($visitor);
 
@@ -125,7 +124,8 @@ private function getOrCreateSystem(
         string $browser,
         int $resolutionHeight,
         int $resolutionWidth
-    ): System {
+    ): System
+    {
         $system = $this->systemRepository->getByParameters(
             $operatingSystem,
             $device,
@@ -171,7 +171,8 @@ private function getOrCreateSession(
         int $pageId,
         string $language,
         int $systemId
-    ): Session {
+    ): Session
+    {
         $session = $this->sessionRepository->lastActiveByVisitorId($visitorId);
 
         if ($session !== null) {
diff --git a/backend/app/Aggregates/Contracts/Aggregate.php b/backend/app/Aggregates/Contracts/Aggregate.php
new file mode 100644
index 00000000..8a501247
--- /dev/null
+++ b/backend/app/Aggregates/Contracts/Aggregate.php
@@ -0,0 +1,9 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Aggregates\Contracts;
+
+interface Aggregate
+{
+    public function toArray(): array;
+}
diff --git a/backend/app/Aggregates/VisitorsFlow/VisitorsFlowAggregate.php b/backend/app/Aggregates/VisitorsFlow/VisitorsFlowAggregate.php
new file mode 100644
index 00000000..38897f2f
--- /dev/null
+++ b/backend/app/Aggregates/VisitorsFlow/VisitorsFlowAggregate.php
@@ -0,0 +1,21 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Aggregates\VisitorsFlow;
+
+use App\Aggregates\Contracts\Aggregate;
+
+class VisitorsFlowAggregate implements Aggregate
+{
+    public $url;
+    public $nextPage;
+    public $prevPage;
+    public $count;
+    public $level;
+    public $isLastPage;
+
+    public function toArray(): array
+    {
+    }
+
+}
diff --git a/backend/app/Listeners/CreateVisitAggregate.php b/backend/app/Listeners/CreateVisitAggregate.php
new file mode 100644
index 00000000..3544444a
--- /dev/null
+++ b/backend/app/Listeners/CreateVisitAggregate.php
@@ -0,0 +1,22 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Listeners;
+
+use App\Events\VisitCreated;
+use App\Services\VisitorsFlow\FlowAggregateService;
+
+class CreateVisitAggregate
+{
+    private $flowAggregateService;
+
+    public function __construct(FlowAggregateService $flowAggregateService)
+    {
+        $this->flowAggregateService = $flowAggregateService;
+    }
+
+    public function handle(VisitCreated $event)
+    {
+        $this->flowAggregateService->aggregate($event->visit);
+    }
+}
diff --git a/backend/app/Providers/EventServiceProvider.php b/backend/app/Providers/EventServiceProvider.php
index caef2bd5..d9f385a5 100644
--- a/backend/app/Providers/EventServiceProvider.php
+++ b/backend/app/Providers/EventServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use App\Listeners\CreateVisitAggregate;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
@@ -20,6 +21,7 @@ class EventServiceProvider extends ServiceProvider
         ],
         'App\Events\VisitCreated' => [
             'App\Listeners\SendVisitsNotification',
+            CreateVisitAggregate::class
         ],
     ];
 
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
new file mode 100644
index 00000000..0b8ffdde
--- /dev/null
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -0,0 +1,18 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Services\VisitorsFlow;
+
+use App\Entities\Visit;
+
+final class FlowAggregateService
+{
+    public function __construct()
+    {
+    }
+
+    public function aggregate(Visit $visit)
+    {
+
+    }
+}

From fefe2545a325b6bca414111dacdf49ae0a2966c7 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Tue, 3 Sep 2019 20:39:39 +0300
Subject: [PATCH 002/183] add aggrigate objects

---
 .../app/Aggregates/Contracts/Aggregate.php    |  9 ---
 .../app/Aggregates/VisitorsFlow/Aggregate.php | 55 +++++++++++++++++++
 .../VisitorsFlow/CountryAggregate.php         | 30 ++++++++++
 .../VisitorsFlow/DeviceAggregate.php          | 15 +++++
 .../VisitorsFlow/ScreenAggregate.php          | 36 ++++++++++++
 .../VisitorsFlow/SystemAggregate.php          | 30 ++++++++++
 .../VisitorsFlow/Values/PageValue.php         | 16 ++++++
 .../VisitorsFlow/VisitorsFlowAggregate.php    | 21 -------
 8 files changed, 182 insertions(+), 30 deletions(-)
 delete mode 100644 backend/app/Aggregates/Contracts/Aggregate.php
 create mode 100644 backend/app/Aggregates/VisitorsFlow/Aggregate.php
 create mode 100644 backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
 create mode 100644 backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
 create mode 100644 backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
 create mode 100644 backend/app/Aggregates/VisitorsFlow/SystemAggregate.php
 create mode 100644 backend/app/Aggregates/VisitorsFlow/Values/PageValue.php
 delete mode 100644 backend/app/Aggregates/VisitorsFlow/VisitorsFlowAggregate.php

diff --git a/backend/app/Aggregates/Contracts/Aggregate.php b/backend/app/Aggregates/Contracts/Aggregate.php
deleted file mode 100644
index 8a501247..00000000
--- a/backend/app/Aggregates/Contracts/Aggregate.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Aggregates\Contracts;
-
-interface Aggregate
-{
-    public function toArray(): array;
-}
diff --git a/backend/app/Aggregates/VisitorsFlow/Aggregate.php b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
new file mode 100644
index 00000000..eb0c29b2
--- /dev/null
+++ b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
@@ -0,0 +1,55 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Aggregates\VisitorsFlow;
+
+use App\Aggregates\VisitorsFlow\Values\PageValue;
+
+abstract class Aggregate
+{
+    public $websiteId;
+    public $url;
+    public $nextPage;
+    public $prevPage;
+    public $views;
+    public $level;
+    public $isLastPage;
+
+    public function __construct(
+        int $websiteId,
+        string $url,
+        PageValue $nextPage,
+        PageValue $prevPage,
+        int $views,
+        int $level,
+        bool $isLastPage
+    )
+    {
+        $this->websiteId = $websiteId;
+        $this->url = $url;
+        $this->nextPage = $nextPage;
+        $this->prevPage = $prevPage;
+        $this->views = $views;
+        $this->level = $level;
+        $this->isLastPage = $isLastPage;
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'websiteId' => $this->websiteId,
+            'url' => $this->url,
+            'nextPage' => [
+                'id' => $this->nextPage->id,
+                'url' => $this->nextPage->url
+            ],
+            'prevPage' =>  [
+                'id' => $this->prevPage->id,
+                'url' => $this->prevPage->url
+            ],
+            'level' => $this->level,
+            'views' => $this->views,
+            'isLastPage' => $this->isLastPage,
+        ];
+    }
+}
diff --git a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
new file mode 100644
index 00000000..8a2b5bd7
--- /dev/null
+++ b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
@@ -0,0 +1,30 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Aggregates\VisitorsFlow;
+
+use App\Aggregates\VisitorsFlow\Values\PageValue;
+
+class CountryAggregate extends Aggregate
+{
+    public $country;
+
+    public function __construct(
+        int $websiteId,
+        string $url,
+        PageValue $nextPage,
+        PageValue $prevPage,
+        int $views,
+        int $level,
+        bool $isLastPage,
+        string $country
+    ) {
+        parent::__construct($websiteId, $url, $nextPage, $prevPage, $views, $level, $isLastPage);
+        $this->$country = $country;
+    }
+
+    public function toArray(): array
+    {
+        return array_merge(parent::toArray(), ['country' => $this->country]);
+    }
+}
diff --git a/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php b/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
new file mode 100644
index 00000000..258ec00e
--- /dev/null
+++ b/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Aggregates\VisitorsFlow;
+
+use App\Aggregates\Contracts\Aggregate;
+
+class DeviceAggregate implements Aggregate
+{
+    public function toArray(): array
+    {
+        // TODO: Implement toArray() method.
+    }
+
+}
diff --git a/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php b/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
new file mode 100644
index 00000000..ad4af2ac
--- /dev/null
+++ b/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
@@ -0,0 +1,36 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Aggregates\VisitorsFlow;
+
+use App\Aggregates\VisitorsFlow\Values\PageValue;
+
+class ScreenAggregate extends Aggregate
+{
+    public $resolutionWidth;
+    public $resolutionHeight;
+
+    public function __construct(
+        int $websiteId,
+        string $url,
+        PageValue $nextPage,
+        PageValue $prevPage,
+        int $views,
+        int $level,
+        bool $isLastPage,
+        int $resolutionWidth,
+        int $resolutionHeight
+    ) {
+        parent::__construct($websiteId, $url, $nextPage, $prevPage, $views, $level, $isLastPage);
+        $this->resolutionWidth = $resolutionWidth;
+        $this->resolutionHeight = $resolutionHeight;
+    }
+
+    public function toArray(): array
+    {
+        return array_merge(parent::toArray(), [
+            'resolution_width' => $this->resolutionWidth,
+            'resolution_height' => $this->resolutionHeight
+        ]);
+    }
+}
diff --git a/backend/app/Aggregates/VisitorsFlow/SystemAggregate.php b/backend/app/Aggregates/VisitorsFlow/SystemAggregate.php
new file mode 100644
index 00000000..5162f61b
--- /dev/null
+++ b/backend/app/Aggregates/VisitorsFlow/SystemAggregate.php
@@ -0,0 +1,30 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Aggregates\VisitorsFlow;
+
+use App\Aggregates\VisitorsFlow\Values\PageValue;
+
+class SystemAggregate extends Aggregate
+{
+    public $system;
+
+    public function __construct(
+        int $websiteId,
+        string $url,
+        PageValue $nextPage,
+        PageValue $prevPage,
+        int $views,
+        int $level,
+        bool $isLastPage,
+        string $system
+    ) {
+        parent::__construct($websiteId, $url, $nextPage, $prevPage, $views, $level, $isLastPage);
+        $this->system = $system;
+    }
+
+    public function toArray(): array
+    {
+        return array_merge(parent::toArray(), ['system' => $this->system]);
+    }
+}
diff --git a/backend/app/Aggregates/VisitorsFlow/Values/PageValue.php b/backend/app/Aggregates/VisitorsFlow/Values/PageValue.php
new file mode 100644
index 00000000..d99071a9
--- /dev/null
+++ b/backend/app/Aggregates/VisitorsFlow/Values/PageValue.php
@@ -0,0 +1,16 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Aggregates\VisitorsFlow\Values;
+
+class PageValue
+{
+    public $id;
+    public $url;
+
+    public function __construct(int $id, string $url)
+    {
+        $this->id = $id;
+        $this->url = $url;
+    }
+}
diff --git a/backend/app/Aggregates/VisitorsFlow/VisitorsFlowAggregate.php b/backend/app/Aggregates/VisitorsFlow/VisitorsFlowAggregate.php
deleted file mode 100644
index 38897f2f..00000000
--- a/backend/app/Aggregates/VisitorsFlow/VisitorsFlowAggregate.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Aggregates\VisitorsFlow;
-
-use App\Aggregates\Contracts\Aggregate;
-
-class VisitorsFlowAggregate implements Aggregate
-{
-    public $url;
-    public $nextPage;
-    public $prevPage;
-    public $count;
-    public $level;
-    public $isLastPage;
-
-    public function toArray(): array
-    {
-    }
-
-}

From b604c086e097301d74aa6a957d4120c8b5bcb345 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Tue, 3 Sep 2019 23:25:54 +0300
Subject: [PATCH 003/183] add getPreviousVisit and getVisitsCount methods

---
 .../Contracts/VisitRepository.php             |  2 ++
 .../Repositories/EloquentVisitRepository.php  |  8 ++++-
 .../VisitorsFlow/FlowAggregateService.php     | 35 ++++++++++++++++++-
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/backend/app/Repositories/Contracts/VisitRepository.php b/backend/app/Repositories/Contracts/VisitRepository.php
index 67f220a8..1dbfec84 100644
--- a/backend/app/Repositories/Contracts/VisitRepository.php
+++ b/backend/app/Repositories/Contracts/VisitRepository.php
@@ -10,4 +10,6 @@ interface VisitRepository
     public function save(Visit $visit): Visit;
 
     public function getVisitsCountByHourAndDay(string $startDate, string $endDate): Collection;
+
+    public function findBySessionId(int $sessionId): Collection;
 }
diff --git a/backend/app/Repositories/EloquentVisitRepository.php b/backend/app/Repositories/EloquentVisitRepository.php
index 5233e22a..74292b96 100644
--- a/backend/app/Repositories/EloquentVisitRepository.php
+++ b/backend/app/Repositories/EloquentVisitRepository.php
@@ -28,4 +28,10 @@ public function getVisitsCountByHourAndDay(string $startDate, string $endDate):
             ->groupBy('day', 'hour')
             ->get();
     }
-}
\ No newline at end of file
+
+
+    public function findBySessionId(int $sessionId): Collection
+    {
+        return Visit::where('session_id', $sessionId)->get();
+    }
+}
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 0b8ffdde..31903135 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -4,15 +4,48 @@
 namespace App\Services\VisitorsFlow;
 
 use App\Entities\Visit;
+use App\Repositories\Contracts\PageRepository;
+use App\Repositories\Contracts\VisitRepository;
+use Carbon\Carbon;
 
 final class FlowAggregateService
 {
-    public function __construct()
+    private $pageRepository;
+    private $visitRepository;
+
+    public function __construct(
+        PageRepository $pageRepository,
+        VisitRepository $visitRepository
+    )
     {
+        $this->pageRepository = $pageRepository;
+        $this->visitRepository = $visitRepository;
     }
 
     public function aggregate(Visit $visit)
     {
+        $previousVisit = $this->getPreviousVisit($visit);
+        $isFirstInSession = $previousVisit === null;
+        if (!$isFirstInSession) {
+            $level = $this->getVisitsCount($visit);
+        } else {
+            $level = 1;
+        }
+    }
+
+    private function getPreviousVisit(Visit $currentVisit): ?Visit
+    {
+        return $this->visitRepository->findBySessionId($currentVisit->session_id)
+            ->sortBy(function (Visit $visit) {
+                return (new Carbon($visit->visit_time))->getTimestamp();
+            })
+            ->last(function (Visit $visit) use ($currentVisit) {
+                return $currentVisit->id !== $visit->id;
+            });
+    }
 
+    private function getVisitsCount(Visit $currentVisit): int
+    {
+        return $this->visitRepository->findBySessionId($currentVisit->session_id)->count();
     }
 }

From 820b353cd5fa2217aaff35c6918a822bf7911210 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Wed, 4 Sep 2019 13:46:26 +0300
Subject: [PATCH 004/183] add ElasticsearchCountryRepository

---
 .../app/Aggregates/VisitorsFlow/Aggregate.php | 13 ++--
 .../VisitorsFlow/CountryAggregate.php         | 28 +++++++-
 backend/app/Providers/AppServiceProvider.php  |  5 ++
 .../Contracts/GeoPositionRepository.php       |  3 +
 .../Contracts/CountryRepository.php           | 16 +++++
 .../ElasticsearchCountryRepository.php        | 72 +++++++++++++++++++
 .../EloquentGeoPositionRepository.php         |  5 ++
 .../VisitorsFlow/FlowAggregateService.php     | 59 ++++++++++++++-
 readme.md                                     |  2 +-
 9 files changed, 192 insertions(+), 11 deletions(-)
 create mode 100644 backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php
 create mode 100644 backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchCountryRepository.php

diff --git a/backend/app/Aggregates/VisitorsFlow/Aggregate.php b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
index eb0c29b2..fc384f2c 100644
--- a/backend/app/Aggregates/VisitorsFlow/Aggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
@@ -18,8 +18,8 @@ abstract class Aggregate
     public function __construct(
         int $websiteId,
         string $url,
-        PageValue $nextPage,
-        PageValue $prevPage,
+        ?PageValue $nextPage,
+        ?PageValue $prevPage,
         int $views,
         int $level,
         bool $isLastPage
@@ -39,11 +39,11 @@ public function toArray(): array
         return [
             'websiteId' => $this->websiteId,
             'url' => $this->url,
-            'nextPage' => [
+            'nextPage' => $this->nextPage === null ? null : [
                 'id' => $this->nextPage->id,
                 'url' => $this->nextPage->url
             ],
-            'prevPage' =>  [
+            'prevPage' => $this->prevPage === null ? null : [
                 'id' => $this->prevPage->id,
                 'url' => $this->prevPage->url
             ],
@@ -52,4 +52,9 @@ public function toArray(): array
             'isLastPage' => $this->isLastPage,
         ];
     }
+
+    public function getId(): int
+    {
+//        return $this->id;
+    }
 }
diff --git a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
index 8a2b5bd7..5363614b 100644
--- a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
@@ -10,21 +10,43 @@ class CountryAggregate extends Aggregate
     public $country;
 
     public function __construct(
+        int $id,
         int $websiteId,
         string $url,
-        PageValue $nextPage,
-        PageValue $prevPage,
+        ?PageValue $nextPage,
+        ?PageValue $prevPage,
         int $views,
         int $level,
         bool $isLastPage,
         string $country
     ) {
         parent::__construct($websiteId, $url, $nextPage, $prevPage, $views, $level, $isLastPage);
-        $this->$country = $country;
+        $this->country = $country;
     }
 
     public function toArray(): array
     {
         return array_merge(parent::toArray(), ['country' => $this->country]);
     }
+
+    public static function fromResult(array $result): self
+    {
+        return new self(
+            (int)$result['id'],
+            (int)$result['websiteId'],
+            (string)$result['url'],
+            new PageValue(
+                (int)$result['nextPage']['id'],
+                (string)$result['nextPage']['url']
+            ),
+            new PageValue(
+                (int)$result['prevPage']['id'],
+                (string)$result['prevPage']['url']
+            ),
+            (int)$result['views'],
+            (int)$result['level'],
+            (bool)$result['isLastPage'],
+            (string)$result['country']
+        );
+    }
 }
diff --git a/backend/app/Providers/AppServiceProvider.php b/backend/app/Providers/AppServiceProvider.php
index 1c87cf2b..bc3d5432 100644
--- a/backend/app/Providers/AppServiceProvider.php
+++ b/backend/app/Providers/AppServiceProvider.php
@@ -22,6 +22,8 @@
 use App\Repositories\Contracts\VisitRepository;
 use App\Repositories\Contracts\WebsiteRepository;
 use App\Repositories\Contracts\PageViews\ChartDataRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\CountryRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\ElasticsearchCountryRepository;
 use App\Repositories\EloquentChartPageTimingRepository;
 use App\Repositories\EloquentChartVisitorRepository;
 use App\Repositories\EloquentButtonVisitorsRepository;
@@ -96,7 +98,10 @@ public function register()
         $this->app->bind(TablePageViewsRepository::class, EloquentTablePageViewsRepository::class);
 
         $this->app->bind(ChartDataRepository::class, EloquentChartDataRepository::class);
+
         $this->app->bind(ChartPageTimingRepository::class, EloquentChartPageTimingRepository::class);
+
+        $this->app->bind(CountryRepository::class,ElasticsearchCountryRepository::class);
     }
 
     /**
diff --git a/backend/app/Repositories/Contracts/GeoPositionRepository.php b/backend/app/Repositories/Contracts/GeoPositionRepository.php
index 387c69eb..d4dbaed4 100644
--- a/backend/app/Repositories/Contracts/GeoPositionRepository.php
+++ b/backend/app/Repositories/Contracts/GeoPositionRepository.php
@@ -9,4 +9,7 @@ interface GeoPositionRepository
     public function getByParameters(string $country, string $city): ?GeoPosition;
 
     public function save(GeoPosition $geoPosition): GeoPosition;
+
+    public function getById(int $id): GeoPosition;
+
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php
new file mode 100644
index 00000000..e3b10a6c
--- /dev/null
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php
@@ -0,0 +1,16 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Repositories\Elasticsearch\VisitorsFlow\Contracts;
+
+use App\Aggregates\VisitorsFlow\Aggregate;
+use App\Aggregates\VisitorsFlow\CountryAggregate;
+
+interface CountryRepository
+{
+    public function save(Aggregate $tableAggregate): Aggregate;
+
+    public function getById(int $id): CountryAggregate;
+
+    public function getByParams(int $websiteId, string $url, int $level): ?CountryAggregate;
+}
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchCountryRepository.php
new file mode 100644
index 00000000..e701fd00
--- /dev/null
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchCountryRepository.php
@@ -0,0 +1,72 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Repositories\Elasticsearch\VisitorsFlow;
+
+use App\Aggregates\VisitorsFlow\Aggregate;
+use App\Aggregates\VisitorsFlow\CountryAggregate;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\CountryRepository;
+use Cviebrock\LaravelElasticsearch\Manager as ElasticsearchManager;
+
+final class ElasticsearchCountryRepository implements CountryRepository
+{
+    const INDEX_NAME = 'country-visitors-flow';
+    private $client;
+
+    public function __construct(ElasticsearchManager $client)
+    {
+        $this->client = $client;
+    }
+
+    public function save(Aggregate $countryAggregate): Aggregate
+    {
+
+        $this->client->index([
+            'index' => self::INDEX_NAME,
+            'type' => '_doc',
+            'body' => $countryAggregate->toArray()
+        ]);
+        dd($countryAggregate);
+
+        return $countryAggregate;
+    }
+
+    public function getById(int $id): CountryAggregate
+    {
+        $result = $this->client->get([
+            'index' => self::INDEX_NAME,
+            'type' => '_doc',
+            'id' => $id
+        ]);
+        return CountryAggregate::fromResult($result['_source']);
+    }
+
+    public function getByParams(int $websiteId, string $url, int $level): ?CountryAggregate
+    {
+        $params = [
+            'index' => self::INDEX_NAME,
+            'body' => [
+                'query' => [
+                    'bool' => [
+                        'must' => [
+                            ['match' => ['websiteId' => $websiteId]],
+                            ['match' => ['level' => $level]],
+                            ['match' => ['url' => $url]],
+                        ]
+                    ]
+                ]
+            ]
+        ];
+        try {
+            $result = $this->client->search($params);
+        } catch (\Exception $exception) {
+            return null;
+        }
+        if (empty($result['hits']['hits'])) {
+            return null;
+        }
+        //доделать!!!!!
+        return CountryAggregate::fromResult($result['hits']);
+    }
+
+}
diff --git a/backend/app/Repositories/EloquentGeoPositionRepository.php b/backend/app/Repositories/EloquentGeoPositionRepository.php
index 74622098..de5a421a 100644
--- a/backend/app/Repositories/EloquentGeoPositionRepository.php
+++ b/backend/app/Repositories/EloquentGeoPositionRepository.php
@@ -22,4 +22,9 @@ public function save(GeoPosition $geoPosition): GeoPosition
         $geoPosition->save();
         return $geoPosition;
     }
+
+    public function getById(int $id): GeoPosition
+    {
+        return GeoPosition::findOrFail($id);
+    }
 }
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 31903135..8ea093f8 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -3,23 +3,36 @@
 
 namespace App\Services\VisitorsFlow;
 
+use App\Aggregates\VisitorsFlow\CountryAggregate;
 use App\Entities\Visit;
+use App\Repositories\Contracts\GeoPositionRepository;
 use App\Repositories\Contracts\PageRepository;
 use App\Repositories\Contracts\VisitRepository;
+use App\Repositories\Contracts\WebsiteRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\CountryRepository;
 use Carbon\Carbon;
 
 final class FlowAggregateService
 {
     private $pageRepository;
     private $visitRepository;
+    private $countryRepository;
+    private $websiteRepository;
+    private $geoPositionRepository;
 
     public function __construct(
         PageRepository $pageRepository,
-        VisitRepository $visitRepository
+        VisitRepository $visitRepository,
+        CountryRepository $countryRepository,
+        WebsiteRepository $websiteRepository,
+        GeoPositionRepository $geoPositionRepository
     )
     {
         $this->pageRepository = $pageRepository;
         $this->visitRepository = $visitRepository;
+        $this->countryRepository = $countryRepository;
+        $this->websiteRepository = $websiteRepository;
+        $this->geoPositionRepository = $geoPositionRepository;
     }
 
     public function aggregate(Visit $visit)
@@ -31,9 +44,21 @@ public function aggregate(Visit $visit)
         } else {
             $level = 1;
         }
+        $countryAggregate = $this->countryRepository->getByParams(
+            $visit->session->website_id,
+            $visit->page->url,
+            $level
+        );
+        $countryAggregate = null;
+
+        if (!$countryAggregate) {
+            $countryAggregate = $this->createCountryAggregate($visit, $level, $previousVisit);
+            $countryAggregate = $this->countryRepository->save($countryAggregate);
+        }
     }
 
-    private function getPreviousVisit(Visit $currentVisit): ?Visit
+    private
+    function getPreviousVisit(Visit $currentVisit): ?Visit
     {
         return $this->visitRepository->findBySessionId($currentVisit->session_id)
             ->sortBy(function (Visit $visit) {
@@ -44,8 +69,36 @@ private function getPreviousVisit(Visit $currentVisit): ?Visit
             });
     }
 
-    private function getVisitsCount(Visit $currentVisit): int
+    private
+    function getVisitsCount(Visit $currentVisit): int
     {
         return $this->visitRepository->findBySessionId($currentVisit->session_id)->count();
     }
+
+    private
+    function createCountryAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): CountryAggregate
+    {
+        $page = $this->pageRepository->getById($currentVisit->page_id);
+        $website = $this->websiteRepository->getById($page->website_id);
+        $geoPosition = $this->geoPositionRepository->getById($currentVisit->geo_position_id);
+        $nextPage = null;
+        $prevPage = null;
+        if ($level !== 1) {
+            //сделать
+        }
+
+        $isLatPage = true;
+        $views = 1;
+        return new CountryAggregate(
+            $currentVisit->id,
+            $website->id,
+            $page->url,
+            $nextPage,
+            $prevPage,
+            $views,
+            $level,
+            $isLatPage,
+            $geoPosition->country
+        );
+    }
 }
diff --git a/readme.md b/readme.md
index 5694beb7..efeeaf47 100644
--- a/readme.md
+++ b/readme.md
@@ -43,7 +43,7 @@ cp docker-compose.override.yml.windows docker-compose.override.yml
 cp .env.example .env
 docker-compose up -d
 
-docker-compose exec app composer install
+c
 docker-compose exec app php artisan key:generate
 docker-compose exec app php artisan jwt:secret
 docker-compose exec app php artisan migrate --seed

From 522bd50d500f4c114a3967f9401b59c31c1b6a1a Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Wed, 4 Sep 2019 15:42:29 +0300
Subject: [PATCH 005/183] add nextPage and prevPage values to countryAggregte

---
 .../app/Aggregates/VisitorsFlow/Aggregate.php |  6 +++-
 .../VisitorsFlow/CountryAggregate.php         |  9 +++---
 .../Contracts/CountryRepository.php           |  4 ++-
 .../ElasticsearchCountryRepository.php        | 29 ++++++++++++++-----
 .../VisitorsFlow/FlowAggregateService.php     | 22 +++++++++-----
 5 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/backend/app/Aggregates/VisitorsFlow/Aggregate.php b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
index fc384f2c..6009294d 100644
--- a/backend/app/Aggregates/VisitorsFlow/Aggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
@@ -7,6 +7,7 @@
 
 abstract class Aggregate
 {
+    public $id;
     public $websiteId;
     public $url;
     public $nextPage;
@@ -16,6 +17,7 @@ abstract class Aggregate
     public $isLastPage;
 
     public function __construct(
+        int $id,
         int $websiteId,
         string $url,
         ?PageValue $nextPage,
@@ -25,6 +27,7 @@ public function __construct(
         bool $isLastPage
     )
     {
+        $this->id = $id;
         $this->websiteId = $websiteId;
         $this->url = $url;
         $this->nextPage = $nextPage;
@@ -37,6 +40,7 @@ public function __construct(
     public function toArray(): array
     {
         return [
+            'id' => $this->id,
             'websiteId' => $this->websiteId,
             'url' => $this->url,
             'nextPage' => $this->nextPage === null ? null : [
@@ -55,6 +59,6 @@ public function toArray(): array
 
     public function getId(): int
     {
-//        return $this->id;
+        return $this->id;
     }
 }
diff --git a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
index 5363614b..6f8275d0 100644
--- a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
@@ -19,8 +19,9 @@ public function __construct(
         int $level,
         bool $isLastPage,
         string $country
-    ) {
-        parent::__construct($websiteId, $url, $nextPage, $prevPage, $views, $level, $isLastPage);
+    )
+    {
+        parent::__construct($id, $websiteId, $url, $nextPage, $prevPage, $views, $level, $isLastPage);
         $this->country = $country;
     }
 
@@ -35,11 +36,11 @@ public static function fromResult(array $result): self
             (int)$result['id'],
             (int)$result['websiteId'],
             (string)$result['url'],
-            new PageValue(
+            $result['nextPage'] === null ? null : new PageValue(
                 (int)$result['nextPage']['id'],
                 (string)$result['nextPage']['url']
             ),
-            new PageValue(
+            $result['prevPage'] === null ? null : new PageValue(
                 (int)$result['prevPage']['id'],
                 (string)$result['prevPage']['url']
             ),
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php
index e3b10a6c..2c658f42 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php
@@ -10,7 +10,9 @@ interface CountryRepository
 {
     public function save(Aggregate $tableAggregate): Aggregate;
 
+    public function update(Aggregate $tableAggregate): Aggregate;
+
     public function getById(int $id): CountryAggregate;
 
-    public function getByParams(int $websiteId, string $url, int $level): ?CountryAggregate;
+    public function getByParams(int $websiteId, string $url, int $level);
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchCountryRepository.php
index e701fd00..a8e2e4cc 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchCountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchCountryRepository.php
@@ -20,28 +20,41 @@ public function __construct(ElasticsearchManager $client)
 
     public function save(Aggregate $countryAggregate): Aggregate
     {
-
         $this->client->index([
             'index' => self::INDEX_NAME,
+            'id' => $countryAggregate->getId(),
             'type' => '_doc',
             'body' => $countryAggregate->toArray()
         ]);
-        dd($countryAggregate);
 
         return $countryAggregate;
     }
 
-    public function getById(int $id): CountryAggregate
+    public function update(Aggregate $countryAggregate): Aggregate
     {
-        $result = $this->client->get([
+        $this->client->index([
             'index' => self::INDEX_NAME,
+            'id' => $countryAggregate->getId(),
             'type' => '_doc',
-            'id' => $id
+            'body' => [
+                'doc' => $countryAggregate->toArray()
+            ]
         ]);
-        return CountryAggregate::fromResult($result['_source']);
+
+        return $countryAggregate;
+    }
+
+    public function getById(int $id): CountryAggregate
+    {
+//        $result = $this->client->get([
+//            'index' => self::INDEX_NAME,
+//            'type' => '_doc',
+//            'id' => $id
+//        ]);
+//        return CountryAggregate::fromResult($result['_source']);
     }
 
-    public function getByParams(int $websiteId, string $url, int $level): ?CountryAggregate
+    public function getByParams(int $websiteId, string $url, int $level)
     {
         $params = [
             'index' => self::INDEX_NAME,
@@ -66,7 +79,7 @@ public function getByParams(int $websiteId, string $url, int $level): ?CountryAg
             return null;
         }
         //доделать!!!!!
-        return CountryAggregate::fromResult($result['hits']);
+        return CountryAggregate::fromResult($result['hits']['hits'][0]['_source']);
     }
 
 }
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 8ea093f8..5e8ca208 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -4,6 +4,7 @@
 namespace App\Services\VisitorsFlow;
 
 use App\Aggregates\VisitorsFlow\CountryAggregate;
+use App\Aggregates\VisitorsFlow\Values\PageValue;
 use App\Entities\Visit;
 use App\Repositories\Contracts\GeoPositionRepository;
 use App\Repositories\Contracts\PageRepository;
@@ -54,11 +55,11 @@ public function aggregate(Visit $visit)
         if (!$countryAggregate) {
             $countryAggregate = $this->createCountryAggregate($visit, $level, $previousVisit);
             $countryAggregate = $this->countryRepository->save($countryAggregate);
+            dd($countryAggregate);
         }
     }
 
-    private
-    function getPreviousVisit(Visit $currentVisit): ?Visit
+    private function getPreviousVisit(Visit $currentVisit): ?Visit
     {
         return $this->visitRepository->findBySessionId($currentVisit->session_id)
             ->sortBy(function (Visit $visit) {
@@ -69,14 +70,12 @@ function getPreviousVisit(Visit $currentVisit): ?Visit
             });
     }
 
-    private
-    function getVisitsCount(Visit $currentVisit): int
+    private function getVisitsCount(Visit $currentVisit): int
     {
         return $this->visitRepository->findBySessionId($currentVisit->session_id)->count();
     }
 
-    private
-    function createCountryAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): CountryAggregate
+    private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): CountryAggregate
     {
         $page = $this->pageRepository->getById($currentVisit->page_id);
         $website = $this->websiteRepository->getById($page->website_id);
@@ -84,7 +83,16 @@ function createCountryAggregate(Visit $currentVisit, int $level, ?Visit $previou
         $nextPage = null;
         $prevPage = null;
         if ($level !== 1) {
-            //сделать
+            //get previous aggregate
+            $previousAggregate = $this->countryRepository->getByParams(
+                $previousVisit->session->website_id,
+                $previousVisit->page->url,
+                $level - 1
+            );
+            $previousAggregate->nextPage = new PageValue($currentVisit->id, $currentVisit->page->url);
+            $previousAggregate->isLastPage = false;
+            $this->countryRepository->update($previousAggregate);
+            $prevPage = new PageValue($previousVisit->id, $previousAggregate->url);
         }
 
         $isLatPage = true;

From 4aacf47530599432a61bdc1ec916701134df431b Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Wed, 4 Sep 2019 15:54:49 +0300
Subject: [PATCH 006/183] add page title to aggreagate

---
 backend/app/Aggregates/VisitorsFlow/Aggregate.php          | 4 ++++
 backend/app/Aggregates/VisitorsFlow/CountryAggregate.php   | 4 +++-
 backend/app/Services/VisitorsFlow/FlowAggregateService.php | 3 +--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/backend/app/Aggregates/VisitorsFlow/Aggregate.php b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
index 6009294d..1c1c2ccc 100644
--- a/backend/app/Aggregates/VisitorsFlow/Aggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
@@ -10,6 +10,7 @@ abstract class Aggregate
     public $id;
     public $websiteId;
     public $url;
+    public $title;
     public $nextPage;
     public $prevPage;
     public $views;
@@ -20,6 +21,7 @@ public function __construct(
         int $id,
         int $websiteId,
         string $url,
+        string $title,
         ?PageValue $nextPage,
         ?PageValue $prevPage,
         int $views,
@@ -30,6 +32,7 @@ public function __construct(
         $this->id = $id;
         $this->websiteId = $websiteId;
         $this->url = $url;
+        $this->title = $title;
         $this->nextPage = $nextPage;
         $this->prevPage = $prevPage;
         $this->views = $views;
@@ -43,6 +46,7 @@ public function toArray(): array
             'id' => $this->id,
             'websiteId' => $this->websiteId,
             'url' => $this->url,
+            'title'=>$this->title,
             'nextPage' => $this->nextPage === null ? null : [
                 'id' => $this->nextPage->id,
                 'url' => $this->nextPage->url
diff --git a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
index 6f8275d0..4ce010ff 100644
--- a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
@@ -13,6 +13,7 @@ public function __construct(
         int $id,
         int $websiteId,
         string $url,
+        string $title,
         ?PageValue $nextPage,
         ?PageValue $prevPage,
         int $views,
@@ -21,7 +22,7 @@ public function __construct(
         string $country
     )
     {
-        parent::__construct($id, $websiteId, $url, $nextPage, $prevPage, $views, $level, $isLastPage);
+        parent::__construct($id, $websiteId, $url, $title,$nextPage, $prevPage, $views, $level, $isLastPage);
         $this->country = $country;
     }
 
@@ -36,6 +37,7 @@ public static function fromResult(array $result): self
             (int)$result['id'],
             (int)$result['websiteId'],
             (string)$result['url'],
+            (string)$result['title'],
             $result['nextPage'] === null ? null : new PageValue(
                 (int)$result['nextPage']['id'],
                 (string)$result['nextPage']['url']
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 5e8ca208..c6ce8bb8 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -50,12 +50,10 @@ public function aggregate(Visit $visit)
             $visit->page->url,
             $level
         );
-        $countryAggregate = null;
 
         if (!$countryAggregate) {
             $countryAggregate = $this->createCountryAggregate($visit, $level, $previousVisit);
             $countryAggregate = $this->countryRepository->save($countryAggregate);
-            dd($countryAggregate);
         }
     }
 
@@ -101,6 +99,7 @@ private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit
             $currentVisit->id,
             $website->id,
             $page->url,
+            $page->name,
             $nextPage,
             $prevPage,
             $views,

From 48dfaefc1a1ecefbd8f8023cc3d6093bc7bebbf7 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Wed, 4 Sep 2019 19:56:11 +0300
Subject: [PATCH 007/183] fix getByParams method

---
 .../app/Aggregates/VisitorsFlow/Aggregate.php |  7 -----
 .../VisitorsFlow/CountryAggregate.php         |  7 +----
 .../Contracts/CountryRepository.php           |  2 +-
 .../ElasticsearchCountryRepository.php        | 26 ++++++-------------
 .../VisitorsFlow/FlowAggregateService.php     |  9 ++++---
 5 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/backend/app/Aggregates/VisitorsFlow/Aggregate.php b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
index 1c1c2ccc..e17ddd0e 100644
--- a/backend/app/Aggregates/VisitorsFlow/Aggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
@@ -11,7 +11,6 @@ abstract class Aggregate
     public $websiteId;
     public $url;
     public $title;
-    public $nextPage;
     public $prevPage;
     public $views;
     public $level;
@@ -22,7 +21,6 @@ public function __construct(
         int $websiteId,
         string $url,
         string $title,
-        ?PageValue $nextPage,
         ?PageValue $prevPage,
         int $views,
         int $level,
@@ -33,7 +31,6 @@ public function __construct(
         $this->websiteId = $websiteId;
         $this->url = $url;
         $this->title = $title;
-        $this->nextPage = $nextPage;
         $this->prevPage = $prevPage;
         $this->views = $views;
         $this->level = $level;
@@ -47,10 +44,6 @@ public function toArray(): array
             'websiteId' => $this->websiteId,
             'url' => $this->url,
             'title'=>$this->title,
-            'nextPage' => $this->nextPage === null ? null : [
-                'id' => $this->nextPage->id,
-                'url' => $this->nextPage->url
-            ],
             'prevPage' => $this->prevPage === null ? null : [
                 'id' => $this->prevPage->id,
                 'url' => $this->prevPage->url
diff --git a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
index 4ce010ff..4005686e 100644
--- a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
@@ -14,7 +14,6 @@ public function __construct(
         int $websiteId,
         string $url,
         string $title,
-        ?PageValue $nextPage,
         ?PageValue $prevPage,
         int $views,
         int $level,
@@ -22,7 +21,7 @@ public function __construct(
         string $country
     )
     {
-        parent::__construct($id, $websiteId, $url, $title,$nextPage, $prevPage, $views, $level, $isLastPage);
+        parent::__construct($id, $websiteId, $url, $title, $prevPage, $views, $level, $isLastPage);
         $this->country = $country;
     }
 
@@ -38,10 +37,6 @@ public static function fromResult(array $result): self
             (int)$result['websiteId'],
             (string)$result['url'],
             (string)$result['title'],
-            $result['nextPage'] === null ? null : new PageValue(
-                (int)$result['nextPage']['id'],
-                (string)$result['nextPage']['url']
-            ),
             $result['prevPage'] === null ? null : new PageValue(
                 (int)$result['prevPage']['id'],
                 (string)$result['prevPage']['url']
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php
index 2c658f42..ace71092 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php
@@ -14,5 +14,5 @@ public function update(Aggregate $tableAggregate): Aggregate;
 
     public function getById(int $id): CountryAggregate;
 
-    public function getByParams(int $websiteId, string $url, int $level);
+    public function getByParams(int $websiteId, string $url, int $level): ?CountryAggregate;
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchCountryRepository.php
index a8e2e4cc..442c22a5 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchCountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchCountryRepository.php
@@ -36,25 +36,13 @@ public function update(Aggregate $countryAggregate): Aggregate
             'index' => self::INDEX_NAME,
             'id' => $countryAggregate->getId(),
             'type' => '_doc',
-            'body' => [
-                'doc' => $countryAggregate->toArray()
-            ]
+            'body' => $countryAggregate->toArray()
         ]);
 
         return $countryAggregate;
     }
 
-    public function getById(int $id): CountryAggregate
-    {
-//        $result = $this->client->get([
-//            'index' => self::INDEX_NAME,
-//            'type' => '_doc',
-//            'id' => $id
-//        ]);
-//        return CountryAggregate::fromResult($result['_source']);
-    }
-
-    public function getByParams(int $websiteId, string $url, int $level)
+    public function getByParams(int $websiteId, string $url, int $level):?CountryAggregate
     {
         $params = [
             'index' => self::INDEX_NAME,
@@ -63,9 +51,12 @@ public function getByParams(int $websiteId, string $url, int $level)
                     'bool' => [
                         'must' => [
                             ['match' => ['websiteId' => $websiteId]],
-                            ['match' => ['level' => $level]],
-                            ['match' => ['url' => $url]],
-                        ]
+                        ],
+                        'filter' => [
+                            ['term' => ['level' => $level]],
+                            ['match_phrase' => ['url' => $url]],
+                        ],
+
                     ]
                 ]
             ]
@@ -78,7 +69,6 @@ public function getByParams(int $websiteId, string $url, int $level)
         if (empty($result['hits']['hits'])) {
             return null;
         }
-        //доделать!!!!!
         return CountryAggregate::fromResult($result['hits']['hits'][0]['_source']);
     }
 
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index c6ce8bb8..1123bea3 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -50,10 +50,14 @@ public function aggregate(Visit $visit)
             $visit->page->url,
             $level
         );
-
         if (!$countryAggregate) {
             $countryAggregate = $this->createCountryAggregate($visit, $level, $previousVisit);
             $countryAggregate = $this->countryRepository->save($countryAggregate);
+            dd($countryAggregate);
+        } else {
+           $countryAggregate->views++;
+            $countryAggregate = $this->countryRepository->update($countryAggregate);
+            dd($countryAggregate);
         }
     }
 
@@ -78,7 +82,6 @@ private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit
         $page = $this->pageRepository->getById($currentVisit->page_id);
         $website = $this->websiteRepository->getById($page->website_id);
         $geoPosition = $this->geoPositionRepository->getById($currentVisit->geo_position_id);
-        $nextPage = null;
         $prevPage = null;
         if ($level !== 1) {
             //get previous aggregate
@@ -87,7 +90,6 @@ private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit
                 $previousVisit->page->url,
                 $level - 1
             );
-            $previousAggregate->nextPage = new PageValue($currentVisit->id, $currentVisit->page->url);
             $previousAggregate->isLastPage = false;
             $this->countryRepository->update($previousAggregate);
             $prevPage = new PageValue($previousVisit->id, $previousAggregate->url);
@@ -100,7 +102,6 @@ private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit
             $website->id,
             $page->url,
             $page->name,
-            $nextPage,
             $prevPage,
             $views,
             $level,

From 17015d3cfa72c6078a76eceba3750922d0299167 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Wed, 4 Sep 2019 19:59:59 +0300
Subject: [PATCH 008/183] remove getById method

---
 .../Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php
index ace71092..40fece2a 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php
@@ -12,7 +12,5 @@ public function save(Aggregate $tableAggregate): Aggregate;
 
     public function update(Aggregate $tableAggregate): Aggregate;
 
-    public function getById(int $id): CountryAggregate;
-
     public function getByParams(int $websiteId, string $url, int $level): ?CountryAggregate;
 }

From 148ca41184be2108ec94e2139b960713577e7590 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Wed, 4 Sep 2019 22:50:58 +0300
Subject: [PATCH 009/183] add aggregates

---
 .../app/Aggregates/VisitorsFlow/Aggregate.php |  9 ++--
 .../VisitorsFlow/CountryAggregate.php         | 16 ++++----
 .../VisitorsFlow/DeviceAggregate.php          | 41 +++++++++++++++++--
 .../VisitorsFlow/ScreenAggregate.php          | 31 +++++++++++---
 .../VisitorsFlow/SystemAggregate.php          | 27 ++++++++++--
 backend/app/Providers/AppServiceProvider.php  |  6 +--
 ...y.php => VisitorFlowCountryRepository.php} |  2 +-
 ...ticsearchVisitorFlowCountryRepository.php} |  4 +-
 .../VisitorsFlow/FlowAggregateService.php     |  8 ++--
 readme.md                                     |  3 +-
 10 files changed, 112 insertions(+), 35 deletions(-)
 rename backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/{CountryRepository.php => VisitorFlowCountryRepository.php} (91%)
 rename backend/app/Repositories/Elasticsearch/VisitorsFlow/{ElasticsearchCountryRepository.php => ElasticsearchVisitorFlowCountryRepository.php} (91%)

diff --git a/backend/app/Aggregates/VisitorsFlow/Aggregate.php b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
index e17ddd0e..98d32661 100644
--- a/backend/app/Aggregates/VisitorsFlow/Aggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
@@ -21,20 +21,21 @@ public function __construct(
         int $websiteId,
         string $url,
         string $title,
-        ?PageValue $prevPage,
         int $views,
         int $level,
-        bool $isLastPage
+        bool $isLastPage,
+        ?PageValue $prevPage
     )
     {
         $this->id = $id;
         $this->websiteId = $websiteId;
         $this->url = $url;
         $this->title = $title;
-        $this->prevPage = $prevPage;
         $this->views = $views;
         $this->level = $level;
         $this->isLastPage = $isLastPage;
+        $this->prevPage = $prevPage;
+
     }
 
     public function toArray(): array
@@ -43,7 +44,7 @@ public function toArray(): array
             'id' => $this->id,
             'websiteId' => $this->websiteId,
             'url' => $this->url,
-            'title'=>$this->title,
+            'title' => $this->title,
             'prevPage' => $this->prevPage === null ? null : [
                 'id' => $this->prevPage->id,
                 'url' => $this->prevPage->url
diff --git a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
index 4005686e..2d256bee 100644
--- a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
@@ -14,14 +14,14 @@ public function __construct(
         int $websiteId,
         string $url,
         string $title,
-        ?PageValue $prevPage,
         int $views,
         int $level,
         bool $isLastPage,
-        string $country
+        string $country,
+        ?PageValue $prevPage
     )
     {
-        parent::__construct($id, $websiteId, $url, $title, $prevPage, $views, $level, $isLastPage);
+        parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $prevPage);
         $this->country = $country;
     }
 
@@ -37,14 +37,14 @@ public static function fromResult(array $result): self
             (int)$result['websiteId'],
             (string)$result['url'],
             (string)$result['title'],
-            $result['prevPage'] === null ? null : new PageValue(
-                (int)$result['prevPage']['id'],
-                (string)$result['prevPage']['url']
-            ),
             (int)$result['views'],
             (int)$result['level'],
             (bool)$result['isLastPage'],
-            (string)$result['country']
+            (string)$result['country'],
+            $result['prevPage'] === null ? null : new PageValue(
+                (int)$result['prevPage']['id'],
+                (string)$result['prevPage']['url']
+            )
         );
     }
 }
diff --git a/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php b/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
index 258ec00e..17d26385 100644
--- a/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
@@ -3,13 +3,48 @@
 
 namespace App\Aggregates\VisitorsFlow;
 
-use App\Aggregates\Contracts\Aggregate;
+use App\Aggregates\VisitorsFlow\Values\PageValue;
 
-class DeviceAggregate implements Aggregate
+class DeviceAggregate extends Aggregate
 {
+    public $device;
+
+    public function __construct(
+        int $id,
+        int $websiteId,
+        string $url,
+        string $title,
+        int $views,
+        int $level,
+        bool $isLastPage,
+        string $device,
+        ?PageValue $prevPage
+    )
+    {
+        parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $prevPage);
+        $this->$device = $device;
+    }
+
     public function toArray(): array
     {
-        // TODO: Implement toArray() method.
+        return array_merge(parent::toArray(), ['device' => $this->device]);
     }
 
+    public static function fromResult(array $result): self
+    {
+        return new self(
+            (int)$result['id'],
+            (int)$result['websiteId'],
+            (string)$result['url'],
+            (string)$result['title'],
+            (int)$result['views'],
+            (int)$result['level'],
+            (bool)$result['isLastPage'],
+            (string)$result['device'],
+            $result['prevPage'] === null ? null : new PageValue(
+                (int)$result['prevPage']['id'],
+                (string)$result['prevPage']['url']
+            )
+        );
+    }
 }
diff --git a/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php b/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
index ad4af2ac..66f4c702 100644
--- a/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
@@ -11,17 +11,19 @@ class ScreenAggregate extends Aggregate
     public $resolutionHeight;
 
     public function __construct(
+        int $id,
         int $websiteId,
         string $url,
-        PageValue $nextPage,
-        PageValue $prevPage,
+        string $title,
         int $views,
         int $level,
         bool $isLastPage,
         int $resolutionWidth,
-        int $resolutionHeight
-    ) {
-        parent::__construct($websiteId, $url, $nextPage, $prevPage, $views, $level, $isLastPage);
+        int $resolutionHeight,
+        ?PageValue $prevPage
+    )
+    {
+        parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $prevPage);
         $this->resolutionWidth = $resolutionWidth;
         $this->resolutionHeight = $resolutionHeight;
     }
@@ -33,4 +35,23 @@ public function toArray(): array
             'resolution_height' => $this->resolutionHeight
         ]);
     }
+
+    public static function fromResult(array $result): self
+    {
+        return new self(
+            (int)$result['id'],
+            (int)$result['websiteId'],
+            (string)$result['url'],
+            (string)$result['title'],
+            (int)$result['views'],
+            (int)$result['level'],
+            (bool)$result['isLastPage'],
+            (int)$result['resolution_width'],
+            (int)$result['resolution_height'],
+            $result['prevPage'] === null ? null : new PageValue(
+                (int)$result['prevPage']['id'],
+                (string)$result['prevPage']['url']
+            )
+        );
+    }
 }
diff --git a/backend/app/Aggregates/VisitorsFlow/SystemAggregate.php b/backend/app/Aggregates/VisitorsFlow/SystemAggregate.php
index 5162f61b..127b6ce6 100644
--- a/backend/app/Aggregates/VisitorsFlow/SystemAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/SystemAggregate.php
@@ -10,16 +10,17 @@ class SystemAggregate extends Aggregate
     public $system;
 
     public function __construct(
+        int $id,
         int $websiteId,
         string $url,
-        PageValue $nextPage,
-        PageValue $prevPage,
+        string $title,
         int $views,
         int $level,
         bool $isLastPage,
-        string $system
+        string $system,
+        ?PageValue $prevPage
     ) {
-        parent::__construct($websiteId, $url, $nextPage, $prevPage, $views, $level, $isLastPage);
+        parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $prevPage);
         $this->system = $system;
     }
 
@@ -27,4 +28,22 @@ public function toArray(): array
     {
         return array_merge(parent::toArray(), ['system' => $this->system]);
     }
+
+    public static function fromResult(array $result): self
+    {
+        return new self(
+            (int)$result['id'],
+            (int)$result['websiteId'],
+            (string)$result['url'],
+            (string)$result['title'],
+            (int)$result['views'],
+            (int)$result['level'],
+            (bool)$result['isLastPage'],
+            (string)$result['system'],
+            $result['prevPage'] === null ? null : new PageValue(
+                (int)$result['prevPage']['id'],
+                (string)$result['prevPage']['url']
+            )
+        );
+    }
 }
diff --git a/backend/app/Providers/AppServiceProvider.php b/backend/app/Providers/AppServiceProvider.php
index bc3d5432..771f1030 100644
--- a/backend/app/Providers/AppServiceProvider.php
+++ b/backend/app/Providers/AppServiceProvider.php
@@ -22,8 +22,8 @@
 use App\Repositories\Contracts\VisitRepository;
 use App\Repositories\Contracts\WebsiteRepository;
 use App\Repositories\Contracts\PageViews\ChartDataRepository;
-use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\CountryRepository;
-use App\Repositories\Elasticsearch\VisitorsFlow\ElasticsearchCountryRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\ElasticsearchVisitorFlowCountryRepository;
 use App\Repositories\EloquentChartPageTimingRepository;
 use App\Repositories\EloquentChartVisitorRepository;
 use App\Repositories\EloquentButtonVisitorsRepository;
@@ -101,7 +101,7 @@ public function register()
 
         $this->app->bind(ChartPageTimingRepository::class, EloquentChartPageTimingRepository::class);
 
-        $this->app->bind(CountryRepository::class,ElasticsearchCountryRepository::class);
+        $this->app->bind(VisitorFlowCountryRepository::class,ElasticsearchVisitorFlowCountryRepository::class);
     }
 
     /**
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php
similarity index 91%
rename from backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php
rename to backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php
index 40fece2a..a2e64a2b 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/CountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php
@@ -6,7 +6,7 @@
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\CountryAggregate;
 
-interface CountryRepository
+interface VisitorFlowCountryRepository
 {
     public function save(Aggregate $tableAggregate): Aggregate;
 
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
similarity index 91%
rename from backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchCountryRepository.php
rename to backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
index 442c22a5..509b78b3 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchCountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
@@ -5,10 +5,10 @@
 
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\CountryAggregate;
-use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\CountryRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
 use Cviebrock\LaravelElasticsearch\Manager as ElasticsearchManager;
 
-final class ElasticsearchCountryRepository implements CountryRepository
+final class ElasticsearchVisitorFlowCountryRepository implements VisitorFlowCountryRepository
 {
     const INDEX_NAME = 'country-visitors-flow';
     private $client;
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 1123bea3..45cfef59 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -10,7 +10,7 @@
 use App\Repositories\Contracts\PageRepository;
 use App\Repositories\Contracts\VisitRepository;
 use App\Repositories\Contracts\WebsiteRepository;
-use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\CountryRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
 use Carbon\Carbon;
 
 final class FlowAggregateService
@@ -24,7 +24,7 @@ final class FlowAggregateService
     public function __construct(
         PageRepository $pageRepository,
         VisitRepository $visitRepository,
-        CountryRepository $countryRepository,
+        VisitorFlowCountryRepository $countryRepository,
         WebsiteRepository $websiteRepository,
         GeoPositionRepository $geoPositionRepository
     )
@@ -102,11 +102,11 @@ private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit
             $website->id,
             $page->url,
             $page->name,
-            $prevPage,
             $views,
             $level,
             $isLatPage,
-            $geoPosition->country
+            $geoPosition->country,
+            $prevPage
         );
     }
 }
diff --git a/readme.md b/readme.md
index efeeaf47..d56f2372 100644
--- a/readme.md
+++ b/readme.md
@@ -43,7 +43,8 @@ cp docker-compose.override.yml.windows docker-compose.override.yml
 cp .env.example .env
 docker-compose up -d
 
-c
+docker-compose exec app composer install
+
 docker-compose exec app php artisan key:generate
 docker-compose exec app php artisan jwt:secret
 docker-compose exec app php artisan migrate --seed

From e51a79500ab9094e8f0ce000ca7ed7b19ed4d1d4 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Thu, 5 Sep 2019 01:12:28 +0300
Subject: [PATCH 010/183] add visitorFlowBrowserRespoistory

---
 .../app/Aggregates/VisitorsFlow/Aggregate.php |  2 +
 ...stemAggregate.php => BrowserAggregate.php} | 16 ++--
 .../VisitorsFlow/CountryAggregate.php         |  4 +-
 .../VisitorsFlow/DeviceAggregate.php          |  4 +-
 .../VisitorsFlow/ScreenAggregate.php          |  4 +-
 backend/app/Providers/AppServiceProvider.php  |  6 +-
 .../VisitorsFlow/Contracts/Criteria.php       |  9 ++
 .../VisitorFlowBrowserRepository.php          | 16 ++++
 .../VisitorFlowCountryRepository.php          |  2 +-
 ...sticsearchVisitorFlowBrowserRepository.php | 83 ++++++++++++++++++
 ...sticsearchVisitorFlowCountryRepository.php | 41 +++++----
 .../VisitorsFlow/FlowAggregateService.php     | 84 +++++++++++++++----
 12 files changed, 223 insertions(+), 48 deletions(-)
 rename backend/app/Aggregates/VisitorsFlow/{SystemAggregate.php => BrowserAggregate.php} (74%)
 create mode 100644 backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php
 create mode 100644 backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php
 create mode 100644 backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php

diff --git a/backend/app/Aggregates/VisitorsFlow/Aggregate.php b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
index 98d32661..26e68c3a 100644
--- a/backend/app/Aggregates/VisitorsFlow/Aggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
@@ -59,4 +59,6 @@ public function getId(): int
     {
         return $this->id;
     }
+
+    public abstract static function fromResult(array $result): self;
 }
diff --git a/backend/app/Aggregates/VisitorsFlow/SystemAggregate.php b/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
similarity index 74%
rename from backend/app/Aggregates/VisitorsFlow/SystemAggregate.php
rename to backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
index 127b6ce6..0f20483a 100644
--- a/backend/app/Aggregates/VisitorsFlow/SystemAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
@@ -5,9 +5,9 @@
 
 use App\Aggregates\VisitorsFlow\Values\PageValue;
 
-class SystemAggregate extends Aggregate
+class BrowserAggregate extends Aggregate
 {
-    public $system;
+    public $browser;
 
     public function __construct(
         int $id,
@@ -17,21 +17,21 @@ public function __construct(
         int $views,
         int $level,
         bool $isLastPage,
-        string $system,
+        string $browser,
         ?PageValue $prevPage
     ) {
         parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $prevPage);
-        $this->system = $system;
+        $this->browser = $browser;
     }
 
     public function toArray(): array
     {
-        return array_merge(parent::toArray(), ['system' => $this->system]);
+        return array_merge(parent::toArray(), ['browser' => $this->browser]);
     }
 
-    public static function fromResult(array $result): self
+    public static function fromResult(array $result): Aggregate
     {
-        return new self(
+        return new static(
             (int)$result['id'],
             (int)$result['websiteId'],
             (string)$result['url'],
@@ -39,7 +39,7 @@ public static function fromResult(array $result): self
             (int)$result['views'],
             (int)$result['level'],
             (bool)$result['isLastPage'],
-            (string)$result['system'],
+            (string)$result['browser'],
             $result['prevPage'] === null ? null : new PageValue(
                 (int)$result['prevPage']['id'],
                 (string)$result['prevPage']['url']
diff --git a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
index 2d256bee..a47a816a 100644
--- a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
@@ -30,9 +30,9 @@ public function toArray(): array
         return array_merge(parent::toArray(), ['country' => $this->country]);
     }
 
-    public static function fromResult(array $result): self
+    public static function fromResult(array $result): Aggregate
     {
-        return new self(
+        return new static(
             (int)$result['id'],
             (int)$result['websiteId'],
             (string)$result['url'],
diff --git a/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php b/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
index 17d26385..86f4f41a 100644
--- a/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
@@ -30,9 +30,9 @@ public function toArray(): array
         return array_merge(parent::toArray(), ['device' => $this->device]);
     }
 
-    public static function fromResult(array $result): self
+    public static function fromResult(array $result): Aggregate
     {
-        return new self(
+        return new static(
             (int)$result['id'],
             (int)$result['websiteId'],
             (string)$result['url'],
diff --git a/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php b/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
index 66f4c702..d577351a 100644
--- a/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
@@ -36,9 +36,9 @@ public function toArray(): array
         ]);
     }
 
-    public static function fromResult(array $result): self
+    public static function fromResult(array $result): Aggregate
     {
-        return new self(
+        return new static(
             (int)$result['id'],
             (int)$result['websiteId'],
             (string)$result['url'],
diff --git a/backend/app/Providers/AppServiceProvider.php b/backend/app/Providers/AppServiceProvider.php
index 771f1030..dd621359 100644
--- a/backend/app/Providers/AppServiceProvider.php
+++ b/backend/app/Providers/AppServiceProvider.php
@@ -22,7 +22,9 @@
 use App\Repositories\Contracts\VisitRepository;
 use App\Repositories\Contracts\WebsiteRepository;
 use App\Repositories\Contracts\PageViews\ChartDataRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\ElasticsearchVisitorFlowBrowserRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\ElasticsearchVisitorFlowCountryRepository;
 use App\Repositories\EloquentChartPageTimingRepository;
 use App\Repositories\EloquentChartVisitorRepository;
@@ -101,7 +103,9 @@ public function register()
 
         $this->app->bind(ChartPageTimingRepository::class, EloquentChartPageTimingRepository::class);
 
-        $this->app->bind(VisitorFlowCountryRepository::class,ElasticsearchVisitorFlowCountryRepository::class);
+        $this->app->bind(VisitorFlowCountryRepository::class, ElasticsearchVisitorFlowCountryRepository::class);
+
+        $this->app->bind(VisitorFlowBrowserRepository::class, ElasticsearchVisitorFlowBrowserRepository::class);
     }
 
     /**
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php
new file mode 100644
index 00000000..fbaa74c1
--- /dev/null
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php
@@ -0,0 +1,9 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Repositories\Elasticsearch\VisitorsFlow\Contracts;
+
+interface Criteria
+{
+    public function getCriteria(int $websiteId, string $url, int $level, string $type): array;
+}
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php
new file mode 100644
index 00000000..cabb1192
--- /dev/null
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php
@@ -0,0 +1,16 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Repositories\Elasticsearch\VisitorsFlow\Contracts;
+
+use App\Aggregates\VisitorsFlow\Aggregate;
+use App\Aggregates\VisitorsFlow\BrowserAggregate;
+
+interface VisitorFlowBrowserRepository
+{
+    public function save(Aggregate $browserAggregate): Aggregate;
+
+    public function update(Aggregate $browserAggregate): Aggregate;
+
+    public function getByCriteria(int $websiteId, string $url, int $level, string $browser): ?BrowserAggregate;
+}
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php
index a2e64a2b..d9804792 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php
@@ -12,5 +12,5 @@ public function save(Aggregate $tableAggregate): Aggregate;
 
     public function update(Aggregate $tableAggregate): Aggregate;
 
-    public function getByParams(int $websiteId, string $url, int $level): ?CountryAggregate;
+    public function getByCriteria(int $websiteId, string $url, int $level, string $country): ?CountryAggregate;
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
new file mode 100644
index 00000000..b08a58de
--- /dev/null
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
@@ -0,0 +1,83 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Repositories\Elasticsearch\VisitorsFlow;
+
+use App\Aggregates\VisitorsFlow\Aggregate;
+use App\Aggregates\VisitorsFlow\BrowserAggregate;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
+use Cviebrock\LaravelElasticsearch\Manager as ElasticsearchManager;
+
+class ElasticsearchVisitorFlowBrowserRepository implements
+    VisitorFlowBrowserRepository,
+    Criteria
+{
+    const INDEX_NAME = 'browser-visitors-flow';
+    private $client;
+
+    public function __construct(ElasticsearchManager $client)
+    {
+        $this->client = $client;
+    }
+
+    public function save(Aggregate $countryAggregate): Aggregate
+    {
+        $this->client->index([
+            'index' => self::INDEX_NAME,
+            'id' => $countryAggregate->getId(),
+            'type' => '_doc',
+            'body' => $countryAggregate->toArray()
+        ]);
+
+        return $countryAggregate;
+    }
+
+    public function update(Aggregate $countryAggregate): Aggregate
+    {
+        $this->client->index([
+            'index' => self::INDEX_NAME,
+            'id' => $countryAggregate->getId(),
+            'type' => '_doc',
+            'body' => $countryAggregate->toArray()
+        ]);
+
+        return $countryAggregate;
+    }
+
+    public function getCriteria(int $websiteId, string $url, int $level,string $browser): array
+    {
+        return [
+            'query' => [
+                'bool' => [
+                    'must' => [
+                        ['match' => ['websiteId' => $websiteId]],
+                    ],
+                    'filter' => [
+                        ['term' => ['level' => $level]],
+                        ['match_phrase' => ['url' => $url]],
+                        ['match_phrase' => ['browser' => $browser]],
+
+                    ],
+                ]
+            ]
+        ];
+    }
+
+    public function getByCriteria(int $websiteId, string $url, int $level,string $browser): ?BrowserAggregate
+    {
+        $params = [
+            'index' => self::INDEX_NAME,
+            'body' => $this->getCriteria($websiteId, $url, $level)
+        ];
+        try {
+            $result = $this->client->search($params);
+        } catch (\Exception $exception) {
+            return null;
+        }
+        if (empty($result['hits']['hits'])) {
+            return null;
+        }
+        return BrowserAggregate::fromResult($result['hits']['hits'][0]['_source']);
+    }
+}
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
index 509b78b3..7bf528f0 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
@@ -5,10 +5,13 @@
 
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\CountryAggregate;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
 use Cviebrock\LaravelElasticsearch\Manager as ElasticsearchManager;
 
-final class ElasticsearchVisitorFlowCountryRepository implements VisitorFlowCountryRepository
+final class ElasticsearchVisitorFlowCountryRepository implements
+    VisitorFlowCountryRepository,
+    Criteria
 {
     const INDEX_NAME = 'country-visitors-flow';
     private $client;
@@ -42,25 +45,30 @@ public function update(Aggregate $countryAggregate): Aggregate
         return $countryAggregate;
     }
 
-    public function getByParams(int $websiteId, string $url, int $level):?CountryAggregate
+    public function getCriteria(int $websiteId, string $url, int $level,string $country): array
     {
-        $params = [
-            'index' => self::INDEX_NAME,
-            'body' => [
-                'query' => [
-                    'bool' => [
-                        'must' => [
-                            ['match' => ['websiteId' => $websiteId]],
-                        ],
-                        'filter' => [
-                            ['term' => ['level' => $level]],
-                            ['match_phrase' => ['url' => $url]],
-                        ],
-
-                    ]
+        return [
+            'query' => [
+                'bool' => [
+                    'must' => [
+                        ['match' => ['websiteId' => $websiteId]],
+                    ],
+                    'filter' => [
+                        ['term' => ['level' => $level]],
+                        ['match_phrase' => ['url' => $url]],
+                        ['match_phrase' => ['country' => $country]],
+                    ],
                 ]
             ]
         ];
+    }
+
+    public function getByCriteria(int $websiteId, string $url, int $level,string $country): ?CountryAggregate
+    {
+        $params = [
+            'index' => self::INDEX_NAME,
+            'body' => $this->getCriteria($websiteId, $url, $level, $country)
+        ];
         try {
             $result = $this->client->search($params);
         } catch (\Exception $exception) {
@@ -71,5 +79,4 @@ public function getByParams(int $websiteId, string $url, int $level):?CountryAgg
         }
         return CountryAggregate::fromResult($result['hits']['hits'][0]['_source']);
     }
-
 }
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 45cfef59..6351085f 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -3,6 +3,7 @@
 
 namespace App\Services\VisitorsFlow;
 
+use App\Aggregates\VisitorsFlow\BrowserAggregate;
 use App\Aggregates\VisitorsFlow\CountryAggregate;
 use App\Aggregates\VisitorsFlow\Values\PageValue;
 use App\Entities\Visit;
@@ -10,6 +11,7 @@
 use App\Repositories\Contracts\PageRepository;
 use App\Repositories\Contracts\VisitRepository;
 use App\Repositories\Contracts\WebsiteRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
 use Carbon\Carbon;
 
@@ -17,23 +19,26 @@ final class FlowAggregateService
 {
     private $pageRepository;
     private $visitRepository;
-    private $countryRepository;
+    private $visitorFlowCountryRepository;
     private $websiteRepository;
     private $geoPositionRepository;
+    private $visitorFlowBrowserRepository;
 
     public function __construct(
         PageRepository $pageRepository,
         VisitRepository $visitRepository,
-        VisitorFlowCountryRepository $countryRepository,
+        VisitorFlowCountryRepository $visitorFlowCountryRepository,
         WebsiteRepository $websiteRepository,
-        GeoPositionRepository $geoPositionRepository
+        GeoPositionRepository $geoPositionRepository,
+        VisitorFlowBrowserRepository $visitorFlowBrowserRepository
     )
     {
         $this->pageRepository = $pageRepository;
         $this->visitRepository = $visitRepository;
-        $this->countryRepository = $countryRepository;
+        $this->visitorFlowCountryRepository = $visitorFlowCountryRepository;
         $this->websiteRepository = $websiteRepository;
         $this->geoPositionRepository = $geoPositionRepository;
+        $this->visitorFlowBrowserRepository = $visitorFlowBrowserRepository;
     }
 
     public function aggregate(Visit $visit)
@@ -45,19 +50,36 @@ public function aggregate(Visit $visit)
         } else {
             $level = 1;
         }
-        $countryAggregate = $this->countryRepository->getByParams(
+        $countryAggregate = $this->visitorFlowCountryRepository->getByCriteria(
             $visit->session->website_id,
             $visit->page->url,
-            $level
+            $level,
+            $visit->geo_position->country
+        );
+        $browserAggregate = $this->visitorFlowBrowserRepository->getByCriteria(
+            $visit->session->website_id,
+            $visit->page->url,
+            $level,
+            $visit->session->system->browser
         );
         if (!$countryAggregate) {
             $countryAggregate = $this->createCountryAggregate($visit, $level, $previousVisit);
-            $countryAggregate = $this->countryRepository->save($countryAggregate);
-            dd($countryAggregate);
+            $countryAggregate = $this->visitorFlowCountryRepository->save($countryAggregate);
+//            dd($countryAggregate);
         } else {
-           $countryAggregate->views++;
-            $countryAggregate = $this->countryRepository->update($countryAggregate);
-            dd($countryAggregate);
+            $countryAggregate->views++;
+            $countryAggregate = $this->visitorFlowCountryRepository->update($countryAggregate);
+//            dd($countryAggregate);
+        }
+
+        if (!$browserAggregate) {
+            $browserAggregate = $this->createBrowserAggregate($visit, $level, $previousVisit);
+            $browserAggregate = $this->visitorFlowBrowserRepository->save($browserAggregate);
+            dd($browserAggregate);
+        } else {
+           $browserAggregate->views++;
+            $browserAggregate = $this->visitorFlowBrowserRepository->update($browserAggregate);
+            dd($browserAggregate);
         }
     }
 
@@ -84,14 +106,14 @@ private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit
         $geoPosition = $this->geoPositionRepository->getById($currentVisit->geo_position_id);
         $prevPage = null;
         if ($level !== 1) {
-            //get previous aggregate
-            $previousAggregate = $this->countryRepository->getByParams(
+            $previousAggregate = $this->visitorFlowCountryRepository->getByCriteria(
                 $previousVisit->session->website_id,
                 $previousVisit->page->url,
-                $level - 1
+                $level - 1,
+                $previousVisit->geo_position->country
             );
             $previousAggregate->isLastPage = false;
-            $this->countryRepository->update($previousAggregate);
+            $this->visitorFlowCountryRepository->update($previousAggregate);
             $prevPage = new PageValue($previousVisit->id, $previousAggregate->url);
         }
 
@@ -109,4 +131,36 @@ private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit
             $prevPage
         );
     }
+
+    private function createBrowserAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): BrowserAggregate
+    {
+        $page = $this->pageRepository->getById($currentVisit->page_id);
+        $website = $this->websiteRepository->getById($page->website_id);
+        $prevPage = null;
+        if ($level !== 1) {
+            $previousAggregate = $this->visitorFlowBrowserRepository->getByCriteria(
+                $previousVisit->session->website_id,
+                $previousVisit->page->url,
+                $level - 1,
+                $currentVisit->session->system->browser
+            );
+            $previousAggregate->isLastPage = false;
+            $this->visitorFlowBrowserRepository->update($previousAggregate);
+            $prevPage = new PageValue($previousVisit->id, $previousAggregate->url);
+        }
+
+        $isLatPage = true;
+        $views = 1;
+        return new BrowserAggregate(
+            $currentVisit->id,
+            $website->id,
+            $page->url,
+            $page->name,
+            $views,
+            $level,
+            $isLatPage,
+            $currentVisit->session->system->browser,
+            $prevPage
+        );
+    }
 }

From c1ef132e83ce604fa96a16e40c12803d6d401572 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Thu, 5 Sep 2019 02:55:52 +0300
Subject: [PATCH 011/183] fix CountryAggregate

---
 .../VisitorsFlow/Contracts/Criteria.php       |  2 +-
 .../VisitorFlowBrowserRepository.php          |  2 +-
 .../VisitorFlowCountryRepository.php          |  2 +-
 .../VisitorsFlow/CountryCriteria.php          | 33 ++++++++++++
 ...sticsearchVisitorFlowBrowserRepository.php | 39 ++++++--------
 ...sticsearchVisitorFlowCountryRepository.php | 38 ++++++-------
 .../VisitorsFlow/FlowAggregateService.php     | 54 ++++++++++---------
 7 files changed, 98 insertions(+), 72 deletions(-)
 create mode 100644 backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php

diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php
index fbaa74c1..cee0efc9 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php
@@ -5,5 +5,5 @@
 
 interface Criteria
 {
-    public function getCriteria(int $websiteId, string $url, int $level, string $type): array;
+    public static function getCriteria(int $websiteId, string $url, int $level, string $type);
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php
index cabb1192..d17a45a4 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php
@@ -12,5 +12,5 @@ public function save(Aggregate $browserAggregate): Aggregate;
 
     public function update(Aggregate $browserAggregate): Aggregate;
 
-    public function getByCriteria(int $websiteId, string $url, int $level, string $browser): ?BrowserAggregate;
+    public function getByCriteria(Criteria $criteria): ?BrowserAggregate;
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php
index d9804792..79ef8cf1 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php
@@ -12,5 +12,5 @@ public function save(Aggregate $tableAggregate): Aggregate;
 
     public function update(Aggregate $tableAggregate): Aggregate;
 
-    public function getByCriteria(int $websiteId, string $url, int $level, string $country): ?CountryAggregate;
+    public function getByCriteria(Criteria $criteria): ?CountryAggregate;
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php
new file mode 100644
index 00000000..2f485a23
--- /dev/null
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php
@@ -0,0 +1,33 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Repositories\Elasticsearch\VisitorsFlow;
+
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
+
+class CountryCriteria implements Criteria
+{
+    public $websiteId;
+    public $url;
+    public $level;
+    public $country;
+
+    private function __construct(int $websiteId, string $url, int $level, string $country)
+    {
+        $this->websiteId = $websiteId;
+        $this->url = $url;
+        $this->level = $level;
+        $this->country = $country;
+    }
+
+    public static function getCriteria(int $websiteId, string $url, int $level, string $type)
+    {
+        return new static(
+            $websiteId,
+            $url,
+            $level,
+            $type
+        );
+    }
+
+}
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
index b08a58de..ec4e89d2 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
@@ -9,9 +9,7 @@
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
 use Cviebrock\LaravelElasticsearch\Manager as ElasticsearchManager;
 
-class ElasticsearchVisitorFlowBrowserRepository implements
-    VisitorFlowBrowserRepository,
-    Criteria
+class ElasticsearchVisitorFlowBrowserRepository implements VisitorFlowBrowserRepository
 {
     const INDEX_NAME = 'browser-visitors-flow';
     private $client;
@@ -45,30 +43,27 @@ public function update(Aggregate $countryAggregate): Aggregate
         return $countryAggregate;
     }
 
-    public function getCriteria(int $websiteId, string $url, int $level,string $browser): array
-    {
-        return [
-            'query' => [
-                'bool' => [
-                    'must' => [
-                        ['match' => ['websiteId' => $websiteId]],
-                    ],
-                    'filter' => [
-                        ['term' => ['level' => $level]],
-                        ['match_phrase' => ['url' => $url]],
-                        ['match_phrase' => ['browser' => $browser]],
 
-                    ],
-                ]
-            ]
-        ];
-    }
 
-    public function getByCriteria(int $websiteId, string $url, int $level,string $browser): ?BrowserAggregate
+    public function getByCriteria(Criteria $criteria): ?BrowserAggregate
     {
         $params = [
             'index' => self::INDEX_NAME,
-            'body' => $this->getCriteria($websiteId, $url, $level)
+            'body' => [
+                'query' => [
+                    'bool' => [
+                        'must' => [
+                            ['match' => ['websiteId' => $criteria->websiteId]],
+                        ],
+                        'filter' => [
+                            ['term' => ['level' => $criteria->level]],
+                            ['match_phrase' => ['url' => $criteria->url]],
+                            ['match_phrase' => ['browser' => $criteria->browser]],
+
+                        ],
+                    ]
+                ]
+            ]
         ];
         try {
             $result = $this->client->search($params);
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
index 7bf528f0..80547f54 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
@@ -9,9 +9,7 @@
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
 use Cviebrock\LaravelElasticsearch\Manager as ElasticsearchManager;
 
-final class ElasticsearchVisitorFlowCountryRepository implements
-    VisitorFlowCountryRepository,
-    Criteria
+final class ElasticsearchVisitorFlowCountryRepository implements VisitorFlowCountryRepository
 {
     const INDEX_NAME = 'country-visitors-flow';
     private $client;
@@ -45,29 +43,25 @@ public function update(Aggregate $countryAggregate): Aggregate
         return $countryAggregate;
     }
 
-    public function getCriteria(int $websiteId, string $url, int $level,string $country): array
-    {
-        return [
-            'query' => [
-                'bool' => [
-                    'must' => [
-                        ['match' => ['websiteId' => $websiteId]],
-                    ],
-                    'filter' => [
-                        ['term' => ['level' => $level]],
-                        ['match_phrase' => ['url' => $url]],
-                        ['match_phrase' => ['country' => $country]],
-                    ],
-                ]
-            ]
-        ];
-    }
 
-    public function getByCriteria(int $websiteId, string $url, int $level,string $country): ?CountryAggregate
+    public function getByCriteria(Criteria $criteria): ?CountryAggregate
     {
         $params = [
             'index' => self::INDEX_NAME,
-            'body' => $this->getCriteria($websiteId, $url, $level, $country)
+            'body' => [
+                'query' => [
+                    'bool' => [
+                        'must' => [
+                            ['match' => ['websiteId' => $criteria->websiteId]],
+                        ],
+                        'filter' => [
+                            ['term' => ['level' => $criteria->level]],
+                            ['match_phrase' => ['url' => $criteria->url]],
+                            ['match_phrase' => ['country' => $criteria->country]],
+                        ],
+                    ]
+                ]
+            ]
         ];
         try {
             $result = $this->client->search($params);
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 6351085f..bb6949a0 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -13,6 +13,7 @@
 use App\Repositories\Contracts\WebsiteRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\CountryCriteria;
 use Carbon\Carbon;
 
 final class FlowAggregateService
@@ -51,36 +52,37 @@ public function aggregate(Visit $visit)
             $level = 1;
         }
         $countryAggregate = $this->visitorFlowCountryRepository->getByCriteria(
-            $visit->session->website_id,
-            $visit->page->url,
-            $level,
-            $visit->geo_position->country
-        );
-        $browserAggregate = $this->visitorFlowBrowserRepository->getByCriteria(
-            $visit->session->website_id,
-            $visit->page->url,
-            $level,
-            $visit->session->system->browser
+            CountryCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level,
+                $visit->geo_position->country)
         );
+//        $browserAggregate = $this->visitorFlowBrowserRepository->getByCriteria(
+//            $visit->session->website_id,
+//            $visit->page->url,
+//            $level,
+//            $visit->session->system->browser
+//        );
         if (!$countryAggregate) {
             $countryAggregate = $this->createCountryAggregate($visit, $level, $previousVisit);
             $countryAggregate = $this->visitorFlowCountryRepository->save($countryAggregate);
-//            dd($countryAggregate);
+            dd($countryAggregate);
         } else {
             $countryAggregate->views++;
             $countryAggregate = $this->visitorFlowCountryRepository->update($countryAggregate);
-//            dd($countryAggregate);
+            dd($countryAggregate);
         }
 
-        if (!$browserAggregate) {
-            $browserAggregate = $this->createBrowserAggregate($visit, $level, $previousVisit);
-            $browserAggregate = $this->visitorFlowBrowserRepository->save($browserAggregate);
-            dd($browserAggregate);
-        } else {
-           $browserAggregate->views++;
-            $browserAggregate = $this->visitorFlowBrowserRepository->update($browserAggregate);
-            dd($browserAggregate);
-        }
+//        if (!$browserAggregate) {
+//            $browserAggregate = $this->createBrowserAggregate($visit, $level, $previousVisit);
+//            $browserAggregate = $this->visitorFlowBrowserRepository->save($browserAggregate);
+//            dd($browserAggregate);
+//        } else {
+//            $browserAggregate->views++;
+//            $browserAggregate = $this->visitorFlowBrowserRepository->update($browserAggregate);
+//            dd($browserAggregate);
+//        }
     }
 
     private function getPreviousVisit(Visit $currentVisit): ?Visit
@@ -107,10 +109,12 @@ private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit
         $prevPage = null;
         if ($level !== 1) {
             $previousAggregate = $this->visitorFlowCountryRepository->getByCriteria(
-                $previousVisit->session->website_id,
-                $previousVisit->page->url,
-                $level - 1,
-                $previousVisit->geo_position->country
+                CountryCriteria::getCriteria(
+                    $previousVisit->session->website_id,
+                    $previousVisit->page->url,
+                    $level - 1,
+                    $previousVisit->geo_position->country
+                )
             );
             $previousAggregate->isLastPage = false;
             $this->visitorFlowCountryRepository->update($previousAggregate);

From 41e62bb5f7bf380179932b05f8db7bd7f497f0c3 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Thu, 5 Sep 2019 03:31:32 +0300
Subject: [PATCH 012/183] create browserCriteria

---
 .../VisitorsFlow/BrowserCriteria.php          | 32 +++++++++++++
 .../VisitorsFlow/CountryCriteria.php          |  1 -
 ...sticsearchVisitorFlowBrowserRepository.php | 18 ++++----
 .../VisitorsFlow/FlowAggregateService.php     | 46 ++++++++++---------
 4 files changed, 65 insertions(+), 32 deletions(-)
 create mode 100644 backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php

diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php
new file mode 100644
index 00000000..a145713e
--- /dev/null
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php
@@ -0,0 +1,32 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Repositories\Elasticsearch\VisitorsFlow;
+
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
+
+class BrowserCriteria implements  Criteria
+{
+    public $websiteId;
+    public $url;
+    public $level;
+    public $browser;
+
+    private function __construct(int $websiteId, string $url, int $level, string $browser)
+    {
+        $this->websiteId = $websiteId;
+        $this->url = $url;
+        $this->level = $level;
+        $this->browser = $browser;
+    }
+
+    public static function getCriteria(int $websiteId, string $url, int $level, string $type)
+    {
+        return new static(
+            $websiteId,
+            $url,
+            $level,
+            $type
+        );
+    }
+}
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php
index 2f485a23..b08e9709 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php
@@ -29,5 +29,4 @@ public static function getCriteria(int $websiteId, string $url, int $level, stri
             $type
         );
     }
-
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
index ec4e89d2..c70af296 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
@@ -19,32 +19,31 @@ public function __construct(ElasticsearchManager $client)
         $this->client = $client;
     }
 
-    public function save(Aggregate $countryAggregate): Aggregate
+    public function save(Aggregate $browserAggregate): Aggregate
     {
         $this->client->index([
             'index' => self::INDEX_NAME,
-            'id' => $countryAggregate->getId(),
+            'id' => $browserAggregate->getId(),
             'type' => '_doc',
-            'body' => $countryAggregate->toArray()
+            'body' => $browserAggregate->toArray()
         ]);
 
-        return $countryAggregate;
+        return $browserAggregate;
     }
 
-    public function update(Aggregate $countryAggregate): Aggregate
+    public function update(Aggregate $browserAggregate): Aggregate
     {
         $this->client->index([
             'index' => self::INDEX_NAME,
-            'id' => $countryAggregate->getId(),
+            'id' => $browserAggregate->getId(),
             'type' => '_doc',
-            'body' => $countryAggregate->toArray()
+            'body' => $browserAggregate->toArray()
         ]);
 
-        return $countryAggregate;
+        return $browserAggregate;
     }
 
 
-
     public function getByCriteria(Criteria $criteria): ?BrowserAggregate
     {
         $params = [
@@ -59,7 +58,6 @@ public function getByCriteria(Criteria $criteria): ?BrowserAggregate
                             ['term' => ['level' => $criteria->level]],
                             ['match_phrase' => ['url' => $criteria->url]],
                             ['match_phrase' => ['browser' => $criteria->browser]],
-
                         ],
                     ]
                 ]
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index bb6949a0..67d83dfc 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -11,6 +11,7 @@
 use App\Repositories\Contracts\PageRepository;
 use App\Repositories\Contracts\VisitRepository;
 use App\Repositories\Contracts\WebsiteRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\BrowserCriteria;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\CountryCriteria;
@@ -44,6 +45,7 @@ public function __construct(
 
     public function aggregate(Visit $visit)
     {
+        dd($visit);
         $previousVisit = $this->getPreviousVisit($visit);
         $isFirstInSession = $previousVisit === null;
         if (!$isFirstInSession) {
@@ -58,31 +60,31 @@ public function aggregate(Visit $visit)
                 $level,
                 $visit->geo_position->country)
         );
-//        $browserAggregate = $this->visitorFlowBrowserRepository->getByCriteria(
-//            $visit->session->website_id,
-//            $visit->page->url,
-//            $level,
-//            $visit->session->system->browser
-//        );
+        $browserAggregate = $this->visitorFlowBrowserRepository->getByCriteria(
+            BrowserCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level,
+                $visit->session->system->browser
+            )
+        );
         if (!$countryAggregate) {
             $countryAggregate = $this->createCountryAggregate($visit, $level, $previousVisit);
             $countryAggregate = $this->visitorFlowCountryRepository->save($countryAggregate);
-            dd($countryAggregate);
         } else {
             $countryAggregate->views++;
             $countryAggregate = $this->visitorFlowCountryRepository->update($countryAggregate);
-            dd($countryAggregate);
         }
 
-//        if (!$browserAggregate) {
-//            $browserAggregate = $this->createBrowserAggregate($visit, $level, $previousVisit);
-//            $browserAggregate = $this->visitorFlowBrowserRepository->save($browserAggregate);
-//            dd($browserAggregate);
-//        } else {
-//            $browserAggregate->views++;
-//            $browserAggregate = $this->visitorFlowBrowserRepository->update($browserAggregate);
-//            dd($browserAggregate);
-//        }
+        if (!$browserAggregate) {
+            $browserAggregate = $this->createBrowserAggregate($visit, $level, $previousVisit);
+            $browserAggregate = $this->visitorFlowBrowserRepository->save($browserAggregate);
+            dd($browserAggregate);
+        } else {
+            $browserAggregate->views++;
+            $browserAggregate = $this->visitorFlowBrowserRepository->update($browserAggregate);
+            dd($browserAggregate);
+        }
     }
 
     private function getPreviousVisit(Visit $currentVisit): ?Visit
@@ -143,10 +145,12 @@ private function createBrowserAggregate(Visit $currentVisit, int $level, ?Visit
         $prevPage = null;
         if ($level !== 1) {
             $previousAggregate = $this->visitorFlowBrowserRepository->getByCriteria(
-                $previousVisit->session->website_id,
-                $previousVisit->page->url,
-                $level - 1,
-                $currentVisit->session->system->browser
+                BrowserCriteria::getCriteria(
+                    $previousVisit->session->website_id,
+                    $previousVisit->page->url,
+                    $level - 1,
+                    $currentVisit->session->system->browser
+                )
             );
             $previousAggregate->isLastPage = false;
             $this->visitorFlowBrowserRepository->update($previousAggregate);

From 1b05b817742571374a44c625fa07a5990a59ae6b Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Thu, 5 Sep 2019 15:27:29 +0300
Subject: [PATCH 013/183] add getPreviousVisit method

---
 .../app/Aggregates/VisitorsFlow/Aggregate.php |  4 ++
 .../VisitorsFlow/BrowserAggregate.php         |  4 +-
 .../VisitorsFlow/CountryAggregate.php         |  4 +-
 .../VisitorsFlow/DeviceAggregate.php          |  4 +-
 .../VisitorsFlow/ScreenAggregate.php          |  4 +-
 .../VisitorsFlow/Values/PageValue.php         |  2 +-
 .../VisitorsFlow/BrowserCriteria.php          | 11 +++--
 .../VisitorsFlow/Contracts/Criteria.php       |  2 +-
 .../VisitorsFlow/CountryCriteria.php          |  9 ++--
 ...sticsearchVisitorFlowBrowserRepository.php |  1 +
 ...sticsearchVisitorFlowCountryRepository.php |  1 +
 .../VisitorsFlow/FlowAggregateService.php     | 42 ++++++++++++++-----
 12 files changed, 65 insertions(+), 23 deletions(-)

diff --git a/backend/app/Aggregates/VisitorsFlow/Aggregate.php b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
index 26e68c3a..e1b84d1f 100644
--- a/backend/app/Aggregates/VisitorsFlow/Aggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
@@ -15,6 +15,7 @@ abstract class Aggregate
     public $views;
     public $level;
     public $isLastPage;
+    public $exitCount;
 
     public function __construct(
         int $id,
@@ -24,6 +25,7 @@ public function __construct(
         int $views,
         int $level,
         bool $isLastPage,
+        int $exitCount,
         ?PageValue $prevPage
     )
     {
@@ -34,6 +36,7 @@ public function __construct(
         $this->views = $views;
         $this->level = $level;
         $this->isLastPage = $isLastPage;
+        $this->exitCount = $exitCount;
         $this->prevPage = $prevPage;
 
     }
@@ -52,6 +55,7 @@ public function toArray(): array
             'level' => $this->level,
             'views' => $this->views,
             'isLastPage' => $this->isLastPage,
+            'exitCount' => $this->exitCount
         ];
     }
 
diff --git a/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php b/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
index 0f20483a..067f5f1f 100644
--- a/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
@@ -17,10 +17,11 @@ public function __construct(
         int $views,
         int $level,
         bool $isLastPage,
+        int $exitCount,
         string $browser,
         ?PageValue $prevPage
     ) {
-        parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $prevPage);
+        parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
         $this->browser = $browser;
     }
 
@@ -39,6 +40,7 @@ public static function fromResult(array $result): Aggregate
             (int)$result['views'],
             (int)$result['level'],
             (bool)$result['isLastPage'],
+            (int)$result['exitCount'],
             (string)$result['browser'],
             $result['prevPage'] === null ? null : new PageValue(
                 (int)$result['prevPage']['id'],
diff --git a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
index a47a816a..d0af86a3 100644
--- a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
@@ -17,11 +17,12 @@ public function __construct(
         int $views,
         int $level,
         bool $isLastPage,
+        int $exitCount,
         string $country,
         ?PageValue $prevPage
     )
     {
-        parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $prevPage);
+        parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
         $this->country = $country;
     }
 
@@ -40,6 +41,7 @@ public static function fromResult(array $result): Aggregate
             (int)$result['views'],
             (int)$result['level'],
             (bool)$result['isLastPage'],
+            (int)$result['exitCount'],
             (string)$result['country'],
             $result['prevPage'] === null ? null : new PageValue(
                 (int)$result['prevPage']['id'],
diff --git a/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php b/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
index 86f4f41a..67dc0dd3 100644
--- a/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
@@ -17,11 +17,12 @@ public function __construct(
         int $views,
         int $level,
         bool $isLastPage,
+        int $exitCount,
         string $device,
         ?PageValue $prevPage
     )
     {
-        parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $prevPage);
+        parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
         $this->$device = $device;
     }
 
@@ -40,6 +41,7 @@ public static function fromResult(array $result): Aggregate
             (int)$result['views'],
             (int)$result['level'],
             (bool)$result['isLastPage'],
+            (int)$result['exitCount'],
             (string)$result['device'],
             $result['prevPage'] === null ? null : new PageValue(
                 (int)$result['prevPage']['id'],
diff --git a/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php b/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
index d577351a..e4e3ee16 100644
--- a/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
@@ -18,12 +18,13 @@ public function __construct(
         int $views,
         int $level,
         bool $isLastPage,
+        int $exitCount,
         int $resolutionWidth,
         int $resolutionHeight,
         ?PageValue $prevPage
     )
     {
-        parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $prevPage);
+        parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
         $this->resolutionWidth = $resolutionWidth;
         $this->resolutionHeight = $resolutionHeight;
     }
@@ -46,6 +47,7 @@ public static function fromResult(array $result): Aggregate
             (int)$result['views'],
             (int)$result['level'],
             (bool)$result['isLastPage'],
+            (int)$result['exitCount'],
             (int)$result['resolution_width'],
             (int)$result['resolution_height'],
             $result['prevPage'] === null ? null : new PageValue(
diff --git a/backend/app/Aggregates/VisitorsFlow/Values/PageValue.php b/backend/app/Aggregates/VisitorsFlow/Values/PageValue.php
index d99071a9..fbeda97d 100644
--- a/backend/app/Aggregates/VisitorsFlow/Values/PageValue.php
+++ b/backend/app/Aggregates/VisitorsFlow/Values/PageValue.php
@@ -8,7 +8,7 @@ class PageValue
     public $id;
     public $url;
 
-    public function __construct(int $id, string $url)
+    public function __construct(int $id = null, string $url = 'null')
     {
         $this->id = $id;
         $this->url = $url;
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php
index a145713e..128458ae 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php
@@ -5,28 +5,31 @@
 
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
 
-class BrowserCriteria implements  Criteria
+class BrowserCriteria implements Criteria
 {
     public $websiteId;
     public $url;
     public $level;
     public $browser;
+    public $prevPageUrl;
 
-    private function __construct(int $websiteId, string $url, int $level, string $browser)
+    private function __construct(int $websiteId, string $url, int $level, string $browser, ?string $prevPageUrl)
     {
         $this->websiteId = $websiteId;
         $this->url = $url;
         $this->level = $level;
         $this->browser = $browser;
+        $this->prevPageUrl = $prevPageUrl;
     }
 
-    public static function getCriteria(int $websiteId, string $url, int $level, string $type)
+    public static function getCriteria(int $websiteId, string $url, int $level, string $type, ?string $prevPageUrl)
     {
         return new static(
             $websiteId,
             $url,
             $level,
-            $type
+            $type,
+            $prevPageUrl
         );
     }
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php
index cee0efc9..d8b10374 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php
@@ -5,5 +5,5 @@
 
 interface Criteria
 {
-    public static function getCriteria(int $websiteId, string $url, int $level, string $type);
+    public static function getCriteria(int $websiteId, string $url, int $level, string $type, ?string $prevPageUrl);
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php
index b08e9709..9a9e9c48 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php
@@ -11,22 +11,25 @@ class CountryCriteria implements Criteria
     public $url;
     public $level;
     public $country;
+    public $prevPageUrl;
 
-    private function __construct(int $websiteId, string $url, int $level, string $country)
+    private function __construct(int $websiteId, string $url, int $level, string $country, ?string $prevPageUrl)
     {
         $this->websiteId = $websiteId;
         $this->url = $url;
         $this->level = $level;
         $this->country = $country;
+        $this->prevPageUrl = $prevPageUrl;
     }
 
-    public static function getCriteria(int $websiteId, string $url, int $level, string $type)
+    public static function getCriteria(int $websiteId, string $url, int $level, string $type, ?string $prevPageUrl)
     {
         return new static(
             $websiteId,
             $url,
             $level,
-            $type
+            $type,
+            $prevPageUrl
         );
     }
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
index c70af296..6da34285 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
@@ -58,6 +58,7 @@ public function getByCriteria(Criteria $criteria): ?BrowserAggregate
                             ['term' => ['level' => $criteria->level]],
                             ['match_phrase' => ['url' => $criteria->url]],
                             ['match_phrase' => ['browser' => $criteria->browser]],
+                            ['match_phrase'=>['prevPage.url'=>$criteria->prevPageUrl]]
                         ],
                     ]
                 ]
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
index 80547f54..c3788b2a 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
@@ -58,6 +58,7 @@ public function getByCriteria(Criteria $criteria): ?CountryAggregate
                             ['term' => ['level' => $criteria->level]],
                             ['match_phrase' => ['url' => $criteria->url]],
                             ['match_phrase' => ['country' => $criteria->country]],
+                            ['match_phrase'=>['prevPage.url'=>$criteria->prevPageUrl]]
                         ],
                     ]
                 ]
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 67d83dfc..84fd3bac 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -45,8 +45,7 @@ public function __construct(
 
     public function aggregate(Visit $visit)
     {
-        dd($visit);
-        $previousVisit = $this->getPreviousVisit($visit);
+        $previousVisit = $this->getLastVisit($visit);
         $isFirstInSession = $previousVisit === null;
         if (!$isFirstInSession) {
             $level = $this->getVisitsCount($visit);
@@ -58,14 +57,17 @@ public function aggregate(Visit $visit)
                 $visit->session->website_id,
                 $visit->page->url,
                 $level,
-                $visit->geo_position->country)
+                $visit->geo_position->country,
+                $isFirstInSession ? 'null' : $previousVisit->page->url
+            )
         );
         $browserAggregate = $this->visitorFlowBrowserRepository->getByCriteria(
             BrowserCriteria::getCriteria(
                 $visit->session->website_id,
                 $visit->page->url,
                 $level,
-                $visit->session->system->browser
+                $visit->session->system->browser,
+                $isFirstInSession ? 'null' : $previousVisit->page->url
             )
         );
         if (!$countryAggregate) {
@@ -87,7 +89,7 @@ public function aggregate(Visit $visit)
         }
     }
 
-    private function getPreviousVisit(Visit $currentVisit): ?Visit
+    private function getLastVisit(Visit $currentVisit): ?Visit
     {
         return $this->visitRepository->findBySessionId($currentVisit->session_id)
             ->sortBy(function (Visit $visit) {
@@ -98,6 +100,18 @@ private function getPreviousVisit(Visit $currentVisit): ?Visit
             });
     }
 
+    private function getPreviousVisit(Visit $currentVisit): ?Visit
+    {
+        return $this->visitRepository->findBySessionId($currentVisit->session_id)
+            ->filter(function (Visit $visit) use ($currentVisit) {
+                return (new Carbon($currentVisit->visit_time))->greaterThan(new Carbon($visit->visit_time));
+            })
+            ->sortBy(function (Visit $visit) {
+                return (new Carbon($visit->visit_time))->getTimestamp();
+            })
+            ->last();
+    }
+
     private function getVisitsCount(Visit $currentVisit): int
     {
         return $this->visitRepository->findBySessionId($currentVisit->session_id)->count();
@@ -108,22 +122,26 @@ private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit
         $page = $this->pageRepository->getById($currentVisit->page_id);
         $website = $this->websiteRepository->getById($page->website_id);
         $geoPosition = $this->geoPositionRepository->getById($currentVisit->geo_position_id);
-        $prevPage = null;
+        $prevPage = new PageValue();
         if ($level !== 1) {
+
             $previousAggregate = $this->visitorFlowCountryRepository->getByCriteria(
                 CountryCriteria::getCriteria(
                     $previousVisit->session->website_id,
                     $previousVisit->page->url,
                     $level - 1,
-                    $previousVisit->geo_position->country
+                    $previousVisit->geo_position->country,
+                    $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null'
                 )
             );
             $previousAggregate->isLastPage = false;
+            $previousAggregate->exitCount--;
             $this->visitorFlowCountryRepository->update($previousAggregate);
             $prevPage = new PageValue($previousVisit->id, $previousAggregate->url);
         }
 
         $isLatPage = true;
+        $exitCount = 1;
         $views = 1;
         return new CountryAggregate(
             $currentVisit->id,
@@ -133,6 +151,7 @@ private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit
             $views,
             $level,
             $isLatPage,
+            $exitCount,
             $geoPosition->country,
             $prevPage
         );
@@ -142,21 +161,23 @@ private function createBrowserAggregate(Visit $currentVisit, int $level, ?Visit
     {
         $page = $this->pageRepository->getById($currentVisit->page_id);
         $website = $this->websiteRepository->getById($page->website_id);
-        $prevPage = null;
+        $prevPage = new PageValue();
         if ($level !== 1) {
             $previousAggregate = $this->visitorFlowBrowserRepository->getByCriteria(
                 BrowserCriteria::getCriteria(
                     $previousVisit->session->website_id,
                     $previousVisit->page->url,
                     $level - 1,
-                    $currentVisit->session->system->browser
+                    $currentVisit->session->system->browser,
+                    $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null'
                 )
             );
             $previousAggregate->isLastPage = false;
+            $previousAggregate->exitCount--;
             $this->visitorFlowBrowserRepository->update($previousAggregate);
             $prevPage = new PageValue($previousVisit->id, $previousAggregate->url);
         }
-
+        $exitCount = 1;
         $isLatPage = true;
         $views = 1;
         return new BrowserAggregate(
@@ -167,6 +188,7 @@ private function createBrowserAggregate(Visit $currentVisit, int $level, ?Visit
             $views,
             $level,
             $isLatPage,
+            $exitCount,
             $currentVisit->session->system->browser,
             $prevPage
         );

From 4237cf5f7d063d6be93d55be75a7c98343866dd9 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Thu, 5 Sep 2019 15:55:05 +0300
Subject: [PATCH 014/183] add exitCount for counting left visitors from page

---
 .../VisitorsFlow/FlowAggregateService.php         | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 84fd3bac..fcca9bda 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -83,7 +83,22 @@ public function aggregate(Visit $visit)
             $browserAggregate = $this->visitorFlowBrowserRepository->save($browserAggregate);
             dd($browserAggregate);
         } else {
+            if ($level > 1) {
+                $previousAggregate = $this->visitorFlowBrowserRepository->getByCriteria(
+                    BrowserCriteria::getCriteria(
+                        $previousVisit->session->website_id,
+                        $previousVisit->page->url,
+                        $level - 1,
+                        $previousVisit->session->system->browser,
+                        $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null'
+                    )
+                );
+                $previousAggregate->isLastPage = false;
+                $previousAggregate->exitCount--;
+                $this->visitorFlowBrowserRepository->update($previousAggregate);
+            }
             $browserAggregate->views++;
+            $browserAggregate->exitCount++;
             $browserAggregate = $this->visitorFlowBrowserRepository->update($browserAggregate);
             dd($browserAggregate);
         }

From d29b74d019042b40231700811b4781e25c295e52 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Thu, 5 Sep 2019 16:38:09 +0300
Subject: [PATCH 015/183] implement countryAggregate and browserAggregate

---
 .../VisitorsFlow/FlowAggregateService.php     | 66 +++++++++++--------
 1 file changed, 38 insertions(+), 28 deletions(-)

diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index fcca9bda..f44e5e85 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -3,6 +3,7 @@
 
 namespace App\Services\VisitorsFlow;
 
+use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\BrowserAggregate;
 use App\Aggregates\VisitorsFlow\CountryAggregate;
 use App\Aggregates\VisitorsFlow\Values\PageValue;
@@ -12,6 +13,7 @@
 use App\Repositories\Contracts\VisitRepository;
 use App\Repositories\Contracts\WebsiteRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\BrowserCriteria;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\CountryCriteria;
@@ -74,7 +76,14 @@ public function aggregate(Visit $visit)
             $countryAggregate = $this->createCountryAggregate($visit, $level, $previousVisit);
             $countryAggregate = $this->visitorFlowCountryRepository->save($countryAggregate);
         } else {
+            if ($level > 1) {
+                $previousAggregate = $this->getPreviousCountryAggregate($previousVisit, $level);
+                $previousAggregate->isLastPage = false;
+                $previousAggregate->exitCount--;
+                $this->visitorFlowCountryRepository->update($previousAggregate);
+            }
             $countryAggregate->views++;
+            $countryAggregate->exitCount++;
             $countryAggregate = $this->visitorFlowCountryRepository->update($countryAggregate);
         }
 
@@ -84,15 +93,7 @@ public function aggregate(Visit $visit)
             dd($browserAggregate);
         } else {
             if ($level > 1) {
-                $previousAggregate = $this->visitorFlowBrowserRepository->getByCriteria(
-                    BrowserCriteria::getCriteria(
-                        $previousVisit->session->website_id,
-                        $previousVisit->page->url,
-                        $level - 1,
-                        $previousVisit->session->system->browser,
-                        $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null'
-                    )
-                );
+                $previousAggregate = $this->getPreviousBrowserAggregate($previousVisit, $level);
                 $previousAggregate->isLastPage = false;
                 $previousAggregate->exitCount--;
                 $this->visitorFlowBrowserRepository->update($previousAggregate);
@@ -132,6 +133,32 @@ private function getVisitsCount(Visit $currentVisit): int
         return $this->visitRepository->findBySessionId($currentVisit->session_id)->count();
     }
 
+    private function getPreviousBrowserAggregate(Visit $previousVisit, int $level): BrowserAggregate
+    {
+        return $this->visitorFlowBrowserRepository->getByCriteria(
+            BrowserCriteria::getCriteria(
+                $previousVisit->session->website_id,
+                $previousVisit->page->url,
+                $level - 1,
+                $previousVisit->session->system->browser,
+                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null'
+            )
+        );
+    }
+
+    private function getPreviousCountryAggregate(Visit $previousVisit, int $level): CountryAggregate
+    {
+        return $this->visitorFlowCountryRepository->getByCriteria(
+            CountryCriteria::getCriteria(
+                $previousVisit->session->website_id,
+                $previousVisit->page->url,
+                $level - 1,
+                $previousVisit->geo_position->country,
+                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null'
+            )
+        );
+    }
+
     private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): CountryAggregate
     {
         $page = $this->pageRepository->getById($currentVisit->page_id);
@@ -139,16 +166,7 @@ private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit
         $geoPosition = $this->geoPositionRepository->getById($currentVisit->geo_position_id);
         $prevPage = new PageValue();
         if ($level !== 1) {
-
-            $previousAggregate = $this->visitorFlowCountryRepository->getByCriteria(
-                CountryCriteria::getCriteria(
-                    $previousVisit->session->website_id,
-                    $previousVisit->page->url,
-                    $level - 1,
-                    $previousVisit->geo_position->country,
-                    $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null'
-                )
-            );
+            $previousAggregate = $this->getPreviousCountryAggregate($previousVisit, $level);
             $previousAggregate->isLastPage = false;
             $previousAggregate->exitCount--;
             $this->visitorFlowCountryRepository->update($previousAggregate);
@@ -178,15 +196,7 @@ private function createBrowserAggregate(Visit $currentVisit, int $level, ?Visit
         $website = $this->websiteRepository->getById($page->website_id);
         $prevPage = new PageValue();
         if ($level !== 1) {
-            $previousAggregate = $this->visitorFlowBrowserRepository->getByCriteria(
-                BrowserCriteria::getCriteria(
-                    $previousVisit->session->website_id,
-                    $previousVisit->page->url,
-                    $level - 1,
-                    $currentVisit->session->system->browser,
-                    $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null'
-                )
-            );
+            $previousAggregate = $this->getPreviousBrowserAggregate($previousVisit, $level);
             $previousAggregate->isLastPage = false;
             $previousAggregate->exitCount--;
             $this->visitorFlowBrowserRepository->update($previousAggregate);

From 5cb4503d7904239eaed1bf92e94fcfd2447c6171 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Thu, 5 Sep 2019 17:34:30 +0300
Subject: [PATCH 016/183] replace getPreviousAggregate method to Aggregate

---
 .../app/Aggregates/VisitorsFlow/Aggregate.php |  9 +++
 .../VisitorsFlow/BrowserAggregate.php         | 24 +++++++-
 .../VisitorsFlow/CountryAggregate.php         | 21 +++++++
 .../VisitorFlowBrowserRepository.php          |  2 +-
 .../VisitorFlowCountryRepository.php          |  2 +-
 .../Contracts/VisitorFlowRepository.php       |  9 +++
 .../VisitorsFlow/FlowAggregateService.php     | 56 ++++++++-----------
 7 files changed, 88 insertions(+), 35 deletions(-)
 create mode 100644 backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowRepository.php

diff --git a/backend/app/Aggregates/VisitorsFlow/Aggregate.php b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
index e1b84d1f..3072bffb 100644
--- a/backend/app/Aggregates/VisitorsFlow/Aggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
@@ -4,6 +4,8 @@
 namespace App\Aggregates\VisitorsFlow;
 
 use App\Aggregates\VisitorsFlow\Values\PageValue;
+use App\Entities\Visit;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowRepository;
 
 abstract class Aggregate
 {
@@ -65,4 +67,11 @@ public function getId(): int
     }
 
     public abstract static function fromResult(array $result): self;
+
+    public abstract static function getPreviousAggregate(
+        VisitorFlowRepository $visitorFlowBrowserRepository,
+        Visit $visit,
+        string $previousVisitUrl,
+        int $level
+    ): Aggregate;
 }
diff --git a/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php b/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
index 067f5f1f..984fe188 100644
--- a/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
@@ -4,6 +4,9 @@
 namespace App\Aggregates\VisitorsFlow;
 
 use App\Aggregates\VisitorsFlow\Values\PageValue;
+use App\Entities\Visit;
+use App\Repositories\Elasticsearch\VisitorsFlow\BrowserCriteria;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowRepository;
 
 class BrowserAggregate extends Aggregate
 {
@@ -20,7 +23,8 @@ public function __construct(
         int $exitCount,
         string $browser,
         ?PageValue $prevPage
-    ) {
+    )
+    {
         parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
         $this->browser = $browser;
     }
@@ -48,4 +52,22 @@ public static function fromResult(array $result): Aggregate
             )
         );
     }
+
+    public static function getPreviousAggregate(
+        VisitorFlowRepository $visitorFlowBrowserRepository,
+        Visit $visit,
+        string $previousVisitUrl,
+        int $level
+    ): Aggregate
+    {
+        return $visitorFlowBrowserRepository->getByCriteria(
+            BrowserCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level - 1,
+                $visit->session->system->browser,
+                $previousVisitUrl
+            )
+        );
+    }
 }
diff --git a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
index d0af86a3..74c600f5 100644
--- a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
@@ -4,6 +4,9 @@
 namespace App\Aggregates\VisitorsFlow;
 
 use App\Aggregates\VisitorsFlow\Values\PageValue;
+use App\Entities\Visit;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\CountryCriteria;
 
 class CountryAggregate extends Aggregate
 {
@@ -49,4 +52,22 @@ public static function fromResult(array $result): Aggregate
             )
         );
     }
+
+    public static function getPreviousAggregate(
+        VisitorFlowRepository $visitorFlowCountryRepository,
+        Visit $visit,
+        string $previousVisitUrl,
+        int $level
+    ): Aggregate
+    {
+        return $visitorFlowCountryRepository->getByCriteria(
+            CountryCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level - 1,
+                $visit->geo_position->country,
+                $previousVisitUrl
+            )
+        );
+    }
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php
index d17a45a4..efc12f80 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php
@@ -6,7 +6,7 @@
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\BrowserAggregate;
 
-interface VisitorFlowBrowserRepository
+interface VisitorFlowBrowserRepository extends VisitorFlowRepository
 {
     public function save(Aggregate $browserAggregate): Aggregate;
 
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php
index 79ef8cf1..36da6c8b 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php
@@ -6,7 +6,7 @@
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\CountryAggregate;
 
-interface VisitorFlowCountryRepository
+interface VisitorFlowCountryRepository extends VisitorFlowRepository
 {
     public function save(Aggregate $tableAggregate): Aggregate;
 
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowRepository.php
new file mode 100644
index 00000000..e6acc7e5
--- /dev/null
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowRepository.php
@@ -0,0 +1,9 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Repositories\Elasticsearch\VisitorsFlow\Contracts;
+
+interface VisitorFlowRepository
+{
+
+}
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index f44e5e85..9361412e 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -3,7 +3,6 @@
 
 namespace App\Services\VisitorsFlow;
 
-use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\BrowserAggregate;
 use App\Aggregates\VisitorsFlow\CountryAggregate;
 use App\Aggregates\VisitorsFlow\Values\PageValue;
@@ -13,7 +12,6 @@
 use App\Repositories\Contracts\VisitRepository;
 use App\Repositories\Contracts\WebsiteRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\BrowserCriteria;
-use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\CountryCriteria;
@@ -77,7 +75,12 @@ public function aggregate(Visit $visit)
             $countryAggregate = $this->visitorFlowCountryRepository->save($countryAggregate);
         } else {
             if ($level > 1) {
-                $previousAggregate = $this->getPreviousCountryAggregate($previousVisit, $level);
+                $previousAggregate = CountryAggregate::getPreviousAggregate(
+                    $this->visitorFlowCountryRepository,
+                    $previousVisit,
+                    $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                    $level
+                );
                 $previousAggregate->isLastPage = false;
                 $previousAggregate->exitCount--;
                 $this->visitorFlowCountryRepository->update($previousAggregate);
@@ -93,7 +96,12 @@ public function aggregate(Visit $visit)
             dd($browserAggregate);
         } else {
             if ($level > 1) {
-                $previousAggregate = $this->getPreviousBrowserAggregate($previousVisit, $level);
+                $previousAggregate = BrowserAggregate::getPreviousAggregate(
+                    $this->visitorFlowBrowserRepository,
+                    $previousVisit,
+                    $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                    $level
+                );
                 $previousAggregate->isLastPage = false;
                 $previousAggregate->exitCount--;
                 $this->visitorFlowBrowserRepository->update($previousAggregate);
@@ -133,32 +141,6 @@ private function getVisitsCount(Visit $currentVisit): int
         return $this->visitRepository->findBySessionId($currentVisit->session_id)->count();
     }
 
-    private function getPreviousBrowserAggregate(Visit $previousVisit, int $level): BrowserAggregate
-    {
-        return $this->visitorFlowBrowserRepository->getByCriteria(
-            BrowserCriteria::getCriteria(
-                $previousVisit->session->website_id,
-                $previousVisit->page->url,
-                $level - 1,
-                $previousVisit->session->system->browser,
-                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null'
-            )
-        );
-    }
-
-    private function getPreviousCountryAggregate(Visit $previousVisit, int $level): CountryAggregate
-    {
-        return $this->visitorFlowCountryRepository->getByCriteria(
-            CountryCriteria::getCriteria(
-                $previousVisit->session->website_id,
-                $previousVisit->page->url,
-                $level - 1,
-                $previousVisit->geo_position->country,
-                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null'
-            )
-        );
-    }
-
     private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): CountryAggregate
     {
         $page = $this->pageRepository->getById($currentVisit->page_id);
@@ -166,7 +148,12 @@ private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit
         $geoPosition = $this->geoPositionRepository->getById($currentVisit->geo_position_id);
         $prevPage = new PageValue();
         if ($level !== 1) {
-            $previousAggregate = $this->getPreviousCountryAggregate($previousVisit, $level);
+            $previousAggregate = CountryAggregate::getPreviousAggregate(
+                $this->visitorFlowCountryRepository,
+                $previousVisit,
+                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                $level
+            );
             $previousAggregate->isLastPage = false;
             $previousAggregate->exitCount--;
             $this->visitorFlowCountryRepository->update($previousAggregate);
@@ -196,7 +183,12 @@ private function createBrowserAggregate(Visit $currentVisit, int $level, ?Visit
         $website = $this->websiteRepository->getById($page->website_id);
         $prevPage = new PageValue();
         if ($level !== 1) {
-            $previousAggregate = $this->getPreviousBrowserAggregate($previousVisit, $level);
+            $previousAggregate = BrowserAggregate::getPreviousAggregate(
+                $this->visitorFlowBrowserRepository,
+                $previousVisit,
+                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                $level
+            );
             $previousAggregate->isLastPage = false;
             $previousAggregate->exitCount--;
             $this->visitorFlowBrowserRepository->update($previousAggregate);

From b8726eb530047ea0eb1cfe9d53a08620647c74a8 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Thu, 5 Sep 2019 18:16:02 +0300
Subject: [PATCH 017/183] implement device aggregate

---
 .../VisitorsFlow/DeviceAggregate.php          | 24 +++++-
 backend/app/Providers/AppServiceProvider.php  |  4 +
 .../Contracts/VisitorFlowDeviceRepository.php | 16 ++++
 .../VisitorsFlow/DeviceCriteria.php           | 36 +++++++++
 ...asticsearchVisitorFlowDeviceRepository.php | 78 +++++++++++++++++++
 .../VisitorsFlow/FlowAggregateService.php     | 78 ++++++++++++++++++-
 6 files changed, 232 insertions(+), 4 deletions(-)
 create mode 100644 backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowDeviceRepository.php
 create mode 100644 backend/app/Repositories/Elasticsearch/VisitorsFlow/DeviceCriteria.php
 create mode 100644 backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php

diff --git a/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php b/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
index 67dc0dd3..035367c8 100644
--- a/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
@@ -4,6 +4,10 @@
 namespace App\Aggregates\VisitorsFlow;
 
 use App\Aggregates\VisitorsFlow\Values\PageValue;
+use App\Entities\Visit;
+use App\Repositories\Elasticsearch\VisitorsFlow\BrowserCriteria;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\DeviceCriteria;
 
 class DeviceAggregate extends Aggregate
 {
@@ -23,7 +27,7 @@ public function __construct(
     )
     {
         parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
-        $this->$device = $device;
+        $this->device = $device;
     }
 
     public function toArray(): array
@@ -49,4 +53,22 @@ public static function fromResult(array $result): Aggregate
             )
         );
     }
+
+    public static function getPreviousAggregate(
+        VisitorFlowRepository $visitorFlowDeviceRepository,
+        Visit $visit,
+        string $previousVisitUrl,
+        int $level
+    ): Aggregate
+    {
+        return $visitorFlowDeviceRepository->getByCriteria(
+            DeviceCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level - 1,
+                $visit->session->system->device,
+                $previousVisitUrl
+            )
+        );
+    }
 }
diff --git a/backend/app/Providers/AppServiceProvider.php b/backend/app/Providers/AppServiceProvider.php
index f55987a0..150f081e 100644
--- a/backend/app/Providers/AppServiceProvider.php
+++ b/backend/app/Providers/AppServiceProvider.php
@@ -25,8 +25,10 @@
 use App\Repositories\Contracts\PageViews\ChartDataRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowDeviceRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\ElasticsearchVisitorFlowBrowserRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\ElasticsearchVisitorFlowCountryRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\ElasticsearchVisitorFlowDeviceRepository;
 use App\Repositories\EloquentChartPageTimingRepository;
 use App\Repositories\EloquentChartVisitorRepository;
 use App\Repositories\EloquentButtonVisitorsRepository;
@@ -110,6 +112,8 @@ public function register()
         $this->app->bind(VisitorFlowCountryRepository::class, ElasticsearchVisitorFlowCountryRepository::class);
 
         $this->app->bind(VisitorFlowBrowserRepository::class, ElasticsearchVisitorFlowBrowserRepository::class);
+
+        $this->app->bind(VisitorFlowDeviceRepository::class, ElasticsearchVisitorFlowDeviceRepository::class);
     }
 
     /**
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowDeviceRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowDeviceRepository.php
new file mode 100644
index 00000000..6174152b
--- /dev/null
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowDeviceRepository.php
@@ -0,0 +1,16 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Repositories\Elasticsearch\VisitorsFlow\Contracts;
+
+use App\Aggregates\VisitorsFlow\Aggregate;
+use App\Aggregates\VisitorsFlow\DeviceAggregate;
+
+interface VisitorFlowDeviceRepository extends VisitorFlowRepository
+{
+    public function save(Aggregate $deviceAggregate): Aggregate;
+
+    public function update(Aggregate $deviceAggregate): Aggregate;
+
+    public function getByCriteria(Criteria $criteria): ?DeviceAggregate;
+}
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/DeviceCriteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/DeviceCriteria.php
new file mode 100644
index 00000000..5e04f9e7
--- /dev/null
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/DeviceCriteria.php
@@ -0,0 +1,36 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Repositories\Elasticsearch\VisitorsFlow;
+
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
+
+class DeviceCriteria implements Criteria
+{
+    public $websiteId;
+    public $url;
+    public $level;
+    public $device;
+    public $prevPageUrl;
+
+    private function __construct(int $websiteId, string $url, int $level, string $device, ?string $prevPageUrl)
+    {
+        $this->websiteId = $websiteId;
+        $this->url = $url;
+        $this->level = $level;
+        $this->device = $device;
+        $this->prevPageUrl = $prevPageUrl;
+    }
+
+    public static function getCriteria(int $websiteId, string $url, int $level, string $type, ?string $prevPageUrl)
+    {
+        return new static(
+            $websiteId,
+            $url,
+            $level,
+            $type,
+            $prevPageUrl
+        );
+    }
+}
+
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
new file mode 100644
index 00000000..3a97105e
--- /dev/null
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
@@ -0,0 +1,78 @@
+<?php
+
+
+namespace App\Repositories\Elasticsearch\VisitorsFlow;
+
+
+use App\Aggregates\VisitorsFlow\Aggregate;
+use App\Aggregates\VisitorsFlow\DeviceAggregate;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowDeviceRepository;
+use Cviebrock\LaravelElasticsearch\Manager as ElasticsearchManager;
+
+class ElasticsearchVisitorFlowDeviceRepository implements VisitorFlowDeviceRepository
+{
+    const INDEX_NAME = 'device-visitors-flow';
+    private $client;
+
+    public function __construct(ElasticsearchManager $client)
+    {
+        $this->client = $client;
+    }
+
+    public function save(Aggregate $deviceAggregate): Aggregate
+    {
+        $this->client->index([
+            'index' => self::INDEX_NAME,
+            'id' => $deviceAggregate->getId(),
+            'type' => '_doc',
+            'body' => $deviceAggregate->toArray()
+        ]);
+
+        return $deviceAggregate;
+    }
+
+    public function update(Aggregate $deviceAggregate): Aggregate
+    {
+        $this->client->index([
+            'index' => self::INDEX_NAME,
+            'id' => $deviceAggregate->getId(),
+            'type' => '_doc',
+            'body' => $deviceAggregate->toArray()
+        ]);
+
+        return $deviceAggregate;
+    }
+
+
+    public function getByCriteria(Criteria $criteria): ?DeviceAggregate
+    {
+        $params = [
+            'index' => self::INDEX_NAME,
+            'body' => [
+                'query' => [
+                    'bool' => [
+                        'must' => [
+                            ['match' => ['websiteId' => $criteria->websiteId]],
+                        ],
+                        'filter' => [
+                            ['term' => ['level' => $criteria->level]],
+                            ['match_phrase' => ['url' => $criteria->url]],
+                            ['match_phrase' => ['device' => $criteria->device]],
+                            ['match_phrase'=>['prevPage.url'=>$criteria->prevPageUrl]]
+                        ],
+                    ]
+                ]
+            ]
+        ];
+        try {
+            $result = $this->client->search($params);
+        } catch (\Exception $exception) {
+            return null;
+        }
+        if (empty($result['hits']['hits'])) {
+            return null;
+        }
+        return DeviceAggregate::fromResult($result['hits']['hits'][0]['_source']);
+    }
+}
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 9361412e..977b5e9f 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -5,6 +5,7 @@
 
 use App\Aggregates\VisitorsFlow\BrowserAggregate;
 use App\Aggregates\VisitorsFlow\CountryAggregate;
+use App\Aggregates\VisitorsFlow\DeviceAggregate;
 use App\Aggregates\VisitorsFlow\Values\PageValue;
 use App\Entities\Visit;
 use App\Repositories\Contracts\GeoPositionRepository;
@@ -14,7 +15,9 @@
 use App\Repositories\Elasticsearch\VisitorsFlow\BrowserCriteria;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowDeviceRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\CountryCriteria;
+use App\Repositories\Elasticsearch\VisitorsFlow\DeviceCriteria;
 use Carbon\Carbon;
 
 final class FlowAggregateService
@@ -25,6 +28,8 @@ final class FlowAggregateService
     private $websiteRepository;
     private $geoPositionRepository;
     private $visitorFlowBrowserRepository;
+    private $visitorFlowDeviceRepository;
+
 
     public function __construct(
         PageRepository $pageRepository,
@@ -32,7 +37,8 @@ public function __construct(
         VisitorFlowCountryRepository $visitorFlowCountryRepository,
         WebsiteRepository $websiteRepository,
         GeoPositionRepository $geoPositionRepository,
-        VisitorFlowBrowserRepository $visitorFlowBrowserRepository
+        VisitorFlowBrowserRepository $visitorFlowBrowserRepository,
+        VisitorFlowDeviceRepository $visitorFlowDeviceRepository
     )
     {
         $this->pageRepository = $pageRepository;
@@ -41,6 +47,7 @@ public function __construct(
         $this->websiteRepository = $websiteRepository;
         $this->geoPositionRepository = $geoPositionRepository;
         $this->visitorFlowBrowserRepository = $visitorFlowBrowserRepository;
+        $this->visitorFlowDeviceRepository = $visitorFlowDeviceRepository;
     }
 
     public function aggregate(Visit $visit)
@@ -70,6 +77,16 @@ public function aggregate(Visit $visit)
                 $isFirstInSession ? 'null' : $previousVisit->page->url
             )
         );
+
+        $deviceAggregate = $this->visitorFlowDeviceRepository->getByCriteria(
+            DeviceCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level,
+                $visit->session->system->device,
+                $isFirstInSession ? 'null' : $previousVisit->page->url
+            )
+        );
         if (!$countryAggregate) {
             $countryAggregate = $this->createCountryAggregate($visit, $level, $previousVisit);
             $countryAggregate = $this->visitorFlowCountryRepository->save($countryAggregate);
@@ -93,7 +110,7 @@ public function aggregate(Visit $visit)
         if (!$browserAggregate) {
             $browserAggregate = $this->createBrowserAggregate($visit, $level, $previousVisit);
             $browserAggregate = $this->visitorFlowBrowserRepository->save($browserAggregate);
-            dd($browserAggregate);
+//            dd($browserAggregate);
         } else {
             if ($level > 1) {
                 $previousAggregate = BrowserAggregate::getPreviousAggregate(
@@ -109,7 +126,28 @@ public function aggregate(Visit $visit)
             $browserAggregate->views++;
             $browserAggregate->exitCount++;
             $browserAggregate = $this->visitorFlowBrowserRepository->update($browserAggregate);
-            dd($browserAggregate);
+//            dd($browserAggregate);
+        }
+        if (!$deviceAggregate) {
+            $deviceAggregate = $this->createDeviceAggregate($visit, $level, $previousVisit);
+            $deviceAggregate = $this->visitorFlowDeviceRepository->save($deviceAggregate);
+            dd($deviceAggregate);
+        } else {
+            if ($level > 1) {
+                $previousAggregate = DeviceAggregate::getPreviousAggregate(
+                    $this->visitorFlowDeviceRepository,
+                    $previousVisit,
+                    $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                    $level
+                );
+                $previousAggregate->isLastPage = false;
+                $previousAggregate->exitCount--;
+                $this->visitorFlowDeviceRepository->update($previousAggregate);
+            }
+            $deviceAggregate->views++;
+            $deviceAggregate->exitCount++;
+            $deviceAggregate = $this->visitorFlowDeviceRepository->update($deviceAggregate);
+            dd($deviceAggregate);
         }
     }
 
@@ -210,4 +248,38 @@ private function createBrowserAggregate(Visit $currentVisit, int $level, ?Visit
             $prevPage
         );
     }
+
+    private function createDeviceAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): DeviceAggregate
+    {
+        $page = $this->pageRepository->getById($currentVisit->page_id);
+        $website = $this->websiteRepository->getById($page->website_id);
+        $prevPage = new PageValue();
+        if ($level !== 1) {
+            $previousAggregate = DeviceAggregate::getPreviousAggregate(
+                $this->visitorFlowDeviceRepository,
+                $previousVisit,
+                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                $level
+            );
+            $previousAggregate->isLastPage = false;
+            $previousAggregate->exitCount--;
+            $this->visitorFlowDeviceRepository->update($previousAggregate);
+            $prevPage = new PageValue($previousVisit->id, $previousAggregate->url);
+        }
+        $exitCount = 1;
+        $isLatPage = true;
+        $views = 1;
+        return new DeviceAggregate(
+            $currentVisit->id,
+            $website->id,
+            $page->url,
+            $page->name,
+            $views,
+            $level,
+            $isLatPage,
+            $exitCount,
+            $currentVisit->session->system->device,
+            $prevPage
+        );
+    }
 }

From 679ef46bd0804350c8a4786ddf8e2a1abe1888ad Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Thu, 5 Sep 2019 22:11:58 +0300
Subject: [PATCH 018/183] implement screenAggregate

---
 .../app/Aggregates/VisitorsFlow/Aggregate.php |  4 +-
 .../VisitorsFlow/BrowserAggregate.php         |  8 +-
 .../VisitorsFlow/CountryAggregate.php         |  8 +-
 .../VisitorsFlow/DeviceAggregate.php          |  9 +-
 .../VisitorsFlow/ScreenAggregate.php          | 34 +++++--
 backend/app/Providers/AppServiceProvider.php  |  4 +
 .../VisitorsFlow/BrowserCriteria.php          |  8 +-
 .../VisitorsFlow/Contracts/Criteria.php       |  2 +-
 .../Contracts/VisitorFlowScreenRepository.php | 16 ++++
 .../VisitorsFlow/CountryCriteria.php          |  8 +-
 .../VisitorsFlow/DeviceCriteria.php           |  8 +-
 ...asticsearchVisitorFlowScreenRepository.php | 79 ++++++++++++++++
 .../VisitorsFlow/ScreenCriteria.php           | 45 +++++++++
 .../VisitorsFlow/FlowAggregateService.php     | 93 ++++++++++++++++---
 14 files changed, 281 insertions(+), 45 deletions(-)
 create mode 100644 backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php
 create mode 100644 backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
 create mode 100644 backend/app/Repositories/Elasticsearch/VisitorsFlow/ScreenCriteria.php

diff --git a/backend/app/Aggregates/VisitorsFlow/Aggregate.php b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
index 3072bffb..eeb9a290 100644
--- a/backend/app/Aggregates/VisitorsFlow/Aggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
@@ -28,7 +28,7 @@ public function __construct(
         int $level,
         bool $isLastPage,
         int $exitCount,
-        ?PageValue $prevPage
+        PageValue $prevPage
     )
     {
         $this->id = $id;
@@ -50,7 +50,7 @@ public function toArray(): array
             'websiteId' => $this->websiteId,
             'url' => $this->url,
             'title' => $this->title,
-            'prevPage' => $this->prevPage === null ? null : [
+            'prevPage' => [
                 'id' => $this->prevPage->id,
                 'url' => $this->prevPage->url
             ],
diff --git a/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php b/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
index 984fe188..9b3a917f 100644
--- a/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
@@ -22,7 +22,7 @@ public function __construct(
         bool $isLastPage,
         int $exitCount,
         string $browser,
-        ?PageValue $prevPage
+        PageValue $prevPage
     )
     {
         parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
@@ -46,7 +46,7 @@ public static function fromResult(array $result): Aggregate
             (bool)$result['isLastPage'],
             (int)$result['exitCount'],
             (string)$result['browser'],
-            $result['prevPage'] === null ? null : new PageValue(
+            new PageValue(
                 (int)$result['prevPage']['id'],
                 (string)$result['prevPage']['url']
             )
@@ -65,8 +65,8 @@ public static function getPreviousAggregate(
                 $visit->session->website_id,
                 $visit->page->url,
                 $level - 1,
-                $visit->session->system->browser,
-                $previousVisitUrl
+                $previousVisitUrl,
+                $visit->session->system->browser
             )
         );
     }
diff --git a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
index 74c600f5..5e79fd5a 100644
--- a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
@@ -22,7 +22,7 @@ public function __construct(
         bool $isLastPage,
         int $exitCount,
         string $country,
-        ?PageValue $prevPage
+        PageValue $prevPage
     )
     {
         parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
@@ -46,7 +46,7 @@ public static function fromResult(array $result): Aggregate
             (bool)$result['isLastPage'],
             (int)$result['exitCount'],
             (string)$result['country'],
-            $result['prevPage'] === null ? null : new PageValue(
+            new PageValue(
                 (int)$result['prevPage']['id'],
                 (string)$result['prevPage']['url']
             )
@@ -65,8 +65,8 @@ public static function getPreviousAggregate(
                 $visit->session->website_id,
                 $visit->page->url,
                 $level - 1,
-                $visit->geo_position->country,
-                $previousVisitUrl
+                $previousVisitUrl,
+                $visit->geo_position->country
             )
         );
     }
diff --git a/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php b/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
index 035367c8..14ef6c7f 100644
--- a/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
@@ -5,7 +5,6 @@
 
 use App\Aggregates\VisitorsFlow\Values\PageValue;
 use App\Entities\Visit;
-use App\Repositories\Elasticsearch\VisitorsFlow\BrowserCriteria;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\DeviceCriteria;
 
@@ -23,7 +22,7 @@ public function __construct(
         bool $isLastPage,
         int $exitCount,
         string $device,
-        ?PageValue $prevPage
+        PageValue $prevPage
     )
     {
         parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
@@ -47,7 +46,7 @@ public static function fromResult(array $result): Aggregate
             (bool)$result['isLastPage'],
             (int)$result['exitCount'],
             (string)$result['device'],
-            $result['prevPage'] === null ? null : new PageValue(
+            new PageValue(
                 (int)$result['prevPage']['id'],
                 (string)$result['prevPage']['url']
             )
@@ -66,8 +65,8 @@ public static function getPreviousAggregate(
                 $visit->session->website_id,
                 $visit->page->url,
                 $level - 1,
-                $visit->session->system->device,
-                $previousVisitUrl
+                $previousVisitUrl,
+                $visit->session->system->device
             )
         );
     }
diff --git a/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php b/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
index e4e3ee16..8f6fc47c 100644
--- a/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
@@ -4,6 +4,9 @@
 namespace App\Aggregates\VisitorsFlow;
 
 use App\Aggregates\VisitorsFlow\Values\PageValue;
+use App\Entities\Visit;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\ScreenCriteria;
 
 class ScreenAggregate extends Aggregate
 {
@@ -19,9 +22,9 @@ public function __construct(
         int $level,
         bool $isLastPage,
         int $exitCount,
-        int $resolutionWidth,
-        int $resolutionHeight,
-        ?PageValue $prevPage
+        string $resolutionWidth,
+        string $resolutionHeight,
+        PageValue $prevPage
     )
     {
         parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
@@ -48,12 +51,31 @@ public static function fromResult(array $result): Aggregate
             (int)$result['level'],
             (bool)$result['isLastPage'],
             (int)$result['exitCount'],
-            (int)$result['resolution_width'],
-            (int)$result['resolution_height'],
-            $result['prevPage'] === null ? null : new PageValue(
+            (string)$result['resolution_width'],
+            (string)$result['resolution_height'],
+            new PageValue(
                 (int)$result['prevPage']['id'],
                 (string)$result['prevPage']['url']
             )
         );
     }
+
+    public static function getPreviousAggregate(
+        VisitorFlowRepository $visitorFlowScreenRepository,
+        Visit $visit,
+        string $previousVisitUrl,
+        int $level
+    ): Aggregate
+    {
+        return $visitorFlowScreenRepository->getByCriteria(
+            ScreenCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level - 1,
+                $previousVisitUrl,
+                $visit->session->system->resolution_width,
+                $visit->session->system->resolution_height
+            )
+        );
+    }
 }
diff --git a/backend/app/Providers/AppServiceProvider.php b/backend/app/Providers/AppServiceProvider.php
index 150f081e..2bccda60 100644
--- a/backend/app/Providers/AppServiceProvider.php
+++ b/backend/app/Providers/AppServiceProvider.php
@@ -26,9 +26,11 @@
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowDeviceRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowScreenRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\ElasticsearchVisitorFlowBrowserRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\ElasticsearchVisitorFlowCountryRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\ElasticsearchVisitorFlowDeviceRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\ElasticsearchVisitorFlowScreenRepository;
 use App\Repositories\EloquentChartPageTimingRepository;
 use App\Repositories\EloquentChartVisitorRepository;
 use App\Repositories\EloquentButtonVisitorsRepository;
@@ -114,6 +116,8 @@ public function register()
         $this->app->bind(VisitorFlowBrowserRepository::class, ElasticsearchVisitorFlowBrowserRepository::class);
 
         $this->app->bind(VisitorFlowDeviceRepository::class, ElasticsearchVisitorFlowDeviceRepository::class);
+
+        $this->app->bind(VisitorFlowScreenRepository::class, ElasticsearchVisitorFlowScreenRepository::class);
     }
 
     /**
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php
index 128458ae..f4145976 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php
@@ -13,7 +13,7 @@ class BrowserCriteria implements Criteria
     public $browser;
     public $prevPageUrl;
 
-    private function __construct(int $websiteId, string $url, int $level, string $browser, ?string $prevPageUrl)
+    private function __construct(int $websiteId, string $url, int $level, ?string $prevPageUrl, string $browser)
     {
         $this->websiteId = $websiteId;
         $this->url = $url;
@@ -22,14 +22,14 @@ private function __construct(int $websiteId, string $url, int $level, string $br
         $this->prevPageUrl = $prevPageUrl;
     }
 
-    public static function getCriteria(int $websiteId, string $url, int $level, string $type, ?string $prevPageUrl)
+    public static function getCriteria(int $websiteId, string $url, int $level, ?string $prevPageUrl, ...$params)
     {
         return new static(
             $websiteId,
             $url,
             $level,
-            $type,
-            $prevPageUrl
+            $prevPageUrl,
+            $params[0]
         );
     }
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php
index d8b10374..57c893f7 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php
@@ -5,5 +5,5 @@
 
 interface Criteria
 {
-    public static function getCriteria(int $websiteId, string $url, int $level, string $type, ?string $prevPageUrl);
+    public static function getCriteria(int $websiteId, string $url, int $level, ?string $prevPageUrl, ...$params);
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php
new file mode 100644
index 00000000..f0ea29da
--- /dev/null
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php
@@ -0,0 +1,16 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Repositories\Elasticsearch\VisitorsFlow\Contracts;
+
+use App\Aggregates\VisitorsFlow\Aggregate;
+use App\Aggregates\VisitorsFlow\ScreenAggregate;
+
+interface VisitorFlowScreenRepository extends VisitorFlowRepository
+{
+    public function save(Aggregate $browserAggregate): Aggregate;
+
+    public function update(Aggregate $browserAggregate): Aggregate;
+
+    public function getByCriteria(Criteria $criteria): ?ScreenAggregate;
+}
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php
index 9a9e9c48..c6374f44 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php
@@ -13,7 +13,7 @@ class CountryCriteria implements Criteria
     public $country;
     public $prevPageUrl;
 
-    private function __construct(int $websiteId, string $url, int $level, string $country, ?string $prevPageUrl)
+    private function __construct(int $websiteId, string $url, int $level, ?string $prevPageUrl, string $country)
     {
         $this->websiteId = $websiteId;
         $this->url = $url;
@@ -22,14 +22,14 @@ private function __construct(int $websiteId, string $url, int $level, string $co
         $this->prevPageUrl = $prevPageUrl;
     }
 
-    public static function getCriteria(int $websiteId, string $url, int $level, string $type, ?string $prevPageUrl)
+    public static function getCriteria(int $websiteId, string $url, int $level, ?string $prevPageUrl, ...$params)
     {
         return new static(
             $websiteId,
             $url,
             $level,
-            $type,
-            $prevPageUrl
+            $prevPageUrl,
+            $params[0]
         );
     }
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/DeviceCriteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/DeviceCriteria.php
index 5e04f9e7..667c93aa 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/DeviceCriteria.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/DeviceCriteria.php
@@ -13,7 +13,7 @@ class DeviceCriteria implements Criteria
     public $device;
     public $prevPageUrl;
 
-    private function __construct(int $websiteId, string $url, int $level, string $device, ?string $prevPageUrl)
+    private function __construct(int $websiteId, string $url, int $level, ?string $prevPageUrl, string $device)
     {
         $this->websiteId = $websiteId;
         $this->url = $url;
@@ -22,14 +22,14 @@ private function __construct(int $websiteId, string $url, int $level, string $de
         $this->prevPageUrl = $prevPageUrl;
     }
 
-    public static function getCriteria(int $websiteId, string $url, int $level, string $type, ?string $prevPageUrl)
+    public static function getCriteria(int $websiteId, string $url, int $level, ?string $prevPageUrl, ...$params)
     {
         return new static(
             $websiteId,
             $url,
             $level,
-            $type,
-            $prevPageUrl
+            $prevPageUrl,
+            $params[0]
         );
     }
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
new file mode 100644
index 00000000..7d455520
--- /dev/null
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
@@ -0,0 +1,79 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Repositories\Elasticsearch\VisitorsFlow;
+
+use App\Aggregates\VisitorsFlow\Aggregate;
+use App\Aggregates\VisitorsFlow\BrowserAggregate;
+use App\Aggregates\VisitorsFlow\ScreenAggregate;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowScreenRepository;
+use Cviebrock\LaravelElasticsearch\Manager as ElasticsearchManager;
+
+class ElasticsearchVisitorFlowScreenRepository implements VisitorFlowScreenRepository
+{
+    const INDEX_NAME = 'screen-visitors-flow';
+    private $client;
+
+    public function __construct(ElasticsearchManager $client)
+    {
+        $this->client = $client;
+    }
+
+    public function save(Aggregate $screenAggregate): Aggregate
+    {
+        $this->client->index([
+            'index' => self::INDEX_NAME,
+            'id' => $screenAggregate->getId(),
+            'type' => '_doc',
+            'body' => $screenAggregate->toArray()
+        ]);
+
+        return $screenAggregate;
+    }
+
+    public function update(Aggregate $screenAggregate): Aggregate
+    {
+        $this->client->index([
+            'index' => self::INDEX_NAME,
+            'id' => $screenAggregate->getId(),
+            'type' => '_doc',
+            'body' => $screenAggregate->toArray()
+        ]);
+
+        return $screenAggregate;
+    }
+
+
+    public function getByCriteria(Criteria $criteria): ?ScreenAggregate
+    {
+        $params = [
+            'index' => self::INDEX_NAME,
+            'body' => [
+                'query' => [
+                    'bool' => [
+                        'must' => [
+                            ['match' => ['websiteId' => $criteria->websiteId]],
+                        ],
+                        'filter' => [
+                            ['term' => ['level' => $criteria->level]],
+                            ['match_phrase' => ['resolution_width' => $criteria->resolutionWidth]],
+                            ['match_phrase' => ['resolution_height' => $criteria->resolutionHeight]],
+                            ['match_phrase' => ['url' => $criteria->url]],
+                            ['match_phrase'=>['prevPage.url'=>$criteria->prevPageUrl]]
+                        ],
+                    ]
+                ]
+            ]
+        ];
+        try {
+            $result = $this->client->search($params);
+        } catch (\Exception $exception) {
+            return null;
+        }
+        if (empty($result['hits']['hits'])) {
+            return null;
+        }
+        return ScreenAggregate::fromResult($result['hits']['hits'][0]['_source']);
+    }
+}
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ScreenCriteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ScreenCriteria.php
new file mode 100644
index 00000000..2aba6e30
--- /dev/null
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ScreenCriteria.php
@@ -0,0 +1,45 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Repositories\Elasticsearch\VisitorsFlow;
+
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
+
+class ScreenCriteria implements Criteria
+{
+    public $websiteId;
+    public $url;
+    public $level;
+    public $resolutionWidth;
+    public $resolutionHeight;
+    public $prevPageUrl;
+
+    private function __construct(
+        int $websiteId,
+        string $url,
+        int $level,
+        ?string $prevPageUrl,
+        string $resolutionWidth,
+        string $resolutionHeight
+    )
+    {
+        $this->websiteId = $websiteId;
+        $this->url = $url;
+        $this->level = $level;
+        $this->resolutionWidth = $resolutionWidth;
+        $this->resolutionHeight = $resolutionHeight;
+        $this->prevPageUrl = $prevPageUrl;
+    }
+
+    public static function getCriteria(int $websiteId, string $url, int $level, ?string $prevPageUrl, ...$params)
+    {
+        return new static(
+            $websiteId,
+            $url,
+            $level,
+            $prevPageUrl,
+            $params[0],
+            $params[1]
+        );
+    }
+}
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 977b5e9f..040fa08f 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -6,6 +6,7 @@
 use App\Aggregates\VisitorsFlow\BrowserAggregate;
 use App\Aggregates\VisitorsFlow\CountryAggregate;
 use App\Aggregates\VisitorsFlow\DeviceAggregate;
+use App\Aggregates\VisitorsFlow\ScreenAggregate;
 use App\Aggregates\VisitorsFlow\Values\PageValue;
 use App\Entities\Visit;
 use App\Repositories\Contracts\GeoPositionRepository;
@@ -16,8 +17,10 @@
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowDeviceRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowScreenRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\CountryCriteria;
 use App\Repositories\Elasticsearch\VisitorsFlow\DeviceCriteria;
+use App\Repositories\Elasticsearch\VisitorsFlow\ScreenCriteria;
 use Carbon\Carbon;
 
 final class FlowAggregateService
@@ -29,7 +32,7 @@ final class FlowAggregateService
     private $geoPositionRepository;
     private $visitorFlowBrowserRepository;
     private $visitorFlowDeviceRepository;
-
+    private $visitorFlowScreenRepository;
 
     public function __construct(
         PageRepository $pageRepository,
@@ -38,7 +41,8 @@ public function __construct(
         WebsiteRepository $websiteRepository,
         GeoPositionRepository $geoPositionRepository,
         VisitorFlowBrowserRepository $visitorFlowBrowserRepository,
-        VisitorFlowDeviceRepository $visitorFlowDeviceRepository
+        VisitorFlowDeviceRepository $visitorFlowDeviceRepository,
+        VisitorFlowScreenRepository $visitorFlowScreenRepository
     )
     {
         $this->pageRepository = $pageRepository;
@@ -48,6 +52,7 @@ public function __construct(
         $this->geoPositionRepository = $geoPositionRepository;
         $this->visitorFlowBrowserRepository = $visitorFlowBrowserRepository;
         $this->visitorFlowDeviceRepository = $visitorFlowDeviceRepository;
+        $this->visitorFlowScreenRepository = $visitorFlowScreenRepository;
     }
 
     public function aggregate(Visit $visit)
@@ -64,8 +69,8 @@ public function aggregate(Visit $visit)
                 $visit->session->website_id,
                 $visit->page->url,
                 $level,
-                $visit->geo_position->country,
-                $isFirstInSession ? 'null' : $previousVisit->page->url
+                $isFirstInSession ? 'null' : $previousVisit->page->url,
+                $visit->geo_position->country
             )
         );
         $browserAggregate = $this->visitorFlowBrowserRepository->getByCriteria(
@@ -73,18 +78,27 @@ public function aggregate(Visit $visit)
                 $visit->session->website_id,
                 $visit->page->url,
                 $level,
-                $visit->session->system->browser,
-                $isFirstInSession ? 'null' : $previousVisit->page->url
+                $isFirstInSession ? 'null' : $previousVisit->page->url,
+                $visit->session->system->browser
             )
         );
-
         $deviceAggregate = $this->visitorFlowDeviceRepository->getByCriteria(
             DeviceCriteria::getCriteria(
                 $visit->session->website_id,
                 $visit->page->url,
                 $level,
-                $visit->session->system->device,
-                $isFirstInSession ? 'null' : $previousVisit->page->url
+                $isFirstInSession ? 'null' : $previousVisit->page->url,
+                $visit->session->system->device
+            )
+        );
+        $screenAggregate = $this->visitorFlowScreenRepository->getByCriteria(
+            ScreenCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level,
+                $isFirstInSession ? 'null' : $previousVisit->page->url,
+                $visit->session->system->resolution_width,
+                $visit->session->system->resolution_height
             )
         );
         if (!$countryAggregate) {
@@ -131,7 +145,7 @@ public function aggregate(Visit $visit)
         if (!$deviceAggregate) {
             $deviceAggregate = $this->createDeviceAggregate($visit, $level, $previousVisit);
             $deviceAggregate = $this->visitorFlowDeviceRepository->save($deviceAggregate);
-            dd($deviceAggregate);
+//            dd($deviceAggregate);
         } else {
             if ($level > 1) {
                 $previousAggregate = DeviceAggregate::getPreviousAggregate(
@@ -147,7 +161,29 @@ public function aggregate(Visit $visit)
             $deviceAggregate->views++;
             $deviceAggregate->exitCount++;
             $deviceAggregate = $this->visitorFlowDeviceRepository->update($deviceAggregate);
-            dd($deviceAggregate);
+//            dd($deviceAggregate);
+        }
+
+        if (!$screenAggregate) {
+            $screenAggregate = $this->createScreenAggregate($visit, $level, $previousVisit);
+            $screenAggregate = $this->visitorFlowScreenRepository->save($screenAggregate);
+            dd($screenAggregate);
+        } else {
+            if ($level > 1) {
+                $previousAggregate = ScreenAggregate::getPreviousAggregate(
+                    $this->visitorFlowScreenRepository,
+                    $previousVisit,
+                    $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                    $level
+                );
+                $previousAggregate->isLastPage = false;
+                $previousAggregate->exitCount--;
+                $this->visitorFlowScreenRepository->update($previousAggregate);
+            }
+            $screenAggregate->views++;
+            $screenAggregate->exitCount++;
+            $screenAggregate = $this->visitorFlowScreenRepository->update($screenAggregate);
+            dd($screenAggregate);
         }
     }
 
@@ -282,4 +318,39 @@ private function createDeviceAggregate(Visit $currentVisit, int $level, ?Visit $
             $prevPage
         );
     }
+
+    private function createScreenAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): ScreenAggregate
+    {
+        $page = $this->pageRepository->getById($currentVisit->page_id);
+        $website = $this->websiteRepository->getById($page->website_id);
+        $prevPage = new PageValue();
+        if ($level !== 1) {
+            $previousAggregate = ScreenAggregate::getPreviousAggregate(
+                $this->visitorFlowScreenRepository,
+                $previousVisit,
+                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                $level
+            );
+            $previousAggregate->isLastPage = false;
+            $previousAggregate->exitCount--;
+            $this->visitorFlowScreenRepository->update($previousAggregate);
+            $prevPage = new PageValue($previousVisit->id, $previousAggregate->url);
+        }
+        $exitCount = 1;
+        $isLatPage = true;
+        $views = 1;
+        return new ScreenAggregate(
+            $currentVisit->id,
+            $website->id,
+            $page->url,
+            $page->name,
+            $views,
+            $level,
+            $isLatPage,
+            $exitCount,
+            $currentVisit->session->system->resolution_width,
+            $currentVisit->session->system->resolution_height,
+            $prevPage
+        );
+    }
 }

From 5c8484448199e54966112cb2251946d1977eabe7 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Thu, 5 Sep 2019 22:24:07 +0300
Subject: [PATCH 019/183] move widgets to new row

---
 .../dashboard/home/ActiveVisitorsCard.vue         |  6 ++++--
 .../dashboard/home/VisitsDensityWidget.vue        |  7 +++++--
 .../src/components/widgets/DevicesPieChart.vue    |  5 +++--
 frontend/src/pages/Dashboard.vue                  | 15 ++++++---------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
index def469fe..e64163f3 100644
--- a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
+++ b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="card bg-white visitors-card rounded text-dark position-relative justify-content-between">
+    <div class="card bg-white visitors-card text-dark position-relative justify-content-between">
         <Spinner v-if="activityDataFetching" />
         <div class="d-flex justify-content-between align-items-center card-top-row">
             <p class="card-text mb-0">
@@ -146,11 +146,13 @@
     .visitors-card {
         border: none;
         box-shadow: 0px 0px 28px rgba(194, 205, 223, 0.7);
+        border-radius: 6px;
         font-family: Gilroy;
-        width: 307px;
+        width: 352px;
         font-size: 12px;
         padding: 43px 33px 32px 28px;
         height: 100%;
+        max-height: 500px;
 
         .card-top-row {
             height: 53px;
diff --git a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
index 5d119265..951e7b23 100644
--- a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
+++ b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
@@ -4,11 +4,11 @@
             v-if="isFetching"
         />
         <div class="ml10">
-            Users by time of dayasd
+            Users by time of day
         </div>
         <VueApexCharts
             type="heatmap"
-            height="350"
+            height="100%"
             :options="chartOptions"
             :series="drawHeatmap"
             class="visits-heatmap"
@@ -192,6 +192,9 @@
 <style scoped>
     .visits-widget {
         padding: 1.5rem;
+        width: 352px;
+        height: 100%;
+        max-height: 500px;
     }
 
     .ml10 {
diff --git a/frontend/src/components/widgets/DevicesPieChart.vue b/frontend/src/components/widgets/DevicesPieChart.vue
index a45b1547..3ed6aeb1 100644
--- a/frontend/src/components/widgets/DevicesPieChart.vue
+++ b/frontend/src/components/widgets/DevicesPieChart.vue
@@ -1,5 +1,5 @@
 <template>
-    <VContainer class="white pie-container position-relative mx-0">
+    <VContainer class="white pie-container position-relative">
         <Spinner v-if="isFetching" />
         <VContainer class="content pt-1 d-flex flex-column justify-space-between">
             <VContainer v-if="!data.length">
@@ -64,8 +64,9 @@
 .pie-container {
     box-shadow: 0 0 28px rgba(0, 0, 0, 0.11) !important;
     border-radius: 6px;
-    width: 307px;
+    width: 352px;
     height: 100%;
+    max-height: 500px;
 }
 .header {
     font-size: 16px;
diff --git a/frontend/src/pages/Dashboard.vue b/frontend/src/pages/Dashboard.vue
index 252f4759..48f080bf 100644
--- a/frontend/src/pages/Dashboard.vue
+++ b/frontend/src/pages/Dashboard.vue
@@ -1,18 +1,18 @@
 <template>
     <ContentLayout :title="title">
         <VRow>
-            <VCol class="pl-0 pr-2">
+            <VCol>
                 <Overview />
             </VCol>
-            <VCol class="widget px-0 mr-2">
+        </VRow>
+        <VRow>
+            <VCol>
                 <ActiveVisitorsCard />
             </VCol>
-            <VCol class="widget pl-0">
+            <VCol>
                 <DevicesPieChart />
             </VCol>
-        </VRow>
-        <VRow>
-            <VCol class="widget px-0 mr-2">
+            <VCol>
                 <VisitsDensityWidget />
             </VCol>
         </VRow>
@@ -51,7 +51,4 @@
 </script>
 
 <style>
-    .widget {
-        max-width: 307px;
-    }
 </style>

From 5eaeefa5d3166e5b8931c68a0da39ddd7c536910 Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Thu, 5 Sep 2019 22:24:08 +0300
Subject: [PATCH 020/183] add error reports api

---
 .../ErrorReports/AddErrorReportsAction.php    |  12 ++
 .../AddErrorReportsActionRequest.php          | 112 ++++++++++++++++++
 .../OpenApi/ErrorReportsController.php        |  29 +++++
 .../AddErrorReportsHttpRequest.php            |  40 +++++++
 4 files changed, 193 insertions(+)
 create mode 100644 backend/app/Actions/ErrorReports/AddErrorReportsAction.php
 create mode 100644 backend/app/Actions/ErrorReports/AddErrorReportsActionRequest.php
 create mode 100644 backend/app/Http/Controllers/OpenApi/ErrorReportsController.php
 create mode 100644 backend/app/Http/Requests/ErrorReports/AddErrorReportsHttpRequest.php

diff --git a/backend/app/Actions/ErrorReports/AddErrorReportsAction.php b/backend/app/Actions/ErrorReports/AddErrorReportsAction.php
new file mode 100644
index 00000000..52647bf4
--- /dev/null
+++ b/backend/app/Actions/ErrorReports/AddErrorReportsAction.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\ErrorReports;
+
+
+final class AddErrorReportsAction
+{
+
+}
+
diff --git a/backend/app/Actions/ErrorReports/AddErrorReportsActionRequest.php b/backend/app/Actions/ErrorReports/AddErrorReportsActionRequest.php
new file mode 100644
index 00000000..e432edfe
--- /dev/null
+++ b/backend/app/Actions/ErrorReports/AddErrorReportsActionRequest.php
@@ -0,0 +1,112 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\ErrorReports;
+
+
+use App\Http\Requests\ErrorReports\AddErrorReportsHttpRequest;
+
+final class AddErrorReportsActionRequest
+{
+    private $page;
+    private $pageTitle;
+    private $language;
+    private $device;
+    private $resolutionWidth;
+    private $resolutionHeight;
+    private $userAgent;
+    private $ip;
+    private $token;
+    private $pageLoadTime;
+
+    private function __construct(
+        string $page,
+        string $pageTitle,
+        string $language,
+        string $device,
+        int $resolutionWidth,
+        int $resolutionHeight,
+        string $userAgent,
+        string $ip,
+        string $token,
+        ?int $pageLoadTime
+    ) {
+        $this->page = $page;
+        $this->pageTitle = $pageTitle;
+        $this->language = $language;
+        $this->device = $device;
+        $this->resolutionWidth = $resolutionWidth;
+        $this->resolutionHeight = $resolutionHeight;
+        $this->userAgent = $userAgent;
+        $this->ip = $ip;
+        $this->token = $token;
+        $this->pageLoadTime = $pageLoadTime;
+    }
+
+    public static function fromRequest(AddErrorReportsHttpRequest $request): self
+    {
+        return new static(
+            $request->page(),
+            $request->pageTitle(),
+            $request->language(),
+            $request->device(),
+            $request->resolutionWidth(),
+            $request->resolutionHeight(),
+            $request->userAgent(),
+            $request->ip(),
+            $request->token(),
+            $request->pageLoadTime(),
+        );
+    }
+
+    public function page(): string
+    {
+        return $this->page;
+    }
+
+    public function pageTitle(): string
+    {
+        return $this->pageTitle;
+    }
+
+    public function language(): string
+    {
+        return $this->language;
+    }
+
+    public function device(): string
+    {
+        return $this->device;
+    }
+
+    public function resolutionWidth(): int
+    {
+        return $this->resolutionWidth;
+    }
+
+    public function resolutionHeight(): int
+    {
+        return $this->resolutionHeight;
+    }
+
+    public function userAgent(): string
+    {
+        return $this->userAgent;
+    }
+
+    public function ip(): string
+    {
+        return $this->ip;
+    }
+
+    public function token(): string
+    {
+        return $this->token;
+    }
+
+    public function getPageLoadTime(): ?int
+    {
+        return $this->pageLoadTime;
+    }
+}
diff --git a/backend/app/Http/Controllers/OpenApi/ErrorReportsController.php b/backend/app/Http/Controllers/OpenApi/ErrorReportsController.php
new file mode 100644
index 00000000..2528c316
--- /dev/null
+++ b/backend/app/Http/Controllers/OpenApi/ErrorReportsController.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\OpenApi;
+
+use App\Actions\ErrorReports\AddErrorReportsAction;
+use App\Actions\Visits\CreateVisitRequest;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\ErrorReports\AddErrorReportsHttpRequest;
+use App\Http\Requests\Visit\CreateVisitHttpRequest;
+use App\Http\Response\ApiResponse;
+
+final class ErrorReportsController extends Controller
+{
+    private $addErrorReportsAction;
+
+    public function __construct(AddErrorReportsAction $addErrorReportsAction)
+    {
+        $this->addErrorReportsAction = $addErrorReportsAction;
+    }
+
+    public function addErrorReports(AddErrorReportsHttpRequest $request): ApiResponse
+    {
+        $this->addErrorReportsAction->execute(CreateVisitRequest::fromRequest($request));
+
+        return ApiResponse::emptySuccess();
+    }
+}
diff --git a/backend/app/Http/Requests/ErrorReports/AddErrorReportsHttpRequest.php b/backend/app/Http/Requests/ErrorReports/AddErrorReportsHttpRequest.php
new file mode 100644
index 00000000..3723030a
--- /dev/null
+++ b/backend/app/Http/Requests/ErrorReports/AddErrorReportsHttpRequest.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\ErrorReports;
+
+use App\Http\Request\ApiFormRequest;
+
+final class AddErrorReportsHttpRequest extends ApiFormRequest
+{
+    public function rules(): array
+    {
+        return [
+            'stack_trace' => 'required|string',
+            'message' => 'required|string',
+            'page' => 'required|string',
+            'tracking_number' => 'required|string',
+        ];
+    }
+
+    public function getPage()
+    {
+        return $this->validated()['page'];
+    }
+
+    public function getMessage()
+    {
+        return $this->validated()['message'];
+    }
+
+    public function getStackTrace()
+    {
+        return $this->validated()['stack_trace'];
+    }
+
+    public function getTrackingNumber()
+    {
+        return $this->validated()['tracking_number'];
+    }
+}

From a8fee904404d3ddd8f1a9484945e26d5895fe309 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Thu, 5 Sep 2019 22:59:34 +0300
Subject: [PATCH 021/183] space out widgets

---
 .../dashboard/home/VisitsDensityWidget.vue         |  5 ++++-
 .../src/components/widgets/DevicesPieChart.vue     |  2 +-
 frontend/src/pages/Dashboard.vue                   | 14 ++++----------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
index 951e7b23..9389e43d 100644
--- a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
+++ b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="card bg-white visits-widget rounded shadow text-dark">
+    <div class="card bg-white visits-widget text-dark">
         <Spinner
             v-if="isFetching"
         />
@@ -191,6 +191,9 @@
 
 <style scoped>
     .visits-widget {
+        border: none;
+        box-shadow: 0px 0px 28px rgba(194, 205, 223, 0.7);
+        border-radius: 6px;
         padding: 1.5rem;
         width: 352px;
         height: 100%;
diff --git a/frontend/src/components/widgets/DevicesPieChart.vue b/frontend/src/components/widgets/DevicesPieChart.vue
index 3ed6aeb1..94a63292 100644
--- a/frontend/src/components/widgets/DevicesPieChart.vue
+++ b/frontend/src/components/widgets/DevicesPieChart.vue
@@ -1,5 +1,5 @@
 <template>
-    <VContainer class="white pie-container position-relative">
+    <VContainer class="white pie-container position-relative mx-0">
         <Spinner v-if="isFetching" />
         <VContainer class="content pt-1 d-flex flex-column justify-space-between">
             <VContainer v-if="!data.length">
diff --git a/frontend/src/pages/Dashboard.vue b/frontend/src/pages/Dashboard.vue
index 48f080bf..a404ef21 100644
--- a/frontend/src/pages/Dashboard.vue
+++ b/frontend/src/pages/Dashboard.vue
@@ -5,16 +5,10 @@
                 <Overview />
             </VCol>
         </VRow>
-        <VRow>
-            <VCol>
-                <ActiveVisitorsCard />
-            </VCol>
-            <VCol>
-                <DevicesPieChart />
-            </VCol>
-            <VCol>
-                <VisitsDensityWidget />
-            </VCol>
+        <VRow class="pa-3 d-flex justify-space-between">
+            <ActiveVisitorsCard />
+            <DevicesPieChart />
+            <VisitsDensityWidget />
         </VRow>
     </ContentLayout>
 </template>

From 2e804211c651c0f78db703f6de00d3d43dc2ed63 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Thu, 5 Sep 2019 23:10:37 +0300
Subject: [PATCH 022/183] change padding on devices widget

---
 .../src/components/dashboard/home/ActiveVisitorsCard.vue    | 2 --
 .../src/components/dashboard/home/VisitsDensityWidget.vue   | 2 --
 frontend/src/components/widgets/DevicesPieChart.vue         | 6 ++----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
index e64163f3..2fa69896 100644
--- a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
+++ b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
@@ -151,8 +151,6 @@
         width: 352px;
         font-size: 12px;
         padding: 43px 33px 32px 28px;
-        height: 100%;
-        max-height: 500px;
 
         .card-top-row {
             height: 53px;
diff --git a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
index 9389e43d..6e4c3106 100644
--- a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
+++ b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
@@ -196,8 +196,6 @@
         border-radius: 6px;
         padding: 1.5rem;
         width: 352px;
-        height: 100%;
-        max-height: 500px;
     }
 
     .ml10 {
diff --git a/frontend/src/components/widgets/DevicesPieChart.vue b/frontend/src/components/widgets/DevicesPieChart.vue
index 94a63292..2adc164c 100644
--- a/frontend/src/components/widgets/DevicesPieChart.vue
+++ b/frontend/src/components/widgets/DevicesPieChart.vue
@@ -1,7 +1,7 @@
 <template>
-    <VContainer class="white pie-container position-relative mx-0">
+    <VContainer class="pa-6 white pie-container position-relative mx-0">
         <Spinner v-if="isFetching" />
-        <VContainer class="content pt-1 d-flex flex-column justify-space-between">
+        <VContainer class="pa-0 content d-flex flex-column justify-space-between">
             <VContainer v-if="!data.length">
                 no data to display
             </VContainer>
@@ -65,8 +65,6 @@
     box-shadow: 0 0 28px rgba(0, 0, 0, 0.11) !important;
     border-radius: 6px;
     width: 352px;
-    height: 100%;
-    max-height: 500px;
 }
 .header {
     font-size: 16px;

From 5aaa63da61ef824dee6178a8e7c384e2000c98ad Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Fri, 6 Sep 2019 08:16:31 +0300
Subject: [PATCH 023/183] add table component

---
 .../dashboard/errors/ErrorsTable.vue          | 195 ++++++++++++++++++
 .../src/pages/speed_overview/ErrorReports.vue |   3 +
 2 files changed, 198 insertions(+)
 create mode 100644 frontend/src/components/dashboard/errors/ErrorsTable.vue

diff --git a/frontend/src/components/dashboard/errors/ErrorsTable.vue b/frontend/src/components/dashboard/errors/ErrorsTable.vue
new file mode 100644
index 00000000..d37df92c
--- /dev/null
+++ b/frontend/src/components/dashboard/errors/ErrorsTable.vue
@@ -0,0 +1,195 @@
+<template>
+    <VContainer
+            p-0
+            class="errors-table"
+    >
+        <VRow
+                class="header my-3"
+                fluid
+        >
+            <VCol>
+                <VSelect
+                        class="option-select"
+                        prefix="Show"
+                        :items="options"
+                        flat
+                        :value="value"
+                        @change="changeSelect"
+                />
+            </VCol>
+            <VCol>
+                Page
+            </VCol>
+            <VCol>
+                Message
+            </VCol>
+            <VCol>
+                Page views
+            </VCol>
+            <VCol>
+                Details
+            </VCol>
+        </VRow>
+        <VContainer class="position-relative pa-0">
+            <VDataTable
+                    class="caption"
+                    hide-default-footer
+                    hide-default-header
+                    :headers="headers"
+                    :items="errorItems"
+            />
+            <Spinner v-if="fetching" />
+        </VContainer>
+    </VContainer>
+</template>
+
+<script>
+    import Spinner from '../../utilites/Spinner';
+    export default {
+        name: 'ErrorsTable',
+        components: {
+            Spinner
+        },
+        props: {
+            errorItems: {
+                type: Array,
+                required: true
+            },
+            fetching: {
+                type: Boolean,
+                required: true
+            }
+        },
+        data () {
+            return {
+                options: [
+                    {
+                        text: 'Page',
+                        value: 'page'
+                    },
+                    {
+                        text: 'Browser',
+                        value: 'browser'
+                    },
+                    {
+                        text: 'Country',
+                        value: 'country'
+                    },
+                ],
+                headers: [
+                    { text: '', align: 'center', value: 'page' },
+                    { text: '', align: 'center', value: 'message' },
+                    { text: '', align: 'center', value: 'page_views' },
+                    { text: '', align: 'center', value: 'details' },
+                ],
+            };
+        },
+        methods: {
+            changeSelect (value) {
+                this.$emit('change', value);
+            }
+        }
+    };
+</script>
+
+<style scoped lang="scss">
+
+    $dark: #122737;
+    $blue: #3C57DE;
+    $gray: rgba(18, 39, 55, 0.5);
+
+    .users-table {
+        font-family: 'Gilroy';
+    }
+
+    .header {
+        align-items: center;
+        text-align: center;
+        text-transform: capitalize;
+    }
+
+    .container {
+
+        .v-data-table {
+            border-collapse: collapse;
+            overflow: hidden;
+            border-radius: 6px;
+            color: $gray;
+            line-height: 14px;
+            box-shadow: 0px 0px 28px rgba(194, 205, 223, 0.7);
+
+            ::v-deep tr {
+                min-height: 52px;
+                display: flex;
+                align-items: center;
+                border-bottom: 1px solid rgba(0, 0, 0, 0.07) !important;
+
+                &:last-child {
+                    border-style: none !important;
+                }
+
+                td {
+                    height: max-content;
+                    flex: 1;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                    max-width: calc(100% / 2);
+                    word-break: break-all;
+                    padding: 8px;
+
+                    &:first-child {
+                        padding-left: 32px;
+                        justify-content: flex-start;
+                    }
+                }
+            }
+        }
+    }
+
+    ::v-deep .option-select {
+        padding: 0;
+
+        .v-input__slot {
+            margin: 0;
+
+            &:before,
+            &:after {
+                border-style: none;
+            }
+
+            .v-text-field__prefix {
+                color: $dark;
+                padding-left: 30px
+            }
+
+            .v-select__selection {
+                &.v-select__selection--comma {
+                    color: $blue;
+                }
+            }
+
+            .v-select__slot
+            {
+                width: min-content;
+                white-space: nowrap;
+            }
+
+            .v-icon {
+                color: $blue;
+            }
+        }
+        .v-text-field__details {
+            display: none;
+        }
+    }
+
+    ::v-deep .v-list-item {
+        font-family: 'Gilroy';
+        text-transform: capitalize;
+    }
+
+    .units {
+        text-transform: none;
+    }
+</style>
\ No newline at end of file
diff --git a/frontend/src/pages/speed_overview/ErrorReports.vue b/frontend/src/pages/speed_overview/ErrorReports.vue
index 6ff61181..f36bf863 100644
--- a/frontend/src/pages/speed_overview/ErrorReports.vue
+++ b/frontend/src/pages/speed_overview/ErrorReports.vue
@@ -4,11 +4,14 @@
 
 <script>
     import ContentLayout from '../../components/layout/ContentLayout.vue';
+    import { isWebsite } from "@/mixins/isWebsite";
+
     export default {
         name: "ErrorReports",
         components: {
             ContentLayout,
         },
+        mixins: [isWebsite],
         data() {
             return {
                 title: "Error Reports",

From ca881baa1e6a61c8ec06f0e5ddc187aabfabfcc2 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Fri, 6 Sep 2019 09:04:12 +0300
Subject: [PATCH 024/183] add titles to dashboard widgets

---
 .../dashboard/home/ActiveVisitorsCard.vue     | 91 ++++++++++---------
 .../dashboard/home/VisitsDensityWidget.vue    | 41 +++++----
 .../components/widgets/DevicesPieChart.vue    | 39 ++++----
 3 files changed, 93 insertions(+), 78 deletions(-)

diff --git a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
index 2fa69896..2434c369 100644
--- a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
+++ b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
@@ -1,50 +1,55 @@
 <template>
-    <div class="card bg-white visitors-card text-dark position-relative justify-content-between">
-        <Spinner v-if="activityDataFetching" />
-        <div class="d-flex justify-content-between align-items-center card-top-row">
-            <p class="card-text mb-0">
-                Active users
-            </p>
-            <p class="card-count text-right mb-0">
-                <strong>
-                    {{ activeUsersCount }}
-                </strong>
-            </p>
+    <div>
+        <div class="subtitle-1 pl-1 pb-2 grey--text text--darken-1">
+            Activity
         </div>
-        <div class="d-flex justify-content-between align-items-center card-top-row">
-            <p class="card-text mb-0">
-                Pages currently viewing
-            </p>
-            <p class="card-count text-right mb-0">
-                <strong>
-                    {{ pageViewsCount }}
-                </strong>
-            </p>
-        </div>
-        <VContainer>
-            <VSparkline
-                v-if="activityChartData.length > 0"
-                :value="activityChartData"
-                :gradient="gradient"
-                :smooth="radius"
-                :padding="padding"
-                :line-width="lineWidth"
-                :gradient-direction="gradientDirection"
-                auto-draw
+        <div class="card bg-white visitors-card text-dark position-relative justify-content-between">
+            <Spinner v-if="activityDataFetching" />
+            <div class="d-flex justify-content-between align-items-center card-top-row">
+                <p class="card-text mb-0">
+                    Active users
+                </p>
+                <p class="card-count text-right mb-0">
+                    <strong>
+                        {{ activeUsersCount }}
+                    </strong>
+                </p>
+            </div>
+            <div class="d-flex justify-content-between align-items-center card-top-row">
+                <p class="card-text mb-0">
+                    Pages currently viewing
+                </p>
+                <p class="card-count text-right mb-0">
+                    <strong>
+                        {{ pageViewsCount }}
+                    </strong>
+                </p>
+            </div>
+            <VContainer>
+                <VSparkline
+                    v-if="activityChartData.length > 0"
+                    :value="activityChartData"
+                    :gradient="gradient"
+                    :smooth="radius"
+                    :padding="padding"
+                    :line-width="lineWidth"
+                    :gradient-direction="gradientDirection"
+                    auto-draw
+                />
+            </VContainer>
+            <TopActivePage
+                :top-pages="topPages"
             />
-        </VContainer>
-        <TopActivePage
-            :top-pages="topPages"
-        />
-        <div
-            class="text-center"
-        >
-            <RouterLink
-                :to="{ name: 'page-views'}"
-                class="btn card-button font-weight-light rounded"
+            <div
+                class="text-center"
             >
-                Real time report
-            </RouterLink>
+                <RouterLink
+                    :to="{ name: 'page-views'}"
+                    class="btn card-button font-weight-light rounded"
+                >
+                    Real time report
+                </RouterLink>
+            </div>
         </div>
     </div>
 </template>
diff --git a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
index 6e4c3106..3396e8d0 100644
--- a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
+++ b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
@@ -1,23 +1,28 @@
 <template>
-    <div class="card bg-white visits-widget text-dark">
-        <Spinner
-            v-if="isFetching"
-        />
-        <div class="ml10">
-            Users by time of day
+    <div>
+        <div class="subtitle-1 pl-1 pb-2 grey--text text--darken-1">
+            Times
+        </div>
+        <div class="card bg-white visits-widget text-dark">
+            <Spinner
+                v-if="isFetching"
+            />
+            <div class="ml10">
+                Users by time of day
+            </div>
+            <VueApexCharts
+                type="heatmap"
+                height="100%"
+                :options="chartOptions"
+                :series="drawHeatmap"
+                class="visits-heatmap"
+            />
+            <VisitsDensityPeriodDropdown
+                class="ml10"
+                :value="getSelectedPeriod"
+                @change="changeSelectedPeriod"
+            />
         </div>
-        <VueApexCharts
-            type="heatmap"
-            height="100%"
-            :options="chartOptions"
-            :series="drawHeatmap"
-            class="visits-heatmap"
-        />
-        <VisitsDensityPeriodDropdown
-            class="ml10"
-            :value="getSelectedPeriod"
-            @change="changeSelectedPeriod"
-        />
     </div>
 </template>
 
diff --git a/frontend/src/components/widgets/DevicesPieChart.vue b/frontend/src/components/widgets/DevicesPieChart.vue
index 2adc164c..34ca9bce 100644
--- a/frontend/src/components/widgets/DevicesPieChart.vue
+++ b/frontend/src/components/widgets/DevicesPieChart.vue
@@ -1,23 +1,28 @@
 <template>
-    <VContainer class="pa-6 white pie-container position-relative mx-0">
-        <Spinner v-if="isFetching" />
-        <VContainer class="pa-0 content d-flex flex-column justify-space-between">
-            <VContainer v-if="!data.length">
-                no data to display
+    <div>
+        <div class="subtitle-1 pl-1 pb-2 grey--text text--darken-1">
+            Devices
+        </div>
+        <VContainer class="pa-6 white pie-container position-relative mx-0">
+            <Spinner v-if="isFetching" />
+            <VContainer class="pa-0 content d-flex flex-column justify-space-between">
+                <VContainer v-if="!data.length">
+                    no data to display
+                </VContainer>
+                <PieChartItem
+                    v-for="(item, key) in data"
+                    :data-type="item.type"
+                    :data="item.data"
+                    :key="key"
+                />
+                <PeriodDropdown
+                    class="mt-2"
+                    :value="selectedPeriod"
+                    @change="changeSelectedPeriod"
+                />
             </VContainer>
-            <PieChartItem
-                v-for="(item, key) in data"
-                :data-type="item.type"
-                :data="item.data"
-                :key="key"
-            />
-            <PeriodDropdown
-                class="mt-2"
-                :value="selectedPeriod"
-                @change="changeSelectedPeriod"
-            />
         </VContainer>
-    </VContainer>
+    </div>
 </template>
 
 <script>

From c76d42b1ae2b7a4221abbb84d5cae60ba07cc22a Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Fri, 6 Sep 2019 09:14:43 +0300
Subject: [PATCH 025/183] add table component to errors page

---
 .../dashboard/errors/ErrorsTable.vue          | 43 +++++++--------
 .../src/pages/speed_overview/ErrorReports.vue | 55 ++++++++++++++++++-
 2 files changed, 73 insertions(+), 25 deletions(-)

diff --git a/frontend/src/components/dashboard/errors/ErrorsTable.vue b/frontend/src/components/dashboard/errors/ErrorsTable.vue
index d37df92c..5c22214d 100644
--- a/frontend/src/components/dashboard/errors/ErrorsTable.vue
+++ b/frontend/src/components/dashboard/errors/ErrorsTable.vue
@@ -1,20 +1,20 @@
 <template>
     <VContainer
-            p-0
-            class="errors-table"
+        p-0
+        class="errors-table"
     >
         <VRow
-                class="header my-3"
-                fluid
+            class="header my-3"
+            fluid
         >
             <VCol>
                 <VSelect
-                        class="option-select"
-                        prefix="Show"
-                        :items="options"
-                        flat
-                        :value="value"
-                        @change="changeSelect"
+                    class="option-select"
+                    prefix="Show"
+                    :items="options"
+                    flat
+                    v-model="selected"
+                    @change="changeSelect"
                 />
             </VCol>
             <VCol>
@@ -30,26 +30,21 @@
                 Details
             </VCol>
         </VRow>
-        <VContainer class="position-relative pa-0">
+        <VContainer pa-0>
             <VDataTable
-                    class="caption"
-                    hide-default-footer
-                    hide-default-header
-                    :headers="headers"
-                    :items="errorItems"
+                class="caption"
+                hide-default-footer
+                hide-default-header
+                :headers="headers"
+                :items="errorItems"
             />
-            <Spinner v-if="fetching" />
         </VContainer>
     </VContainer>
 </template>
 
 <script>
-    import Spinner from '../../utilites/Spinner';
     export default {
         name: 'ErrorsTable',
-        components: {
-            Spinner
-        },
         props: {
             errorItems: {
                 type: Array,
@@ -62,6 +57,7 @@
         },
         data () {
             return {
+                selected: 'page',
                 options: [
                     {
                         text: 'Page',
@@ -77,6 +73,7 @@
                     },
                 ],
                 headers: [
+                    { text: '', align: 'center', value: 'parameter_value' },
                     { text: '', align: 'center', value: 'page' },
                     { text: '', align: 'center', value: 'message' },
                     { text: '', align: 'center', value: 'page_views' },
@@ -85,8 +82,8 @@
             };
         },
         methods: {
-            changeSelect (value) {
-                this.$emit('change', value);
+            changeSelect () {
+                this.$emit('change', this.selected);
             }
         }
     };
diff --git a/frontend/src/pages/speed_overview/ErrorReports.vue b/frontend/src/pages/speed_overview/ErrorReports.vue
index f36bf863..1e0f0157 100644
--- a/frontend/src/pages/speed_overview/ErrorReports.vue
+++ b/frontend/src/pages/speed_overview/ErrorReports.vue
@@ -1,22 +1,73 @@
 <template>
-    <ContentLayout :title="title" />
+    <ContentLayout :title="title">
+        <VRow class="position-relative">
+            <Spinner v-if="fetching" />
+            <ErrorsTable
+                :error-items="tableData.items"
+                :fetching="tableData.isFetching"
+                @change="changeGroupedParameter"
+            />
+        </VRow>
+    </ContentLayout>
 </template>
 
 <script>
     import ContentLayout from '../../components/layout/ContentLayout.vue';
-    import { isWebsite } from "@/mixins/isWebsite";
+    import ErrorsTable from '../../components/dashboard/errors/ErrorsTable.vue';
+    import { isWebsite } from "../../mixins/isWebsite";
+    import Spinner from '../../components/utilites/Spinner';
+
 
     export default {
         name: "ErrorReports",
         components: {
             ContentLayout,
+            ErrorsTable,
+            Spinner
         },
         mixins: [isWebsite],
         data() {
             return {
                 title: "Error Reports",
+                current_paremeter: 'page',
+                tableData: {
+                    isFetching: false,
+                    items: [
+                        {
+                            parameter_value: '/contacts',
+                            page: '/contacts',
+                            message: 'SyntaxError',
+                            page_views: 45
+                        },
+                        {
+                            parameter_value: '/home',
+                            page: '/home',
+                            message: 'ReferenceError',
+                            page_views: 34
+                        },
+                        {
+                            parameter_value: '/products',
+                            page: '/products',
+                            message: 'TypeError',
+                            page_views: 12
+                        },
+                        {
+                            parameter_value: '/user',
+                            page: '/user',
+                            message: 'InternalError',
+                            page_views: 3
+                        }
+                    ]
+                }
             };
         },
+        methods: {
+            changeGroupedParameter (parameter) {
+                if (this.currentParameter !== parameter) {
+                    this.currentParameter = parameter;
+                }
+            }
+        }
     };
 </script>
 

From 8fff2096ab8f6bdb37672bbaaadc0bc2fc7d668c Mon Sep 17 00:00:00 2001
From: Volodymyr <tumko.volodymyr@gmail.com>
Date: Fri, 6 Sep 2019 10:14:16 +0300
Subject: [PATCH 026/183] display page view exit rate in percentage

---
 frontend/src/api/transformers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/api/transformers.js b/frontend/src/api/transformers.js
index 938285c1..d33b6452 100644
--- a/frontend/src/api/transformers.js
+++ b/frontend/src/api/transformers.js
@@ -59,7 +59,7 @@ const tableTransformerPageViews = (item) => {
         'page_title': item.page_title,
         'count_page_views': item.count_page_views,
         'bounce_rate': Math.round(item.bounce_rate*100)+'%',
-        'exit_rate': item.exit_rate
+        'exit_rate':  Math.round(item.exit_rate*100)+'%',
     };
 };
 

From 744e4792ade457b648f78d01db8025732b764506 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Fri, 6 Sep 2019 10:29:48 +0300
Subject: [PATCH 027/183] aghhhhh

---
 .../dashboard/home/ActiveVisitorsCard.vue     |  3 +-
 .../dashboard/home/VisitsDensityWidget.vue    |  7 ++--
 .../components/widgets/DevicesPieChart.vue    | 35 +++++++++----------
 .../src/components/widgets/LegendItem.vue     |  2 +-
 .../src/components/widgets/PieChartItem.vue   | 27 +++++++-------
 5 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
index 2434c369..a542ca46 100644
--- a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
+++ b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="subtitle-1 pl-1 pb-2 grey--text text--darken-1">
+        <div class="subtitle-1 pl-1 pb-4 grey--text text--darken-1">
             Activity
         </div>
         <div class="card bg-white visitors-card text-dark position-relative justify-content-between">
@@ -156,6 +156,7 @@
         width: 352px;
         font-size: 12px;
         padding: 43px 33px 32px 28px;
+        min-height: 480px;
 
         .card-top-row {
             height: 53px;
diff --git a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
index 3396e8d0..1d63b4df 100644
--- a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
+++ b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
@@ -1,9 +1,9 @@
 <template>
     <div>
-        <div class="subtitle-1 pl-1 pb-2 grey--text text--darken-1">
+        <div class="subtitle-1 pl-1 pb-4 grey--text text--darken-1">
             Times
         </div>
-        <div class="card bg-white visits-widget text-dark">
+        <div class="white visits-widget text-dark d-flex flex-column justify-space-between">
             <Spinner
                 v-if="isFetching"
             />
@@ -12,7 +12,7 @@
             </div>
             <VueApexCharts
                 type="heatmap"
-                height="100%"
+                height="350px"
                 :options="chartOptions"
                 :series="drawHeatmap"
                 class="visits-heatmap"
@@ -201,6 +201,7 @@
         border-radius: 6px;
         padding: 1.5rem;
         width: 352px;
+        height: 480px;
     }
 
     .ml10 {
diff --git a/frontend/src/components/widgets/DevicesPieChart.vue b/frontend/src/components/widgets/DevicesPieChart.vue
index 34ca9bce..41f070b1 100644
--- a/frontend/src/components/widgets/DevicesPieChart.vue
+++ b/frontend/src/components/widgets/DevicesPieChart.vue
@@ -1,27 +1,25 @@
 <template>
     <div>
-        <div class="subtitle-1 pl-1 pb-2 grey--text text--darken-1">
+        <div class="subtitle-1 pl-1 pb-4 grey--text text--darken-1">
             Devices
         </div>
-        <VContainer class="pa-6 white pie-container position-relative mx-0">
+        <div class="pa-6 white pie-container position-relative d-flex flex-column justify-space-between">
             <Spinner v-if="isFetching" />
-            <VContainer class="pa-0 content d-flex flex-column justify-space-between">
-                <VContainer v-if="!data.length">
-                    no data to display
-                </VContainer>
-                <PieChartItem
-                    v-for="(item, key) in data"
-                    :data-type="item.type"
-                    :data="item.data"
-                    :key="key"
-                />
-                <PeriodDropdown
-                    class="mt-2"
-                    :value="selectedPeriod"
-                    @change="changeSelectedPeriod"
-                />
+            <VContainer v-if="!data.length">
+                no data to display
             </VContainer>
-        </VContainer>
+            <PieChartItem
+                v-for="(item, key) in data"
+                :data-type="item.type"
+                :data="item.data"
+                :key="key"
+            />
+            <PeriodDropdown
+                class="mt-2"
+                :value="selectedPeriod"
+                @change="changeSelectedPeriod"
+            />
+        </div>
     </div>
 </template>
 
@@ -70,6 +68,7 @@
     box-shadow: 0 0 28px rgba(0, 0, 0, 0.11) !important;
     border-radius: 6px;
     width: 352px;
+    min-height: 480px;
 }
 .header {
     font-size: 16px;
diff --git a/frontend/src/components/widgets/LegendItem.vue b/frontend/src/components/widgets/LegendItem.vue
index 80155caa..2e06e755 100644
--- a/frontend/src/components/widgets/LegendItem.vue
+++ b/frontend/src/components/widgets/LegendItem.vue
@@ -46,9 +46,9 @@
     text-align: end;
     height: 32px;
     min-height: 20px;
-    min-width: 120px;
     .v-list-item__title,
     .v-list-item__subtitle {
+        white-space: normal !important;
         font-size: 12px;
         font-family: 'GilroySemiBold';
     }
diff --git a/frontend/src/components/widgets/PieChartItem.vue b/frontend/src/components/widgets/PieChartItem.vue
index 0cff54e9..a99fe74a 100644
--- a/frontend/src/components/widgets/PieChartItem.vue
+++ b/frontend/src/components/widgets/PieChartItem.vue
@@ -1,17 +1,15 @@
 <template>
-    <VRow class="justify-center">
-        <VCol class="d-flex col-5 justify-center align-items-center">
-            <GChart
-                class="pb-2 align-self-end"
-                type="PieChart"
-                :data="chartData"
-                :options="chartOptions"
-            />
-        </VCol>
-        <VCol>
+    <div class="d-flex">
+        <GChart
+            class="align-self-end"
+            type="PieChart"
+            :data="chartData"
+            :options="chartOptions"
+        />
+        <div class="flex-grow-1 pl-4">
             <VSubheader
                 v-text="dataType"
-                class="legend-title grey--text text--darken-1 pl-0"
+                class="legend-title grey--text text--darken-1 pl-0 mb-3"
             />
             <VList>
                 <LegendItem
@@ -22,8 +20,8 @@
                     :percent="item.percent"
                 />
             </VList>
-        </VCol>
-    </VRow>
+        </div>
+    </div>
 </template>
 
 <script>
@@ -87,4 +85,7 @@
 .v-subheader {
     height: 20px;
 }
+/*.v-list {
+    width: max-content;
+}*/
 </style>
\ No newline at end of file

From 80ce0557853e607fbe000b75a6a212489985e8e7 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Thu, 5 Sep 2019 22:24:07 +0300
Subject: [PATCH 028/183] move widgets to new row

---
 .../dashboard/home/ActiveVisitorsCard.vue         |  6 ++++--
 .../dashboard/home/VisitsDensityWidget.vue        |  5 ++++-
 .../src/components/widgets/DevicesPieChart.vue    |  5 +++--
 frontend/src/pages/Dashboard.vue                  | 15 ++++++---------
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
index def469fe..e64163f3 100644
--- a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
+++ b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="card bg-white visitors-card rounded text-dark position-relative justify-content-between">
+    <div class="card bg-white visitors-card text-dark position-relative justify-content-between">
         <Spinner v-if="activityDataFetching" />
         <div class="d-flex justify-content-between align-items-center card-top-row">
             <p class="card-text mb-0">
@@ -146,11 +146,13 @@
     .visitors-card {
         border: none;
         box-shadow: 0px 0px 28px rgba(194, 205, 223, 0.7);
+        border-radius: 6px;
         font-family: Gilroy;
-        width: 307px;
+        width: 352px;
         font-size: 12px;
         padding: 43px 33px 32px 28px;
         height: 100%;
+        max-height: 500px;
 
         .card-top-row {
             height: 53px;
diff --git a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
index 0df95ce4..951e7b23 100644
--- a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
+++ b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
@@ -8,7 +8,7 @@
         </div>
         <VueApexCharts
             type="heatmap"
-            height="350"
+            height="100%"
             :options="chartOptions"
             :series="drawHeatmap"
             class="visits-heatmap"
@@ -192,6 +192,9 @@
 <style scoped>
     .visits-widget {
         padding: 1.5rem;
+        width: 352px;
+        height: 100%;
+        max-height: 500px;
     }
 
     .ml10 {
diff --git a/frontend/src/components/widgets/DevicesPieChart.vue b/frontend/src/components/widgets/DevicesPieChart.vue
index a45b1547..3ed6aeb1 100644
--- a/frontend/src/components/widgets/DevicesPieChart.vue
+++ b/frontend/src/components/widgets/DevicesPieChart.vue
@@ -1,5 +1,5 @@
 <template>
-    <VContainer class="white pie-container position-relative mx-0">
+    <VContainer class="white pie-container position-relative">
         <Spinner v-if="isFetching" />
         <VContainer class="content pt-1 d-flex flex-column justify-space-between">
             <VContainer v-if="!data.length">
@@ -64,8 +64,9 @@
 .pie-container {
     box-shadow: 0 0 28px rgba(0, 0, 0, 0.11) !important;
     border-radius: 6px;
-    width: 307px;
+    width: 352px;
     height: 100%;
+    max-height: 500px;
 }
 .header {
     font-size: 16px;
diff --git a/frontend/src/pages/Dashboard.vue b/frontend/src/pages/Dashboard.vue
index 252f4759..48f080bf 100644
--- a/frontend/src/pages/Dashboard.vue
+++ b/frontend/src/pages/Dashboard.vue
@@ -1,18 +1,18 @@
 <template>
     <ContentLayout :title="title">
         <VRow>
-            <VCol class="pl-0 pr-2">
+            <VCol>
                 <Overview />
             </VCol>
-            <VCol class="widget px-0 mr-2">
+        </VRow>
+        <VRow>
+            <VCol>
                 <ActiveVisitorsCard />
             </VCol>
-            <VCol class="widget pl-0">
+            <VCol>
                 <DevicesPieChart />
             </VCol>
-        </VRow>
-        <VRow>
-            <VCol class="widget px-0 mr-2">
+            <VCol>
                 <VisitsDensityWidget />
             </VCol>
         </VRow>
@@ -51,7 +51,4 @@
 </script>
 
 <style>
-    .widget {
-        max-width: 307px;
-    }
 </style>

From 46cc2b550494e5b9ea3bd972676ef6ec822f7387 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Thu, 5 Sep 2019 22:59:34 +0300
Subject: [PATCH 029/183] space out widgets

---
 .../dashboard/home/VisitsDensityWidget.vue         |  5 ++++-
 .../src/components/widgets/DevicesPieChart.vue     |  2 +-
 frontend/src/pages/Dashboard.vue                   | 14 ++++----------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
index 951e7b23..9389e43d 100644
--- a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
+++ b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="card bg-white visits-widget rounded shadow text-dark">
+    <div class="card bg-white visits-widget text-dark">
         <Spinner
             v-if="isFetching"
         />
@@ -191,6 +191,9 @@
 
 <style scoped>
     .visits-widget {
+        border: none;
+        box-shadow: 0px 0px 28px rgba(194, 205, 223, 0.7);
+        border-radius: 6px;
         padding: 1.5rem;
         width: 352px;
         height: 100%;
diff --git a/frontend/src/components/widgets/DevicesPieChart.vue b/frontend/src/components/widgets/DevicesPieChart.vue
index 3ed6aeb1..94a63292 100644
--- a/frontend/src/components/widgets/DevicesPieChart.vue
+++ b/frontend/src/components/widgets/DevicesPieChart.vue
@@ -1,5 +1,5 @@
 <template>
-    <VContainer class="white pie-container position-relative">
+    <VContainer class="white pie-container position-relative mx-0">
         <Spinner v-if="isFetching" />
         <VContainer class="content pt-1 d-flex flex-column justify-space-between">
             <VContainer v-if="!data.length">
diff --git a/frontend/src/pages/Dashboard.vue b/frontend/src/pages/Dashboard.vue
index 48f080bf..a404ef21 100644
--- a/frontend/src/pages/Dashboard.vue
+++ b/frontend/src/pages/Dashboard.vue
@@ -5,16 +5,10 @@
                 <Overview />
             </VCol>
         </VRow>
-        <VRow>
-            <VCol>
-                <ActiveVisitorsCard />
-            </VCol>
-            <VCol>
-                <DevicesPieChart />
-            </VCol>
-            <VCol>
-                <VisitsDensityWidget />
-            </VCol>
+        <VRow class="pa-3 d-flex justify-space-between">
+            <ActiveVisitorsCard />
+            <DevicesPieChart />
+            <VisitsDensityWidget />
         </VRow>
     </ContentLayout>
 </template>

From 94d83f97b5766bf256ed0317d6e429e6b424c69f Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Thu, 5 Sep 2019 23:10:37 +0300
Subject: [PATCH 030/183] change padding on devices widget

---
 .../src/components/dashboard/home/ActiveVisitorsCard.vue    | 2 --
 .../src/components/dashboard/home/VisitsDensityWidget.vue   | 2 --
 frontend/src/components/widgets/DevicesPieChart.vue         | 6 ++----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
index e64163f3..2fa69896 100644
--- a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
+++ b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
@@ -151,8 +151,6 @@
         width: 352px;
         font-size: 12px;
         padding: 43px 33px 32px 28px;
-        height: 100%;
-        max-height: 500px;
 
         .card-top-row {
             height: 53px;
diff --git a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
index 9389e43d..6e4c3106 100644
--- a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
+++ b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
@@ -196,8 +196,6 @@
         border-radius: 6px;
         padding: 1.5rem;
         width: 352px;
-        height: 100%;
-        max-height: 500px;
     }
 
     .ml10 {
diff --git a/frontend/src/components/widgets/DevicesPieChart.vue b/frontend/src/components/widgets/DevicesPieChart.vue
index 94a63292..2adc164c 100644
--- a/frontend/src/components/widgets/DevicesPieChart.vue
+++ b/frontend/src/components/widgets/DevicesPieChart.vue
@@ -1,7 +1,7 @@
 <template>
-    <VContainer class="white pie-container position-relative mx-0">
+    <VContainer class="pa-6 white pie-container position-relative mx-0">
         <Spinner v-if="isFetching" />
-        <VContainer class="content pt-1 d-flex flex-column justify-space-between">
+        <VContainer class="pa-0 content d-flex flex-column justify-space-between">
             <VContainer v-if="!data.length">
                 no data to display
             </VContainer>
@@ -65,8 +65,6 @@
     box-shadow: 0 0 28px rgba(0, 0, 0, 0.11) !important;
     border-radius: 6px;
     width: 352px;
-    height: 100%;
-    max-height: 500px;
 }
 .header {
     font-size: 16px;

From e9833464598ec6077bf6700f88c55e8cca0bb308 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Fri, 6 Sep 2019 09:04:12 +0300
Subject: [PATCH 031/183] add titles to dashboard widgets

---
 .../dashboard/home/ActiveVisitorsCard.vue     | 91 ++++++++++---------
 .../dashboard/home/VisitsDensityWidget.vue    | 41 +++++----
 .../components/widgets/DevicesPieChart.vue    | 39 ++++----
 3 files changed, 93 insertions(+), 78 deletions(-)

diff --git a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
index 2fa69896..2434c369 100644
--- a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
+++ b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
@@ -1,50 +1,55 @@
 <template>
-    <div class="card bg-white visitors-card text-dark position-relative justify-content-between">
-        <Spinner v-if="activityDataFetching" />
-        <div class="d-flex justify-content-between align-items-center card-top-row">
-            <p class="card-text mb-0">
-                Active users
-            </p>
-            <p class="card-count text-right mb-0">
-                <strong>
-                    {{ activeUsersCount }}
-                </strong>
-            </p>
+    <div>
+        <div class="subtitle-1 pl-1 pb-2 grey--text text--darken-1">
+            Activity
         </div>
-        <div class="d-flex justify-content-between align-items-center card-top-row">
-            <p class="card-text mb-0">
-                Pages currently viewing
-            </p>
-            <p class="card-count text-right mb-0">
-                <strong>
-                    {{ pageViewsCount }}
-                </strong>
-            </p>
-        </div>
-        <VContainer>
-            <VSparkline
-                v-if="activityChartData.length > 0"
-                :value="activityChartData"
-                :gradient="gradient"
-                :smooth="radius"
-                :padding="padding"
-                :line-width="lineWidth"
-                :gradient-direction="gradientDirection"
-                auto-draw
+        <div class="card bg-white visitors-card text-dark position-relative justify-content-between">
+            <Spinner v-if="activityDataFetching" />
+            <div class="d-flex justify-content-between align-items-center card-top-row">
+                <p class="card-text mb-0">
+                    Active users
+                </p>
+                <p class="card-count text-right mb-0">
+                    <strong>
+                        {{ activeUsersCount }}
+                    </strong>
+                </p>
+            </div>
+            <div class="d-flex justify-content-between align-items-center card-top-row">
+                <p class="card-text mb-0">
+                    Pages currently viewing
+                </p>
+                <p class="card-count text-right mb-0">
+                    <strong>
+                        {{ pageViewsCount }}
+                    </strong>
+                </p>
+            </div>
+            <VContainer>
+                <VSparkline
+                    v-if="activityChartData.length > 0"
+                    :value="activityChartData"
+                    :gradient="gradient"
+                    :smooth="radius"
+                    :padding="padding"
+                    :line-width="lineWidth"
+                    :gradient-direction="gradientDirection"
+                    auto-draw
+                />
+            </VContainer>
+            <TopActivePage
+                :top-pages="topPages"
             />
-        </VContainer>
-        <TopActivePage
-            :top-pages="topPages"
-        />
-        <div
-            class="text-center"
-        >
-            <RouterLink
-                :to="{ name: 'page-views'}"
-                class="btn card-button font-weight-light rounded"
+            <div
+                class="text-center"
             >
-                Real time report
-            </RouterLink>
+                <RouterLink
+                    :to="{ name: 'page-views'}"
+                    class="btn card-button font-weight-light rounded"
+                >
+                    Real time report
+                </RouterLink>
+            </div>
         </div>
     </div>
 </template>
diff --git a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
index 6e4c3106..3396e8d0 100644
--- a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
+++ b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
@@ -1,23 +1,28 @@
 <template>
-    <div class="card bg-white visits-widget text-dark">
-        <Spinner
-            v-if="isFetching"
-        />
-        <div class="ml10">
-            Users by time of day
+    <div>
+        <div class="subtitle-1 pl-1 pb-2 grey--text text--darken-1">
+            Times
+        </div>
+        <div class="card bg-white visits-widget text-dark">
+            <Spinner
+                v-if="isFetching"
+            />
+            <div class="ml10">
+                Users by time of day
+            </div>
+            <VueApexCharts
+                type="heatmap"
+                height="100%"
+                :options="chartOptions"
+                :series="drawHeatmap"
+                class="visits-heatmap"
+            />
+            <VisitsDensityPeriodDropdown
+                class="ml10"
+                :value="getSelectedPeriod"
+                @change="changeSelectedPeriod"
+            />
         </div>
-        <VueApexCharts
-            type="heatmap"
-            height="100%"
-            :options="chartOptions"
-            :series="drawHeatmap"
-            class="visits-heatmap"
-        />
-        <VisitsDensityPeriodDropdown
-            class="ml10"
-            :value="getSelectedPeriod"
-            @change="changeSelectedPeriod"
-        />
     </div>
 </template>
 
diff --git a/frontend/src/components/widgets/DevicesPieChart.vue b/frontend/src/components/widgets/DevicesPieChart.vue
index 2adc164c..34ca9bce 100644
--- a/frontend/src/components/widgets/DevicesPieChart.vue
+++ b/frontend/src/components/widgets/DevicesPieChart.vue
@@ -1,23 +1,28 @@
 <template>
-    <VContainer class="pa-6 white pie-container position-relative mx-0">
-        <Spinner v-if="isFetching" />
-        <VContainer class="pa-0 content d-flex flex-column justify-space-between">
-            <VContainer v-if="!data.length">
-                no data to display
+    <div>
+        <div class="subtitle-1 pl-1 pb-2 grey--text text--darken-1">
+            Devices
+        </div>
+        <VContainer class="pa-6 white pie-container position-relative mx-0">
+            <Spinner v-if="isFetching" />
+            <VContainer class="pa-0 content d-flex flex-column justify-space-between">
+                <VContainer v-if="!data.length">
+                    no data to display
+                </VContainer>
+                <PieChartItem
+                    v-for="(item, key) in data"
+                    :data-type="item.type"
+                    :data="item.data"
+                    :key="key"
+                />
+                <PeriodDropdown
+                    class="mt-2"
+                    :value="selectedPeriod"
+                    @change="changeSelectedPeriod"
+                />
             </VContainer>
-            <PieChartItem
-                v-for="(item, key) in data"
-                :data-type="item.type"
-                :data="item.data"
-                :key="key"
-            />
-            <PeriodDropdown
-                class="mt-2"
-                :value="selectedPeriod"
-                @change="changeSelectedPeriod"
-            />
         </VContainer>
-    </VContainer>
+    </div>
 </template>
 
 <script>

From f9150089d8fbff361389790723c42f182679c8fb Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Fri, 6 Sep 2019 10:29:48 +0300
Subject: [PATCH 032/183] aghhhhh

---
 .../dashboard/home/ActiveVisitorsCard.vue     |  3 +-
 .../dashboard/home/VisitsDensityWidget.vue    |  7 ++--
 .../components/widgets/DevicesPieChart.vue    | 35 +++++++++----------
 .../src/components/widgets/LegendItem.vue     |  2 +-
 .../src/components/widgets/PieChartItem.vue   | 27 +++++++-------
 5 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
index 2434c369..a542ca46 100644
--- a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
+++ b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="subtitle-1 pl-1 pb-2 grey--text text--darken-1">
+        <div class="subtitle-1 pl-1 pb-4 grey--text text--darken-1">
             Activity
         </div>
         <div class="card bg-white visitors-card text-dark position-relative justify-content-between">
@@ -156,6 +156,7 @@
         width: 352px;
         font-size: 12px;
         padding: 43px 33px 32px 28px;
+        min-height: 480px;
 
         .card-top-row {
             height: 53px;
diff --git a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
index 3396e8d0..1d63b4df 100644
--- a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
+++ b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
@@ -1,9 +1,9 @@
 <template>
     <div>
-        <div class="subtitle-1 pl-1 pb-2 grey--text text--darken-1">
+        <div class="subtitle-1 pl-1 pb-4 grey--text text--darken-1">
             Times
         </div>
-        <div class="card bg-white visits-widget text-dark">
+        <div class="white visits-widget text-dark d-flex flex-column justify-space-between">
             <Spinner
                 v-if="isFetching"
             />
@@ -12,7 +12,7 @@
             </div>
             <VueApexCharts
                 type="heatmap"
-                height="100%"
+                height="350px"
                 :options="chartOptions"
                 :series="drawHeatmap"
                 class="visits-heatmap"
@@ -201,6 +201,7 @@
         border-radius: 6px;
         padding: 1.5rem;
         width: 352px;
+        height: 480px;
     }
 
     .ml10 {
diff --git a/frontend/src/components/widgets/DevicesPieChart.vue b/frontend/src/components/widgets/DevicesPieChart.vue
index 34ca9bce..41f070b1 100644
--- a/frontend/src/components/widgets/DevicesPieChart.vue
+++ b/frontend/src/components/widgets/DevicesPieChart.vue
@@ -1,27 +1,25 @@
 <template>
     <div>
-        <div class="subtitle-1 pl-1 pb-2 grey--text text--darken-1">
+        <div class="subtitle-1 pl-1 pb-4 grey--text text--darken-1">
             Devices
         </div>
-        <VContainer class="pa-6 white pie-container position-relative mx-0">
+        <div class="pa-6 white pie-container position-relative d-flex flex-column justify-space-between">
             <Spinner v-if="isFetching" />
-            <VContainer class="pa-0 content d-flex flex-column justify-space-between">
-                <VContainer v-if="!data.length">
-                    no data to display
-                </VContainer>
-                <PieChartItem
-                    v-for="(item, key) in data"
-                    :data-type="item.type"
-                    :data="item.data"
-                    :key="key"
-                />
-                <PeriodDropdown
-                    class="mt-2"
-                    :value="selectedPeriod"
-                    @change="changeSelectedPeriod"
-                />
+            <VContainer v-if="!data.length">
+                no data to display
             </VContainer>
-        </VContainer>
+            <PieChartItem
+                v-for="(item, key) in data"
+                :data-type="item.type"
+                :data="item.data"
+                :key="key"
+            />
+            <PeriodDropdown
+                class="mt-2"
+                :value="selectedPeriod"
+                @change="changeSelectedPeriod"
+            />
+        </div>
     </div>
 </template>
 
@@ -70,6 +68,7 @@
     box-shadow: 0 0 28px rgba(0, 0, 0, 0.11) !important;
     border-radius: 6px;
     width: 352px;
+    min-height: 480px;
 }
 .header {
     font-size: 16px;
diff --git a/frontend/src/components/widgets/LegendItem.vue b/frontend/src/components/widgets/LegendItem.vue
index 80155caa..2e06e755 100644
--- a/frontend/src/components/widgets/LegendItem.vue
+++ b/frontend/src/components/widgets/LegendItem.vue
@@ -46,9 +46,9 @@
     text-align: end;
     height: 32px;
     min-height: 20px;
-    min-width: 120px;
     .v-list-item__title,
     .v-list-item__subtitle {
+        white-space: normal !important;
         font-size: 12px;
         font-family: 'GilroySemiBold';
     }
diff --git a/frontend/src/components/widgets/PieChartItem.vue b/frontend/src/components/widgets/PieChartItem.vue
index 0cff54e9..a99fe74a 100644
--- a/frontend/src/components/widgets/PieChartItem.vue
+++ b/frontend/src/components/widgets/PieChartItem.vue
@@ -1,17 +1,15 @@
 <template>
-    <VRow class="justify-center">
-        <VCol class="d-flex col-5 justify-center align-items-center">
-            <GChart
-                class="pb-2 align-self-end"
-                type="PieChart"
-                :data="chartData"
-                :options="chartOptions"
-            />
-        </VCol>
-        <VCol>
+    <div class="d-flex">
+        <GChart
+            class="align-self-end"
+            type="PieChart"
+            :data="chartData"
+            :options="chartOptions"
+        />
+        <div class="flex-grow-1 pl-4">
             <VSubheader
                 v-text="dataType"
-                class="legend-title grey--text text--darken-1 pl-0"
+                class="legend-title grey--text text--darken-1 pl-0 mb-3"
             />
             <VList>
                 <LegendItem
@@ -22,8 +20,8 @@
                     :percent="item.percent"
                 />
             </VList>
-        </VCol>
-    </VRow>
+        </div>
+    </div>
 </template>
 
 <script>
@@ -87,4 +85,7 @@
 .v-subheader {
     height: 20px;
 }
+/*.v-list {
+    width: max-content;
+}*/
 </style>
\ No newline at end of file

From df263af82fdbf35912b5e73e93923e46bcf8a133 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Fri, 6 Sep 2019 10:58:02 +0300
Subject: [PATCH 033/183] remove outline from line chart buttons

---
 frontend/src/components/dashboard/dashboard/WidgetButtons.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/components/dashboard/dashboard/WidgetButtons.vue b/frontend/src/components/dashboard/dashboard/WidgetButtons.vue
index 78e0b772..ec5bf502 100644
--- a/frontend/src/components/dashboard/dashboard/WidgetButtons.vue
+++ b/frontend/src/components/dashboard/dashboard/WidgetButtons.vue
@@ -63,6 +63,9 @@
             padding: 3px 15px;
             height: 100%;
             font-family: 'GilroySemiBold';
+            &:focus {
+                outline: none;
+            }
             &:not(:last-child) {
                 margin-right: 16px;
             }

From 248b2881b4639d4acc858d3cd831d4b248c85c4a Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Fri, 6 Sep 2019 11:09:34 +0300
Subject: [PATCH 034/183] edit link in top pages

---
 frontend/src/components/dashboard/home/TopActivePage.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/src/components/dashboard/home/TopActivePage.vue b/frontend/src/components/dashboard/home/TopActivePage.vue
index 001aa380..d9630b26 100644
--- a/frontend/src/components/dashboard/home/TopActivePage.vue
+++ b/frontend/src/components/dashboard/home/TopActivePage.vue
@@ -15,6 +15,7 @@
                 class="link-item"
                 :href="page.url"
                 target="_blank"
+                :title="page.url"
             >
                 {{ page.url }}
             </a>
@@ -43,6 +44,10 @@
         .link-item {
             text-decoration:none;
             color: rgba(18, 39, 55, 0.5);
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            margin-right: 10px;
         }
     }
 </style>

From 19cf1a656021208834c084023167496b503a8c80 Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Fri, 6 Sep 2019 11:14:04 +0300
Subject: [PATCH 035/183] fix query to db

---
 backend/app/Repositories/EloquentVisitRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/app/Repositories/EloquentVisitRepository.php b/backend/app/Repositories/EloquentVisitRepository.php
index 5f4d7e70..dbfe1857 100644
--- a/backend/app/Repositories/EloquentVisitRepository.php
+++ b/backend/app/Repositories/EloquentVisitRepository.php
@@ -24,7 +24,7 @@ public function getVisitsCountByHourAndDay(string $startDate, string $endDate, i
                extract('dow' FROM visit_time) as day,
                count(*) as visits"
             ))
-            ->whereBetween('created_at', [$startDate, $endDate])
+            ->whereBetween('visit_time', [$startDate, $endDate])
             ->groupBy('day', 'hour')
             ->whereHas('session', function ($query) use ($websiteId) {
                 $query->whereWebsiteId($websiteId);

From 5a3bd5b6afa5e4f56225367a6a47a01124e129bb Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Fri, 6 Sep 2019 11:27:34 +0300
Subject: [PATCH 036/183] change padding on cards

---
 .../src/components/dashboard/home/ActiveVisitorsCard.vue   | 3 +--
 .../src/components/dashboard/home/VisitsDensityWidget.vue  | 7 +------
 frontend/src/components/widgets/DevicesPieChart.vue        | 1 -
 frontend/src/components/widgets/LegendItem.vue             | 2 +-
 frontend/src/components/widgets/PieChartItem.vue           | 2 +-
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
index a542ca46..a60968e8 100644
--- a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
+++ b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
@@ -3,7 +3,7 @@
         <div class="subtitle-1 pl-1 pb-4 grey--text text--darken-1">
             Activity
         </div>
-        <div class="card bg-white visitors-card text-dark position-relative justify-content-between">
+        <div class="card pa-6 bg-white visitors-card text-dark position-relative justify-content-between">
             <Spinner v-if="activityDataFetching" />
             <div class="d-flex justify-content-between align-items-center card-top-row">
                 <p class="card-text mb-0">
@@ -155,7 +155,6 @@
         font-family: Gilroy;
         width: 352px;
         font-size: 12px;
-        padding: 43px 33px 32px 28px;
         min-height: 480px;
 
         .card-top-row {
diff --git a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
index 1d63b4df..c567ab48 100644
--- a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
+++ b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
@@ -7,7 +7,7 @@
             <Spinner
                 v-if="isFetching"
             />
-            <div class="ml10">
+            <div class="ml-2">
                 Users by time of day
             </div>
             <VueApexCharts
@@ -18,7 +18,6 @@
                 class="visits-heatmap"
             />
             <VisitsDensityPeriodDropdown
-                class="ml10"
                 :value="getSelectedPeriod"
                 @change="changeSelectedPeriod"
             />
@@ -204,10 +203,6 @@
         height: 480px;
     }
 
-    .ml10 {
-        margin-left: 10px;
-    }
-
     .visits-heatmap {
         margin-top: -.5rem;
         margin-right: -2rem;
diff --git a/frontend/src/components/widgets/DevicesPieChart.vue b/frontend/src/components/widgets/DevicesPieChart.vue
index 41f070b1..0658c181 100644
--- a/frontend/src/components/widgets/DevicesPieChart.vue
+++ b/frontend/src/components/widgets/DevicesPieChart.vue
@@ -15,7 +15,6 @@
                 :key="key"
             />
             <PeriodDropdown
-                class="mt-2"
                 :value="selectedPeriod"
                 @change="changeSelectedPeriod"
             />
diff --git a/frontend/src/components/widgets/LegendItem.vue b/frontend/src/components/widgets/LegendItem.vue
index 2e06e755..a1496308 100644
--- a/frontend/src/components/widgets/LegendItem.vue
+++ b/frontend/src/components/widgets/LegendItem.vue
@@ -44,7 +44,7 @@
 <style scoped lang="scss">
 .v-list-item {
     text-align: end;
-    height: 32px;
+    height: 40px;
     min-height: 20px;
     .v-list-item__title,
     .v-list-item__subtitle {
diff --git a/frontend/src/components/widgets/PieChartItem.vue b/frontend/src/components/widgets/PieChartItem.vue
index a99fe74a..f3c9b82d 100644
--- a/frontend/src/components/widgets/PieChartItem.vue
+++ b/frontend/src/components/widgets/PieChartItem.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="d-flex">
         <GChart
-            class="align-self-end"
+            class="align-self-end mb-3"
             type="PieChart"
             :data="chartData"
             :options="chartOptions"

From 123e99e0f535d265808c80fbecf6817427cf848f Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Fri, 6 Sep 2019 11:35:37 +0300
Subject: [PATCH 037/183] add class in card activity

---
 frontend/src/components/dashboard/home/ActiveVisitorsCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
index a542ca46..906cd39c 100644
--- a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
+++ b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
@@ -3,7 +3,7 @@
         <div class="subtitle-1 pl-1 pb-4 grey--text text--darken-1">
             Activity
         </div>
-        <div class="card bg-white visitors-card text-dark position-relative justify-content-between">
+        <div class="pa-6 card bg-white visitors-card text-dark position-relative justify-content-between">
             <Spinner v-if="activityDataFetching" />
             <div class="d-flex justify-content-between align-items-center card-top-row">
                 <p class="card-text mb-0">

From fa622ebb1095cf55d8b12ad4baafa5ea9f493c02 Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Fri, 6 Sep 2019 12:13:55 +0300
Subject: [PATCH 038/183] change time format

---
 .../dashboard/home/VisitsDensityWidget.vue    | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
index 0df95ce4..c6a02136 100644
--- a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
+++ b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
@@ -54,20 +54,6 @@
                     '5': 'Fri',
                     '6': 'Sat'
                 },
-                hours: {
-                    '0': '12am',
-                    '2': '2am',
-                    '4': '4am',
-                    '6': '6am',
-                    '8': '8am',
-                    '10': '10am',
-                    '12': '12pm',
-                    '14': '2pm',
-                    '16': '4pm',
-                    '18': '6pm',
-                    '20': '8pm',
-                    '22': '10pm'
-                },
                 chartOptions: {
                     chart: {
                         toolbar: {
@@ -151,7 +137,13 @@
 
                 for (let hour = 0; hour < 24; hour++) {
                     let row = {};
-                    row.name = this.hours[hour] || '';
+                    if (hour % 2 === 0) {
+                        let date = new Date();
+                        date.setHours(hour, 0, 0);
+                        row.name = date.toTimeString().substring(0, 5);
+                    } else {
+                        row.name = '';
+                    }
                     row.data = [];
 
                     for (let day = 0; day < 7; day++) {

From 0376a253ff02b7799c09f1ae93135bcad4fdbbdf Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Fri, 6 Sep 2019 12:54:14 +0300
Subject: [PATCH 039/183] edit style

---
 .../src/components/dashboard/home/ActiveVisitorsCard.vue    | 6 +++---
 .../src/components/dashboard/home/VisitsDensityWidget.vue   | 4 ++--
 frontend/src/components/widgets/DevicesPieChart.vue         | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
index a60968e8..a4e3d23b 100644
--- a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
+++ b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
@@ -1,11 +1,11 @@
 <template>
-    <div>
+    <div class="mt-10">
         <div class="subtitle-1 pl-1 pb-4 grey--text text--darken-1">
             Activity
         </div>
         <div class="card pa-6 bg-white visitors-card text-dark position-relative justify-content-between">
             <Spinner v-if="activityDataFetching" />
-            <div class="d-flex justify-content-between align-items-center card-top-row">
+            <div class="d-flex justify-content-between align-items-center card-top-row ">
                 <p class="card-text mb-0">
                     Active users
                 </p>
@@ -155,7 +155,7 @@
         font-family: Gilroy;
         width: 352px;
         font-size: 12px;
-        min-height: 480px;
+        height: 480px;
 
         .card-top-row {
             height: 53px;
diff --git a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
index c567ab48..188e3ccd 100644
--- a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
+++ b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="mt-10">
         <div class="subtitle-1 pl-1 pb-4 grey--text text--darken-1">
             Times
         </div>
@@ -207,4 +207,4 @@
         margin-top: -.5rem;
         margin-right: -2rem;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/src/components/widgets/DevicesPieChart.vue b/frontend/src/components/widgets/DevicesPieChart.vue
index 0658c181..e5e571f7 100644
--- a/frontend/src/components/widgets/DevicesPieChart.vue
+++ b/frontend/src/components/widgets/DevicesPieChart.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="mt-10">
         <div class="subtitle-1 pl-1 pb-4 grey--text text--darken-1">
             Devices
         </div>
@@ -67,7 +67,7 @@
     box-shadow: 0 0 28px rgba(0, 0, 0, 0.11) !important;
     border-radius: 6px;
     width: 352px;
-    min-height: 480px;
+    height: 480px;
 }
 .header {
     font-size: 16px;

From a2be04fc17b52fbebbe970443aaddd0f26035094 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Fri, 6 Sep 2019 14:35:00 +0300
Subject: [PATCH 040/183] add units display for bounce rate

---
 frontend/src/api/transformers.js             | 3 ++-
 frontend/src/api/widgets/transformers.js     | 6 +++++-
 frontend/src/components/common/LineChart.vue | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/frontend/src/api/transformers.js b/frontend/src/api/transformers.js
index 938285c1..35dc2234 100644
--- a/frontend/src/api/transformers.js
+++ b/frontend/src/api/transformers.js
@@ -33,7 +33,8 @@ const chartTransformerToInt = (item) => {
 const chartTransformerToPercent = (item) => {
     return {
         date: item.date,
-        value: Math.round(Number(item.value)*100)
+        value: Math.round(Number(item.value)*100),
+        units: '%'
     };
 };
 
diff --git a/frontend/src/api/widgets/transformers.js b/frontend/src/api/widgets/transformers.js
index f11e96aa..7d422ab6 100644
--- a/frontend/src/api/widgets/transformers.js
+++ b/frontend/src/api/widgets/transformers.js
@@ -66,10 +66,14 @@ function toDateStringFormat (interval) {
 const chartDataTransformer = (items, selectedPeriod) => {
     const  sortedItems = [...items].sort((a, b) => a.date - b.date);
     return sortedItems.map(item => {
-        return {
+        let chartItem = {
             'date': moment.unix(item.date).format(toDateStringFormat(selectedPeriod)),
             'value': item.value
         };
+        if (item.hasOwnProperty('units')) {
+            chartItem.units = item.units;
+        }
+        return chartItem;
     });
 };
 
diff --git a/frontend/src/components/common/LineChart.vue b/frontend/src/components/common/LineChart.vue
index 67933e0d..36baa30c 100644
--- a/frontend/src/components/common/LineChart.vue
+++ b/frontend/src/components/common/LineChart.vue
@@ -119,7 +119,7 @@
             tooltip(element) {
                 return `<div class='custom-google-line-chart-tooltip white--text'>
                     <div class='tooltip-first primary lighten-1'>
-                        ${element.value}
+                        ${element.value}${element.hasOwnProperty('units') ? element.units : ""}
                     </div>
                     <div class='tooltip-second'>
                         ${element.date}

From 9e9f014f7449550707660acf2abb9cc5f2670bfd Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Fri, 6 Sep 2019 15:08:24 +0300
Subject: [PATCH 041/183] how about this

---
 frontend/src/api/transformers.js             | 9 ++++++---
 frontend/src/api/widgets/transformers.js     | 6 ++----
 frontend/src/components/common/LineChart.vue | 2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/frontend/src/api/transformers.js b/frontend/src/api/transformers.js
index 35dc2234..2223726c 100644
--- a/frontend/src/api/transformers.js
+++ b/frontend/src/api/transformers.js
@@ -19,14 +19,16 @@ const buttonTransformerToTime = (item) => {
 const chartTransformer = (item) => {
     return {
         date: item.date,
-        value: item.value*1
+        value: item.value*1,
+        units: ''
     };
 };
 
 const chartTransformerToInt = (item) => {
     return {
         date: item.date,
-        value: parseInt(item.value)
+        value: parseInt(item.value),
+        units: ''
     };
 };
 
@@ -41,7 +43,8 @@ const chartTransformerToPercent = (item) => {
 const chartTransformerToSeconds = (item) => {
     return {
         date: item.date,
-        value: item.value/1000
+        value: item.value/1000,
+        units: ''
     };
 };
 
diff --git a/frontend/src/api/widgets/transformers.js b/frontend/src/api/widgets/transformers.js
index 7d422ab6..e72c3f0b 100644
--- a/frontend/src/api/widgets/transformers.js
+++ b/frontend/src/api/widgets/transformers.js
@@ -68,11 +68,9 @@ const chartDataTransformer = (items, selectedPeriod) => {
     return sortedItems.map(item => {
         let chartItem = {
             'date': moment.unix(item.date).format(toDateStringFormat(selectedPeriod)),
-            'value': item.value
+            'value': item.value,
+            'units': item.units
         };
-        if (item.hasOwnProperty('units')) {
-            chartItem.units = item.units;
-        }
         return chartItem;
     });
 };
diff --git a/frontend/src/components/common/LineChart.vue b/frontend/src/components/common/LineChart.vue
index 36baa30c..7f53d05f 100644
--- a/frontend/src/components/common/LineChart.vue
+++ b/frontend/src/components/common/LineChart.vue
@@ -119,7 +119,7 @@
             tooltip(element) {
                 return `<div class='custom-google-line-chart-tooltip white--text'>
                     <div class='tooltip-first primary lighten-1'>
-                        ${element.value}${element.hasOwnProperty('units') ? element.units : ""}
+                        ${element.value}${element.units}
                     </div>
                     <div class='tooltip-second'>
                         ${element.date}

From 00905dd9d8d922e405014d928562d1c95d7ae6a8 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Fri, 6 Sep 2019 17:16:02 +0300
Subject: [PATCH 042/183] pass units as prop to line chart component

---
 frontend/src/api/transformers.js                       | 10 +++-------
 frontend/src/api/widgets/transformers.js               |  6 ++----
 frontend/src/components/common/LineChart.vue           |  7 ++++++-
 .../src/components/dashboard/dashboard/Overview.vue    |  9 ++++++++-
 frontend/src/pages/PageViews.vue                       |  4 ++++
 frontend/src/pages/Visitors.vue                        |  4 ++++
 frontend/src/pages/speed_overview/PageTimings.vue      |  1 +
 7 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/frontend/src/api/transformers.js b/frontend/src/api/transformers.js
index 2223726c..dd8e2de1 100644
--- a/frontend/src/api/transformers.js
+++ b/frontend/src/api/transformers.js
@@ -20,31 +20,27 @@ const chartTransformer = (item) => {
     return {
         date: item.date,
         value: item.value*1,
-        units: ''
     };
 };
 
 const chartTransformerToInt = (item) => {
     return {
         date: item.date,
-        value: parseInt(item.value),
-        units: ''
+        value: parseInt(item.value)
     };
 };
 
 const chartTransformerToPercent = (item) => {
     return {
         date: item.date,
-        value: Math.round(Number(item.value)*100),
-        units: '%'
+        value: Math.round(Number(item.value)*100)
     };
 };
 
 const chartTransformerToSeconds = (item) => {
     return {
         date: item.date,
-        value: item.value/1000,
-        units: ''
+        value: item.value/1000
     };
 };
 
diff --git a/frontend/src/api/widgets/transformers.js b/frontend/src/api/widgets/transformers.js
index e72c3f0b..5a9c9386 100644
--- a/frontend/src/api/widgets/transformers.js
+++ b/frontend/src/api/widgets/transformers.js
@@ -66,12 +66,10 @@ function toDateStringFormat (interval) {
 const chartDataTransformer = (items, selectedPeriod) => {
     const  sortedItems = [...items].sort((a, b) => a.date - b.date);
     return sortedItems.map(item => {
-        let chartItem = {
+        return  {
             'date': moment.unix(item.date).format(toDateStringFormat(selectedPeriod)),
-            'value': item.value,
-            'units': item.units
+            'value': item.value
         };
-        return chartItem;
     });
 };
 
diff --git a/frontend/src/components/common/LineChart.vue b/frontend/src/components/common/LineChart.vue
index 7f53d05f..e583062d 100644
--- a/frontend/src/components/common/LineChart.vue
+++ b/frontend/src/components/common/LineChart.vue
@@ -18,6 +18,7 @@
             v-else
             :data="chartData"
             :options="chartOptions"
+            :units="units"
         />
     </VContainer>
 </template>
@@ -38,6 +39,10 @@
                 type: Boolean,
                 required: true,
             },
+            units: {
+                type: String,
+                required: true
+            }
         },
         data() {
             return {
@@ -119,7 +124,7 @@
             tooltip(element) {
                 return `<div class='custom-google-line-chart-tooltip white--text'>
                     <div class='tooltip-first primary lighten-1'>
-                        ${element.value}${element.units}
+                        ${element.value}${this.units}
                     </div>
                     <div class='tooltip-second'>
                         ${element.date}
diff --git a/frontend/src/components/dashboard/dashboard/Overview.vue b/frontend/src/components/dashboard/dashboard/Overview.vue
index 2d50868d..659b2a7a 100644
--- a/frontend/src/components/dashboard/dashboard/Overview.vue
+++ b/frontend/src/components/dashboard/dashboard/Overview.vue
@@ -8,6 +8,7 @@
         <LineChart
             :data="chartData"
             :is-fetching="isFetching"
+            :units="units"
         />
         <PeriodDropdown
             :value="selectedPeriod"
@@ -21,10 +22,12 @@
     import PeriodDropdown from "../common/PeriodDropdown";
     import LineChart from "../../common/LineChart";
     import WidgetButtons from "./WidgetButtons";
+    import {BOUNCE_RATE} from "../../../configs/visitors/buttonTypes";
     import {
         GET_FORMAT_LINE_CHART_DATA,
         GET_SELECTED_PERIOD,
-        GET_LINE_CHART_FETCHING
+        GET_LINE_CHART_FETCHING,
+        GET_DATA_TYPE
     } from "@/store/modules/dashboard/types/getters";
     import {
         CHANGE_SELECTED_PERIOD,
@@ -41,7 +44,11 @@
                 chartData: GET_FORMAT_LINE_CHART_DATA,
                 isFetching: GET_LINE_CHART_FETCHING,
                 selectedPeriod: GET_SELECTED_PERIOD,
+                dataType: GET_DATA_TYPE
             }),
+            units() {
+                return this.dataType === BOUNCE_RATE ? '%' : '';
+            },
         },
         methods: {
             ...mapActions('dashboard', {
diff --git a/frontend/src/pages/PageViews.vue b/frontend/src/pages/PageViews.vue
index 27018c0b..6f4df9b3 100644
--- a/frontend/src/pages/PageViews.vue
+++ b/frontend/src/pages/PageViews.vue
@@ -5,6 +5,7 @@
                 <LineChart
                     :data="formatLineChartData"
                     :is-fetching="chartData.isFetching"
+                    :units="units"
                 />
                 <PeriodDropdown
                     :value="getSelectedPeriod"
@@ -118,6 +119,9 @@
                 formatLineChartData:GET_FORMAT_LINE_CHART_DATA,
                 getTableData: GET_PAGE_VIEWS_TABLE_DATA
             }),
+            units() {
+                return this.currentActiveButton === BOUNCE_RATE ? '%' : '';
+            },
         },
         created() {
             this.fetchPageData();
diff --git a/frontend/src/pages/Visitors.vue b/frontend/src/pages/Visitors.vue
index 4e26e377..103725c5 100644
--- a/frontend/src/pages/Visitors.vue
+++ b/frontend/src/pages/Visitors.vue
@@ -5,6 +5,7 @@
                 <LineChart
                     :data="formatLineChartData"
                     :is-fetching="chartData.isFetching"
+                    :units="units"
                 />
                 <PeriodDropdown
                     :value="getSelectedPeriod"
@@ -145,6 +146,9 @@
                 chartData: GET_LINE_CHART_DATA,
                 formatLineChartData:GET_FORMAT_LINE_CHART_DATA,
             }),
+            units() {
+                return this.currentActiveButton === BOUNCE_RATE ? '%' : '';
+            },
             pieData () {
                 return [
                     ['Type', 'Value'],
diff --git a/frontend/src/pages/speed_overview/PageTimings.vue b/frontend/src/pages/speed_overview/PageTimings.vue
index f312bcb2..0490f8ca 100644
--- a/frontend/src/pages/speed_overview/PageTimings.vue
+++ b/frontend/src/pages/speed_overview/PageTimings.vue
@@ -5,6 +5,7 @@
                 <LineChart
                     :data="formatLineChartData"
                     :is-fetching="chartData.isFetching"
+                    units="s"
                 />
                 <PeriodDropdown
                     :value="getSelectedPeriod"

From b1f6c94a26d8c25a2c94574e4147763b51713a22 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Fri, 6 Sep 2019 17:21:00 +0300
Subject: [PATCH 043/183] pass units as prop to line chart component

---
 frontend/src/api/transformers.js         | 2 +-
 frontend/src/api/widgets/transformers.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/api/transformers.js b/frontend/src/api/transformers.js
index dd8e2de1..938285c1 100644
--- a/frontend/src/api/transformers.js
+++ b/frontend/src/api/transformers.js
@@ -19,7 +19,7 @@ const buttonTransformerToTime = (item) => {
 const chartTransformer = (item) => {
     return {
         date: item.date,
-        value: item.value*1,
+        value: item.value*1
     };
 };
 
diff --git a/frontend/src/api/widgets/transformers.js b/frontend/src/api/widgets/transformers.js
index 5a9c9386..f11e96aa 100644
--- a/frontend/src/api/widgets/transformers.js
+++ b/frontend/src/api/widgets/transformers.js
@@ -66,7 +66,7 @@ function toDateStringFormat (interval) {
 const chartDataTransformer = (items, selectedPeriod) => {
     const  sortedItems = [...items].sort((a, b) => a.date - b.date);
     return sortedItems.map(item => {
-        return  {
+        return {
             'date': moment.unix(item.date).format(toDateStringFormat(selectedPeriod)),
             'value': item.value
         };

From bb9ae516bb30931ef4ebfed3cf061271c51fee32 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Fri, 6 Sep 2019 21:12:34 +0300
Subject: [PATCH 044/183] make units prop optional for linechart component

---
 frontend/src/components/common/LineChart.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/common/LineChart.vue b/frontend/src/components/common/LineChart.vue
index e583062d..c9b63df4 100644
--- a/frontend/src/components/common/LineChart.vue
+++ b/frontend/src/components/common/LineChart.vue
@@ -41,7 +41,7 @@
             },
             units: {
                 type: String,
-                required: true
+                default: ''
             }
         },
         data() {

From 3e70b44ca5f96bfa118632d752ada504a8885a74 Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Sat, 7 Sep 2019 07:45:18 +0300
Subject: [PATCH 045/183] edit query in the database, rename label

---
 .../EloquentVisitorRepository.php             | 19 ++++++++++++-------
 backend/tests/Feature/ActivityVisitorTest.php | 17 +++++++----------
 .../dashboard/home/ActiveVisitorsCard.vue     |  4 ++--
 .../dashboard/home/TopActivePage.vue          |  2 +-
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/backend/app/Repositories/EloquentVisitorRepository.php b/backend/app/Repositories/EloquentVisitorRepository.php
index 66bd5e43..32decc75 100644
--- a/backend/app/Repositories/EloquentVisitorRepository.php
+++ b/backend/app/Repositories/EloquentVisitorRepository.php
@@ -117,13 +117,18 @@ public function countInactiveSingleVisitSessionGroupByCountry(string $startDate,
     }
     public function getAllActivityVisitors(int $websiteId): SupportCollection
     {
-        $subQueryFirst = "SELECT page_id, visitor_id, max(created_at) over(partition by page_id) max_date FROM visits";
-        $subQuerySecond = "select v.visitor_id, p.url, v.max_date from (".$subQueryFirst .") v ";
-        $subQueryThird = "left join visitors vs ON v.visitor_id = vs.id 
-        left join pages p ON v.page_id = p.id
-        WHERE v.max_date > NOW() - interval '5 minute'
-        AND vs.website_id =".$websiteId." group by v.visitor_id ,p.url, v.max_date order by v.visitor_id desc";
-        $query = DB::raw($subQuerySecond.$subQueryThird);
+        $subQueryFirst = "select v.visitor_id, v.page_id, MAX(v.created_at) AS last_page from visits v 
+                        GROUP BY v.visitor_id, v.page_id";
+        $subQuerySecond = "select a.visitor_id, max(a.last_page) as last_p from (".$subQueryFirst.") a 
+                          group by a.visitor_id ";
+        $subQueryThird = "select vi.visitor_id, p.url, vi.created_at as max_date from (".$subQuerySecond.") b 
+                          left join visits vi on b.visitor_id = vi.visitor_id and b.last_p = vi.created_at 
+                          left join pages p on vi.page_id = p.id";
+        $subQueryFourth = "select * from (".$subQueryThird. ") c  left join visitors vs ON c.visitor_id = vs.id
+                            WHERE vs.created_at > NOW() - interval '5 minute'
+                            and vs.website_id = ".$websiteId."
+                            order by vs.id ,c.url, vs.last_activity; ";
+        $query = DB::raw($subQueryFourth);
         $result = DB::select((string)$query);
 
         return collect($result)->map(function ($item) {
diff --git a/backend/tests/Feature/ActivityVisitorTest.php b/backend/tests/Feature/ActivityVisitorTest.php
index ce7de4b2..ed6b7ef2 100644
--- a/backend/tests/Feature/ActivityVisitorTest.php
+++ b/backend/tests/Feature/ActivityVisitorTest.php
@@ -25,7 +25,9 @@ class ActivityVisitorTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $this->user = factory(User::class)->create();
+        $this->user = factory(User::class)->create([
+            'id'=>1
+        ]);
         $firstDate = Carbon::now('UTC')->subMinutes(15);
         $thirdDate = Carbon::now('UTC')->subMinutes(2);
         $this->firstDate = $firstDate;
@@ -37,11 +39,6 @@ public function testGetActivityUsersAction()
     {
         $expectedData = [
             "data" => [
-                [
-                    'url' => "http://page_2.test",
-                    'visitor' => 2,
-                    'date' => $this->thirdDate->format('Y-m-d H:i:s')
-                ],
                 [
                     'url' => "http://page_1.test",
                     'visitor' => 1,
@@ -56,7 +53,6 @@ public function testGetActivityUsersAction()
             "meta" => [],
 
         ];
-
         $this->actingAs($this->user)
             ->call('GET', 'api/v1/visitors/activity-visitors')
             ->assertStatus(200)
@@ -66,19 +62,20 @@ public function testGetActivityUsersAction()
     public function seedDataBase()
     {
         factory(Website::class)->create([
-            'id' => 1
+            'id' => 1,
+            'user_id'=>1
         ]);
         factory(Visitor::class)->create(
             [
                 'id' => 1,
-                'last_activity' => $this->thirdDate,
+                'created_at' => $this->thirdDate,
             ]
         );
 
         factory(Visitor::class)->create(
             [
                 'id' => 2,
-                'last_activity' => $this->firstDate
+                'created_at' => $this->firstDate,
             ]
         );
 
diff --git a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
index a4e3d23b..4aa880c7 100644
--- a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
+++ b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
@@ -7,7 +7,7 @@
             <Spinner v-if="activityDataFetching" />
             <div class="d-flex justify-content-between align-items-center card-top-row ">
                 <p class="card-text mb-0">
-                    Active users
+                    Active visitors
                 </p>
                 <p class="card-count text-right mb-0">
                     <strong>
@@ -47,7 +47,7 @@
                     :to="{ name: 'page-views'}"
                     class="btn card-button font-weight-light rounded"
                 >
-                    Real time report
+                    Page views overview
                 </RouterLink>
             </div>
         </div>
diff --git a/frontend/src/components/dashboard/home/TopActivePage.vue b/frontend/src/components/dashboard/home/TopActivePage.vue
index d9630b26..d1f34e82 100644
--- a/frontend/src/components/dashboard/home/TopActivePage.vue
+++ b/frontend/src/components/dashboard/home/TopActivePage.vue
@@ -4,7 +4,7 @@
     >
         <li class="card-title">
             <p>Top active pages</p>
-            <p>Users</p>
+            <p>Visitors</p>
         </li>
         <li
             v-for="page in topPages"

From 736896ecdcefc336e02e7e4012e46f658d087bcc Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Sat, 7 Sep 2019 11:25:02 +0300
Subject: [PATCH 046/183] add repository error reports, add api test

---
 .../ErrorReports/AddErrorReportsAction.php    |  64 +++++++++++
 .../AddErrorReportsActionRequest.php          |  87 ++++-----------
 .../OpenApi/ErrorReportsController.php        |   5 +-
 .../AddErrorReportsHttpRequest.php            |  19 +++-
 backend/app/Providers/AppServiceProvider.php  |   4 +
 .../ErrorReports/ErrorReportsRepository.php   |  10 ++
 .../Contracts/WebsiteRepository.php           |   2 +-
 .../EloquentErrorReportsRepository.php        |  17 +++
 .../EloquentWebsiteRepository.php             |   2 +-
 backend/routes/api.php                        |   6 +
 .../tests/Feature/OpenApiErrorReportsTest.php | 105 ++++++++++++++++++
 11 files changed, 249 insertions(+), 72 deletions(-)
 create mode 100644 backend/app/Repositories/Contracts/ErrorReports/ErrorReportsRepository.php
 create mode 100644 backend/app/Repositories/EloquentErrorReportsRepository.php
 create mode 100644 backend/tests/Feature/OpenApiErrorReportsTest.php

diff --git a/backend/app/Actions/ErrorReports/AddErrorReportsAction.php b/backend/app/Actions/ErrorReports/AddErrorReportsAction.php
index 52647bf4..70ac336a 100644
--- a/backend/app/Actions/ErrorReports/AddErrorReportsAction.php
+++ b/backend/app/Actions/ErrorReports/AddErrorReportsAction.php
@@ -4,9 +4,73 @@
 
 namespace App\Actions\ErrorReports;
 
+use App\Entities\Error;
+use App\Entities\Page;
+use App\Repositories\Contracts\ErrorReports\ErrorReportsRepository;
+use App\Repositories\Contracts\PageRepository;
+use App\Repositories\Contracts\WebsiteRepository;
+use Tymon\JWTAuth\Facades\JWTAuth;
+use Illuminate\Support\Str;
 
 final class AddErrorReportsAction
 {
+    private $errorReportsRepository;
+    private $websiteRepository;
+    private $pageRepository;
 
+    public function __construct(
+        ErrorReportsRepository $errorReportsRepository,
+        PageRepository $pageRepository,
+        WebsiteRepository $websiteRepository
+    ) {
+        $this->errorReportsRepository = $errorReportsRepository;
+        $this->websiteRepository = $websiteRepository;
+        $this->pageRepository = $pageRepository;
+    }
+
+    public function execute(AddErrorReportsActionRequest $request)
+    {
+        $visitorId = null;
+        if($request->token()) {
+            JWTAuth::setToken(Str::after($request->token(), 'Bearer '));
+            $visitorId = JWTAuth::getPayload()->get('visitor_id');
+        }
+
+        $websiteId = $this->websiteRepository
+            ->getByTrackNumber($request->trackingNumber())->id;
+
+        $page = $this->getOrCreatePage(
+            $websiteId,
+            $request->pageTitle(),
+            $request->page()
+        );
+
+        $error = new Error();
+
+        $error->message = $request->message();
+        $error->stack_trace = $request->stackTrace();
+        $error->visitor_id = $visitorId;
+        $error->page_id = $page->id;
+
+        $this->errorReportsRepository->save($error);
+    }
+
+    private function getOrCreatePage(int $websiteId, string $pageTitle, string $pageUrl): Page
+    {
+        $page = $this->pageRepository->getByParameters($websiteId, $pageTitle, $pageUrl);
+
+        if ($page !== null) {
+            return $page;
+        }
+
+        $page = new Page();
+
+        $page->name = $pageTitle;
+        $page->url = $pageUrl;
+        $page->previews = 0;
+        $page->website_id = $websiteId;
+
+        return $this->pageRepository->save($page);
+    }
 }
 
diff --git a/backend/app/Actions/ErrorReports/AddErrorReportsActionRequest.php b/backend/app/Actions/ErrorReports/AddErrorReportsActionRequest.php
index e432edfe..daf259e0 100644
--- a/backend/app/Actions/ErrorReports/AddErrorReportsActionRequest.php
+++ b/backend/app/Actions/ErrorReports/AddErrorReportsActionRequest.php
@@ -4,59 +4,42 @@
 
 namespace App\Actions\ErrorReports;
 
-
 use App\Http\Requests\ErrorReports\AddErrorReportsHttpRequest;
 
 final class AddErrorReportsActionRequest
 {
     private $page;
-    private $pageTitle;
-    private $language;
-    private $device;
-    private $resolutionWidth;
-    private $resolutionHeight;
-    private $userAgent;
-    private $ip;
     private $token;
-    private $pageLoadTime;
+    private $message;
+    private $trackingNumber;
+    private $stackTrace;
+    private $pageTitle;
 
     private function __construct(
         string $page,
+        string $message,
+        string $trackingNumber,
+        string $stackTrace,
         string $pageTitle,
-        string $language,
-        string $device,
-        int $resolutionWidth,
-        int $resolutionHeight,
-        string $userAgent,
-        string $ip,
-        string $token,
-        ?int $pageLoadTime
+        ?string $token
     ) {
         $this->page = $page;
+        $this->message = $message;
+        $this->trackingNumber = $trackingNumber;
+        $this->stackTrace = $stackTrace;
         $this->pageTitle = $pageTitle;
-        $this->language = $language;
-        $this->device = $device;
-        $this->resolutionWidth = $resolutionWidth;
-        $this->resolutionHeight = $resolutionHeight;
-        $this->userAgent = $userAgent;
-        $this->ip = $ip;
         $this->token = $token;
-        $this->pageLoadTime = $pageLoadTime;
     }
 
     public static function fromRequest(AddErrorReportsHttpRequest $request): self
     {
         return new static(
             $request->page(),
+            $request->message(),
+            $request->trackingNumber(),
+            $request->stackTrace(),
             $request->pageTitle(),
-            $request->language(),
-            $request->device(),
-            $request->resolutionWidth(),
-            $request->resolutionHeight(),
-            $request->userAgent(),
-            $request->ip(),
-            $request->token(),
-            $request->pageLoadTime(),
+            $request->token()
         );
     }
 
@@ -65,48 +48,26 @@ public function page(): string
         return $this->page;
     }
 
-    public function pageTitle(): string
+    public function message(): string
     {
-        return $this->pageTitle;
+        return $this->message;
     }
-
-    public function language(): string
+    public function trackingNumber(): string
     {
-        return $this->language;
+        return $this->trackingNumber;
     }
 
-    public function device(): string
+    public function stackTrace(): string
     {
-        return $this->device;
+        return $this->stackTrace;
     }
-
-    public function resolutionWidth(): int
-    {
-        return $this->resolutionWidth;
-    }
-
-    public function resolutionHeight(): int
-    {
-        return $this->resolutionHeight;
-    }
-
-    public function userAgent(): string
-    {
-        return $this->userAgent;
-    }
-
-    public function ip(): string
+    public function pageTitle(): string
     {
-        return $this->ip;
+        return $this->pageTitle;
     }
 
-    public function token(): string
+    public function token(): ?string
     {
         return $this->token;
     }
-
-    public function getPageLoadTime(): ?int
-    {
-        return $this->pageLoadTime;
-    }
 }
diff --git a/backend/app/Http/Controllers/OpenApi/ErrorReportsController.php b/backend/app/Http/Controllers/OpenApi/ErrorReportsController.php
index 2528c316..87e01479 100644
--- a/backend/app/Http/Controllers/OpenApi/ErrorReportsController.php
+++ b/backend/app/Http/Controllers/OpenApi/ErrorReportsController.php
@@ -5,10 +5,9 @@
 namespace App\Http\Controllers\OpenApi;
 
 use App\Actions\ErrorReports\AddErrorReportsAction;
-use App\Actions\Visits\CreateVisitRequest;
+use App\Actions\ErrorReports\AddErrorReportsActionRequest;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ErrorReports\AddErrorReportsHttpRequest;
-use App\Http\Requests\Visit\CreateVisitHttpRequest;
 use App\Http\Response\ApiResponse;
 
 final class ErrorReportsController extends Controller
@@ -22,7 +21,7 @@ public function __construct(AddErrorReportsAction $addErrorReportsAction)
 
     public function addErrorReports(AddErrorReportsHttpRequest $request): ApiResponse
     {
-        $this->addErrorReportsAction->execute(CreateVisitRequest::fromRequest($request));
+        $this->addErrorReportsAction->execute(AddErrorReportsActionRequest::fromRequest($request));
 
         return ApiResponse::emptySuccess();
     }
diff --git a/backend/app/Http/Requests/ErrorReports/AddErrorReportsHttpRequest.php b/backend/app/Http/Requests/ErrorReports/AddErrorReportsHttpRequest.php
index 3723030a..34eaf251 100644
--- a/backend/app/Http/Requests/ErrorReports/AddErrorReportsHttpRequest.php
+++ b/backend/app/Http/Requests/ErrorReports/AddErrorReportsHttpRequest.php
@@ -15,26 +15,37 @@ public function rules(): array
             'message' => 'required|string',
             'page' => 'required|string',
             'tracking_number' => 'required|string',
+            'page_title' => 'required|string',
         ];
     }
 
-    public function getPage()
+    public function page()
     {
         return $this->validated()['page'];
     }
 
-    public function getMessage()
+    public function message()
     {
         return $this->validated()['message'];
     }
 
-    public function getStackTrace()
+    public function pageTitle(): string
+    {
+        return $this->get('page_title');
+    }
+
+    public function stackTrace()
     {
         return $this->validated()['stack_trace'];
     }
 
-    public function getTrackingNumber()
+    public function trackingNumber()
     {
         return $this->validated()['tracking_number'];
     }
+
+    public function token(): ?string
+    {
+        return $this->header('X-Visitor');
+    }
 }
diff --git a/backend/app/Providers/AppServiceProvider.php b/backend/app/Providers/AppServiceProvider.php
index 4af00251..9aef0b7e 100644
--- a/backend/app/Providers/AppServiceProvider.php
+++ b/backend/app/Providers/AppServiceProvider.php
@@ -5,6 +5,7 @@
 use App\Repositories\Contracts\ChartPageTimingRepository;
 use App\Repositories\Contracts\ChartVisitorRepository;
 use App\Repositories\Contracts\ButtonVisitorsRepository;
+use App\Repositories\Contracts\ErrorReports\ErrorReportsRepository;
 use App\Repositories\Contracts\PageViews\ButtonDataRepository;
 use App\Repositories\Contracts\ChartVisitorsRepository;
 use App\Repositories\Contracts\GeoPositionRepository;
@@ -26,6 +27,7 @@
 use App\Repositories\EloquentChartPageTimingRepository;
 use App\Repositories\EloquentChartVisitorRepository;
 use App\Repositories\EloquentButtonVisitorsRepository;
+use App\Repositories\EloquentErrorReportsRepository;
 use App\Repositories\PageViews\EloquentButtonDataRepository;
 use App\Repositories\Contracts\TableNewVisitorsRepository;
 use App\Repositories\EloquentChartVisitorsRepository;
@@ -102,6 +104,8 @@ public function register()
         $this->app->bind(ChartPageTimingRepository::class, EloquentChartPageTimingRepository::class);
 
         $this->app->bind(TableDataRepository::class, EloquentTableDataRepository::class);
+
+        $this->app->bind(ErrorReportsRepository::class, EloquentErrorReportsRepository::class);
     }
 
     /**
diff --git a/backend/app/Repositories/Contracts/ErrorReports/ErrorReportsRepository.php b/backend/app/Repositories/Contracts/ErrorReports/ErrorReportsRepository.php
new file mode 100644
index 00000000..32e614e0
--- /dev/null
+++ b/backend/app/Repositories/Contracts/ErrorReports/ErrorReportsRepository.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Repositories\Contracts\ErrorReports;
+
+use App\Entities\Error;
+
+interface ErrorReportsRepository
+{
+    public function save(Error $visitor): Error;
+}
diff --git a/backend/app/Repositories/Contracts/WebsiteRepository.php b/backend/app/Repositories/Contracts/WebsiteRepository.php
index 3b4f103e..d2cd97bf 100644
--- a/backend/app/Repositories/Contracts/WebsiteRepository.php
+++ b/backend/app/Repositories/Contracts/WebsiteRepository.php
@@ -9,5 +9,5 @@ interface WebsiteRepository
 {
     public function save(Website $website): Website;
     public function getById(int $id): Website;
-    public function getByTrackNumber(int $id): ?Website;
+    public function getByTrackNumber(string $id): ?Website;
 }
diff --git a/backend/app/Repositories/EloquentErrorReportsRepository.php b/backend/app/Repositories/EloquentErrorReportsRepository.php
new file mode 100644
index 00000000..08f79ef9
--- /dev/null
+++ b/backend/app/Repositories/EloquentErrorReportsRepository.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Repositories;
+
+use App\Entities\Error;
+use App\Repositories\Contracts\ErrorReports\ErrorReportsRepository;
+
+final class EloquentErrorReportsRepository implements ErrorReportsRepository
+{
+    public function save(Error $error): Error
+    {
+        $error->save();
+        return $error;
+    }
+}
diff --git a/backend/app/Repositories/EloquentWebsiteRepository.php b/backend/app/Repositories/EloquentWebsiteRepository.php
index 2f414b58..afb8114c 100644
--- a/backend/app/Repositories/EloquentWebsiteRepository.php
+++ b/backend/app/Repositories/EloquentWebsiteRepository.php
@@ -24,7 +24,7 @@ public function getById(int $id): Website
         return Website::findOrFail($id);
     }
 
-    public function getByTrackNumber(int $trackNumber): ?Website
+    public function getByTrackNumber(string $trackNumber): ?Website
     {
         try {
             return Website::where('tracking_number', $trackNumber)->firstOrFail();
diff --git a/backend/routes/api.php b/backend/routes/api.php
index 1b45e88d..34ea9fc4 100644
--- a/backend/routes/api.php
+++ b/backend/routes/api.php
@@ -166,6 +166,12 @@
         ], function () {
             Route::post('/', 'VisitorController@createVisitor')->middleware('x-website');
         });
+
+        Route::group([
+            'prefix' => 'error-reports'
+        ], function () {
+            Route::post('/add-error-reports', 'ErrorReportsController@addErrorReports');
+        });
     });
 });
 
diff --git a/backend/tests/Feature/OpenApiErrorReportsTest.php b/backend/tests/Feature/OpenApiErrorReportsTest.php
new file mode 100644
index 00000000..218a9fdc
--- /dev/null
+++ b/backend/tests/Feature/OpenApiErrorReportsTest.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Entities\GeoPosition;
+use App\Entities\Page;
+use App\Entities\Session;
+use App\Entities\System;
+use App\Entities\User;
+use App\Entities\Visitor;
+use App\Entities\Website;
+use Faker\Factory;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Event;
+use Tests\TestCase;
+use Tymon\JWTAuth\Facades\JWTAuth;
+use Tymon\JWTAuth\Facades\JWTFactory;
+
+class openApiErrorReportsTest extends TestCase
+{
+    use RefreshDatabase;
+
+    private $user;
+    private $visitor;
+    private $page;
+    private $system;
+    private $session;
+    private $website;
+    private $url = 'api/v1/error-reports/add-error-reports/';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->user = factory(User::class)->create();
+        $this->website = factory(Website::class)->create();
+        $this->visitor = factory(Visitor::class)->create();
+        $this->page = factory(Page::class)->create([
+            'url' => 'https://google.com'
+        ]);
+        factory(GeoPosition::class)->create();
+        $this->system = factory(System::class)->create();
+        $this->session = factory(Session::class)->create();
+    }
+
+    public function testAddErrorWithVisitor()
+    {
+        Event::fake();
+        $faker = Factory::create();
+        $message = $faker->name;
+        $stack_trace = $faker->text;
+        $payload = JWTFactory::customClaims([
+            'sub' => env('API_ID'),
+            'visitor_id' => $this->visitor->id
+        ])->make();
+        $token = JWTAuth::encode($payload);
+
+        $data = [
+            'page' => $this->page->url,
+            'page_title' => $this->page->name,
+            'message' => $message,
+            'stack_trace' => $stack_trace,
+            'tracking_number' =>$this->website->tracking_number,
+        ];
+
+        $headers = [
+            'X-Visitor' => 'Bearer ' . $token
+        ];
+
+        $this->actingAs($this->user)
+            ->json('POST', $this->url, $data, $headers)
+            ->assertStatus(200);
+
+        $this->assertDatabaseHas('errors', [
+            'stack_trace' => $stack_trace,
+            'visitor_id' => $this->visitor->id,
+        ]);
+    }
+
+    public function testAddErrorWithoutVisitor()
+    {
+        Event::fake();
+        $faker = Factory::create();
+        $message = $faker->name;
+        $stack_trace = $faker->text;
+
+        $data = [
+            'page' => 'https://google23.com',
+            'page_title' => $this->page->name,
+            'message' => $message,
+            'stack_trace' => $stack_trace,
+            'tracking_number' =>$this->website->tracking_number,
+        ];
+
+
+
+        $this->actingAs($this->user)
+            ->json('POST', $this->url, $data)
+            ->assertStatus(200);
+
+        $this->assertDatabaseHas('errors', [
+            'stack_trace' => $stack_trace,
+            'visitor_id' => null,
+        ]);
+    }
+}

From f16299f6a6f2ac46d3c4cb65acb89bc1c960f3c2 Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Sat, 7 Sep 2019 11:27:10 +0300
Subject: [PATCH 047/183] edit style code

---
 backend/app/Actions/ErrorReports/AddErrorReportsAction.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/app/Actions/ErrorReports/AddErrorReportsAction.php b/backend/app/Actions/ErrorReports/AddErrorReportsAction.php
index 70ac336a..a8821cc1 100644
--- a/backend/app/Actions/ErrorReports/AddErrorReportsAction.php
+++ b/backend/app/Actions/ErrorReports/AddErrorReportsAction.php
@@ -31,7 +31,7 @@ public function __construct(
     public function execute(AddErrorReportsActionRequest $request)
     {
         $visitorId = null;
-        if($request->token()) {
+        if ($request->token()) {
             JWTAuth::setToken(Str::after($request->token(), 'Bearer '));
             $visitorId = JWTAuth::getPayload()->get('visitor_id');
         }

From 12a4c51bcde7301af6e10529421ba0f0d990ddac Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Sat, 7 Sep 2019 20:37:25 +0300
Subject: [PATCH 048/183] rename entity

---
 .../AddErrorReportAction.php}                 | 32 ++++++++++++-------
 .../AddErrorReportActionRequest.php}          |  6 ++--
 .../Actions/Visitors/CreateVisitorAction.php  |  2 +-
 ...ntroller.php => ErrorReportController.php} | 12 +++----
 .../AddErrorReportsHttpRequest.php            | 16 ++++++----
 backend/app/Providers/AppServiceProvider.php  |  6 ++--
 .../ErrorReportRepository.php}                |  4 +--
 .../Contracts/WebsiteRepository.php           |  2 +-
 ....php => EloquentErrorReportRepository.php} |  4 +--
 .../EloquentWebsiteRepository.php             |  2 +-
 backend/routes/api.php                        |  2 +-
 11 files changed, 51 insertions(+), 37 deletions(-)
 rename backend/app/Actions/{ErrorReports/AddErrorReportsAction.php => ErrorReport/AddErrorReportAction.php} (62%)
 rename backend/app/Actions/{ErrorReports/AddErrorReportsActionRequest.php => ErrorReport/AddErrorReportActionRequest.php} (91%)
 rename backend/app/Http/Controllers/OpenApi/{ErrorReportsController.php => ErrorReportController.php} (50%)
 rename backend/app/Http/Requests/{ErrorReports => ErrorReport}/AddErrorReportsHttpRequest.php (73%)
 rename backend/app/Repositories/Contracts/{ErrorReports/ErrorReportsRepository.php => ErrorReport/ErrorReportRepository.php} (50%)
 rename backend/app/Repositories/{EloquentErrorReportsRepository.php => EloquentErrorReportRepository.php} (57%)

diff --git a/backend/app/Actions/ErrorReports/AddErrorReportsAction.php b/backend/app/Actions/ErrorReport/AddErrorReportAction.php
similarity index 62%
rename from backend/app/Actions/ErrorReports/AddErrorReportsAction.php
rename to backend/app/Actions/ErrorReport/AddErrorReportAction.php
index a8821cc1..636a705d 100644
--- a/backend/app/Actions/ErrorReports/AddErrorReportsAction.php
+++ b/backend/app/Actions/ErrorReport/AddErrorReportAction.php
@@ -2,42 +2,52 @@
 
 declare(strict_types=1);
 
-namespace App\Actions\ErrorReports;
+namespace App\Actions\ErrorReport;
 
 use App\Entities\Error;
 use App\Entities\Page;
-use App\Repositories\Contracts\ErrorReports\ErrorReportsRepository;
+use App\Repositories\Contracts\ErrorReport\ErrorReportRepository;
 use App\Repositories\Contracts\PageRepository;
+use App\Repositories\Contracts\VisitorRepository;
 use App\Repositories\Contracts\WebsiteRepository;
 use Tymon\JWTAuth\Facades\JWTAuth;
 use Illuminate\Support\Str;
 
-final class AddErrorReportsAction
+final class AddErrorReportAction
 {
-    private $errorReportsRepository;
+    private $errorReportRepository;
     private $websiteRepository;
     private $pageRepository;
+    private $visitorRepository;
 
     public function __construct(
-        ErrorReportsRepository $errorReportsRepository,
+        ErrorReportRepository $errorReportsRepository,
         PageRepository $pageRepository,
-        WebsiteRepository $websiteRepository
+        WebsiteRepository $websiteRepository,
+        VisitorRepository $visitorRepository
     ) {
-        $this->errorReportsRepository = $errorReportsRepository;
+        $this->errorReportRepository = $errorReportsRepository;
         $this->websiteRepository = $websiteRepository;
         $this->pageRepository = $pageRepository;
+        $this->visitorRepository = $visitorRepository;
     }
 
-    public function execute(AddErrorReportsActionRequest $request)
+    public function execute(AddErrorReportActionRequest $request): void
     {
         $visitorId = null;
+        $websiteId = null;
+
         if ($request->token()) {
             JWTAuth::setToken(Str::after($request->token(), 'Bearer '));
             $visitorId = JWTAuth::getPayload()->get('visitor_id');
+            $visitor = $this->visitorRepository->getById($visitorId);
+            $websiteId = $visitor->website_id;
         }
 
-        $websiteId = $this->websiteRepository
-            ->getByTrackNumber($request->trackingNumber())->id;
+        if(!$websiteId) {
+            $websiteId = $this->websiteRepository
+                ->getByTrackNumber((int) $request->trackingNumber())->id;
+        }
 
         $page = $this->getOrCreatePage(
             $websiteId,
@@ -52,7 +62,7 @@ public function execute(AddErrorReportsActionRequest $request)
         $error->visitor_id = $visitorId;
         $error->page_id = $page->id;
 
-        $this->errorReportsRepository->save($error);
+        $this->errorReportRepository->save($error);
     }
 
     private function getOrCreatePage(int $websiteId, string $pageTitle, string $pageUrl): Page
diff --git a/backend/app/Actions/ErrorReports/AddErrorReportsActionRequest.php b/backend/app/Actions/ErrorReport/AddErrorReportActionRequest.php
similarity index 91%
rename from backend/app/Actions/ErrorReports/AddErrorReportsActionRequest.php
rename to backend/app/Actions/ErrorReport/AddErrorReportActionRequest.php
index daf259e0..a3d40291 100644
--- a/backend/app/Actions/ErrorReports/AddErrorReportsActionRequest.php
+++ b/backend/app/Actions/ErrorReport/AddErrorReportActionRequest.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace App\Actions\ErrorReports;
+namespace App\Actions\ErrorReport;
 
-use App\Http\Requests\ErrorReports\AddErrorReportsHttpRequest;
+use App\Http\Requests\ErrorReport\AddErrorReportsHttpRequest;
 
-final class AddErrorReportsActionRequest
+final class AddErrorReportActionRequest
 {
     private $page;
     private $token;
diff --git a/backend/app/Actions/Visitors/CreateVisitorAction.php b/backend/app/Actions/Visitors/CreateVisitorAction.php
index 82cd23d7..d0935404 100644
--- a/backend/app/Actions/Visitors/CreateVisitorAction.php
+++ b/backend/app/Actions/Visitors/CreateVisitorAction.php
@@ -30,7 +30,7 @@ public function __construct(
     public function execute(CreateVisitorRequest $request)
     {
         $websiteId = $this->websiteRepository
-            ->getByTrackNumber($request->trackNumber())->id;
+            ->getByTrackNumber((int) $request->trackNumber())->id;
 
         $visitorInstance = Visitor::make([
             'website_id' => $websiteId,
diff --git a/backend/app/Http/Controllers/OpenApi/ErrorReportsController.php b/backend/app/Http/Controllers/OpenApi/ErrorReportController.php
similarity index 50%
rename from backend/app/Http/Controllers/OpenApi/ErrorReportsController.php
rename to backend/app/Http/Controllers/OpenApi/ErrorReportController.php
index 87e01479..48568987 100644
--- a/backend/app/Http/Controllers/OpenApi/ErrorReportsController.php
+++ b/backend/app/Http/Controllers/OpenApi/ErrorReportController.php
@@ -4,24 +4,24 @@
 
 namespace App\Http\Controllers\OpenApi;
 
-use App\Actions\ErrorReports\AddErrorReportsAction;
-use App\Actions\ErrorReports\AddErrorReportsActionRequest;
+use App\Actions\ErrorReport\AddErrorReportAction;
+use App\Actions\ErrorReport\AddErrorReportActionRequest;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\ErrorReports\AddErrorReportsHttpRequest;
+use App\Http\Requests\ErrorReport\AddErrorReportsHttpRequest;
 use App\Http\Response\ApiResponse;
 
-final class ErrorReportsController extends Controller
+final class ErrorReportController extends Controller
 {
     private $addErrorReportsAction;
 
-    public function __construct(AddErrorReportsAction $addErrorReportsAction)
+    public function __construct(AddErrorReportAction $addErrorReportsAction)
     {
         $this->addErrorReportsAction = $addErrorReportsAction;
     }
 
     public function addErrorReports(AddErrorReportsHttpRequest $request): ApiResponse
     {
-        $this->addErrorReportsAction->execute(AddErrorReportsActionRequest::fromRequest($request));
+        $this->addErrorReportsAction->execute(AddErrorReportActionRequest::fromRequest($request));
 
         return ApiResponse::emptySuccess();
     }
diff --git a/backend/app/Http/Requests/ErrorReports/AddErrorReportsHttpRequest.php b/backend/app/Http/Requests/ErrorReport/AddErrorReportsHttpRequest.php
similarity index 73%
rename from backend/app/Http/Requests/ErrorReports/AddErrorReportsHttpRequest.php
rename to backend/app/Http/Requests/ErrorReport/AddErrorReportsHttpRequest.php
index 34eaf251..a880fd7e 100644
--- a/backend/app/Http/Requests/ErrorReports/AddErrorReportsHttpRequest.php
+++ b/backend/app/Http/Requests/ErrorReport/AddErrorReportsHttpRequest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Requests\ErrorReports;
+namespace App\Http\Requests\ErrorReport;
 
 use App\Http\Request\ApiFormRequest;
 
@@ -14,17 +14,16 @@ public function rules(): array
             'stack_trace' => 'required|string',
             'message' => 'required|string',
             'page' => 'required|string',
-            'tracking_number' => 'required|string',
             'page_title' => 'required|string',
         ];
     }
 
-    public function page()
+    public function page(): string
     {
         return $this->validated()['page'];
     }
 
-    public function message()
+    public function message(): string
     {
         return $this->validated()['message'];
     }
@@ -34,12 +33,12 @@ public function pageTitle(): string
         return $this->get('page_title');
     }
 
-    public function stackTrace()
+    public function stackTrace(): string
     {
         return $this->validated()['stack_trace'];
     }
 
-    public function trackingNumber()
+    public function trackingNumber(): string
     {
         return $this->validated()['tracking_number'];
     }
@@ -48,4 +47,9 @@ public function token(): ?string
     {
         return $this->header('X-Visitor');
     }
+
+    public function trackNumber(): string
+    {
+        return $this->header('X-Website');
+    }
 }
diff --git a/backend/app/Providers/AppServiceProvider.php b/backend/app/Providers/AppServiceProvider.php
index 9aef0b7e..b92a609b 100644
--- a/backend/app/Providers/AppServiceProvider.php
+++ b/backend/app/Providers/AppServiceProvider.php
@@ -5,7 +5,7 @@
 use App\Repositories\Contracts\ChartPageTimingRepository;
 use App\Repositories\Contracts\ChartVisitorRepository;
 use App\Repositories\Contracts\ButtonVisitorsRepository;
-use App\Repositories\Contracts\ErrorReports\ErrorReportsRepository;
+use App\Repositories\Contracts\ErrorReport\ErrorReportRepository;
 use App\Repositories\Contracts\PageViews\ButtonDataRepository;
 use App\Repositories\Contracts\ChartVisitorsRepository;
 use App\Repositories\Contracts\GeoPositionRepository;
@@ -27,7 +27,7 @@
 use App\Repositories\EloquentChartPageTimingRepository;
 use App\Repositories\EloquentChartVisitorRepository;
 use App\Repositories\EloquentButtonVisitorsRepository;
-use App\Repositories\EloquentErrorReportsRepository;
+use App\Repositories\EloquentErrorReportRepository;
 use App\Repositories\PageViews\EloquentButtonDataRepository;
 use App\Repositories\Contracts\TableNewVisitorsRepository;
 use App\Repositories\EloquentChartVisitorsRepository;
@@ -105,7 +105,7 @@ public function register()
 
         $this->app->bind(TableDataRepository::class, EloquentTableDataRepository::class);
 
-        $this->app->bind(ErrorReportsRepository::class, EloquentErrorReportsRepository::class);
+        $this->app->bind(ErrorReportRepository::class, EloquentErrorReportRepository::class);
     }
 
     /**
diff --git a/backend/app/Repositories/Contracts/ErrorReports/ErrorReportsRepository.php b/backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php
similarity index 50%
rename from backend/app/Repositories/Contracts/ErrorReports/ErrorReportsRepository.php
rename to backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php
index 32e614e0..d6fcef6d 100644
--- a/backend/app/Repositories/Contracts/ErrorReports/ErrorReportsRepository.php
+++ b/backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Repositories\Contracts\ErrorReports;
+namespace App\Repositories\Contracts\ErrorReport;
 
 use App\Entities\Error;
 
-interface ErrorReportsRepository
+interface ErrorReportRepository
 {
     public function save(Error $visitor): Error;
 }
diff --git a/backend/app/Repositories/Contracts/WebsiteRepository.php b/backend/app/Repositories/Contracts/WebsiteRepository.php
index d2cd97bf..3b4f103e 100644
--- a/backend/app/Repositories/Contracts/WebsiteRepository.php
+++ b/backend/app/Repositories/Contracts/WebsiteRepository.php
@@ -9,5 +9,5 @@ interface WebsiteRepository
 {
     public function save(Website $website): Website;
     public function getById(int $id): Website;
-    public function getByTrackNumber(string $id): ?Website;
+    public function getByTrackNumber(int $id): ?Website;
 }
diff --git a/backend/app/Repositories/EloquentErrorReportsRepository.php b/backend/app/Repositories/EloquentErrorReportRepository.php
similarity index 57%
rename from backend/app/Repositories/EloquentErrorReportsRepository.php
rename to backend/app/Repositories/EloquentErrorReportRepository.php
index 08f79ef9..2e556902 100644
--- a/backend/app/Repositories/EloquentErrorReportsRepository.php
+++ b/backend/app/Repositories/EloquentErrorReportRepository.php
@@ -5,9 +5,9 @@
 namespace App\Repositories;
 
 use App\Entities\Error;
-use App\Repositories\Contracts\ErrorReports\ErrorReportsRepository;
+use App\Repositories\Contracts\ErrorReport\ErrorReportRepository;
 
-final class EloquentErrorReportsRepository implements ErrorReportsRepository
+final class EloquentErrorReportRepository implements ErrorReportRepository
 {
     public function save(Error $error): Error
     {
diff --git a/backend/app/Repositories/EloquentWebsiteRepository.php b/backend/app/Repositories/EloquentWebsiteRepository.php
index afb8114c..2f414b58 100644
--- a/backend/app/Repositories/EloquentWebsiteRepository.php
+++ b/backend/app/Repositories/EloquentWebsiteRepository.php
@@ -24,7 +24,7 @@ public function getById(int $id): Website
         return Website::findOrFail($id);
     }
 
-    public function getByTrackNumber(string $trackNumber): ?Website
+    public function getByTrackNumber(int $trackNumber): ?Website
     {
         try {
             return Website::where('tracking_number', $trackNumber)->firstOrFail();
diff --git a/backend/routes/api.php b/backend/routes/api.php
index 34ea9fc4..0a3a287e 100644
--- a/backend/routes/api.php
+++ b/backend/routes/api.php
@@ -170,7 +170,7 @@
         Route::group([
             'prefix' => 'error-reports'
         ], function () {
-            Route::post('/add-error-reports', 'ErrorReportsController@addErrorReports');
+            Route::post('/', 'ErrorReportController@addErrorReport')->middleware('x-website');
         });
     });
 });

From e7f626b2a2a60a74921fca95e9fc001c28cf918b Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Sat, 7 Sep 2019 22:24:26 +0300
Subject: [PATCH 049/183] edit query activity visitors

---
 .../Repositories/EloquentVisitorRepository.php  | 17 +++++------------
 backend/tests/Feature/ActivityVisitorTest.php   | 14 ++++++--------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/backend/app/Repositories/EloquentVisitorRepository.php b/backend/app/Repositories/EloquentVisitorRepository.php
index 32decc75..300b2741 100644
--- a/backend/app/Repositories/EloquentVisitorRepository.php
+++ b/backend/app/Repositories/EloquentVisitorRepository.php
@@ -117,18 +117,11 @@ public function countInactiveSingleVisitSessionGroupByCountry(string $startDate,
     }
     public function getAllActivityVisitors(int $websiteId): SupportCollection
     {
-        $subQueryFirst = "select v.visitor_id, v.page_id, MAX(v.created_at) AS last_page from visits v 
-                        GROUP BY v.visitor_id, v.page_id";
-        $subQuerySecond = "select a.visitor_id, max(a.last_page) as last_p from (".$subQueryFirst.") a 
-                          group by a.visitor_id ";
-        $subQueryThird = "select vi.visitor_id, p.url, vi.created_at as max_date from (".$subQuerySecond.") b 
-                          left join visits vi on b.visitor_id = vi.visitor_id and b.last_p = vi.created_at 
-                          left join pages p on vi.page_id = p.id";
-        $subQueryFourth = "select * from (".$subQueryThird. ") c  left join visitors vs ON c.visitor_id = vs.id
-                            WHERE vs.created_at > NOW() - interval '5 minute'
-                            and vs.website_id = ".$websiteId."
-                            order by vs.id ,c.url, vs.last_activity; ";
-        $query = DB::raw($subQueryFourth);
+        $subQueryFirst = "SELECT DISTINCT ON (v.id) visitor_id, v.last_activity as max_date, v.website_id, p.url 
+                          from visitors v
+                          LEFT JOIN  visits vs on vs.visitor_id = v.id left join pages p on vs.page_id = p.id
+                          where v.last_activity > NOW() - interval '5 minutes' and v.website_id = ".$websiteId;
+        $query = DB::raw($subQueryFirst);
         $result = DB::select((string)$query);
 
         return collect($result)->map(function ($item) {
diff --git a/backend/tests/Feature/ActivityVisitorTest.php b/backend/tests/Feature/ActivityVisitorTest.php
index ed6b7ef2..aca140c0 100644
--- a/backend/tests/Feature/ActivityVisitorTest.php
+++ b/backend/tests/Feature/ActivityVisitorTest.php
@@ -20,6 +20,7 @@ class ActivityVisitorTest extends TestCase
 
     private $user;
     private $firstDate;
+    private $secondDate;
     private $thirdDate;
 
     protected function setUp(): void
@@ -29,8 +30,10 @@ protected function setUp(): void
             'id'=>1
         ]);
         $firstDate = Carbon::now('UTC')->subMinutes(15);
+        $secondDate = Carbon::now('UTC')->subMinutes(1);
         $thirdDate = Carbon::now('UTC')->subMinutes(2);
         $this->firstDate = $firstDate;
+        $this->secondDate = $secondDate;
         $this->thirdDate = $thirdDate;
         $this->seedDataBase();
     }
@@ -44,16 +47,11 @@ public function testGetActivityUsersAction()
                     'visitor' => 1,
                     'date' => $this->thirdDate->format('Y-m-d H:i:s')
                 ],
-                [
-                    'url' => "http://page_2.test",
-                    'visitor' => 1,
-                    'date' => $this->thirdDate->format('Y-m-d H:i:s')
-                ],
             ],
             "meta" => [],
 
         ];
-        $this->actingAs($this->user)
+        $k = $this->actingAs($this->user)
             ->call('GET', 'api/v1/visitors/activity-visitors')
             ->assertStatus(200)
             ->assertJson($expectedData);
@@ -68,14 +66,14 @@ public function seedDataBase()
         factory(Visitor::class)->create(
             [
                 'id' => 1,
-                'created_at' => $this->thirdDate,
+                'last_activity' => $this->thirdDate,
             ]
         );
 
         factory(Visitor::class)->create(
             [
                 'id' => 2,
-                'created_at' => $this->firstDate,
+                'last_activity' => $this->firstDate,
             ]
         );
 

From f5abc6980ecb561183a14c12674c4ddf259aaefc Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Sat, 7 Sep 2019 23:11:54 +0300
Subject: [PATCH 050/183] add const, add type hinting, type cast trackNumber

---
 .../ErrorReport/AddErrorReportAction.php      |  3 +-
 .../AddErrorReportActionRequest.php           | 12 ++++----
 .../Actions/Visitors/CreateVisitorAction.php  |  3 +-
 .../Actions/Visitors/CreateVisitorRequest.php |  6 ++--
 .../OpenApi/ErrorReportController.php         |  2 +-
 .../AddErrorReportsHttpRequest.php            | 24 ++++++++-------
 .../Requests/Visit/CreateVisitHttpRequest.php | 29 ++++++++++++-------
 .../Visitor/CreateVisitorHttpRequest.php      |  4 ++-
 .../tests/Feature/OpenApiErrorReportsTest.php | 13 +++++----
 9 files changed, 55 insertions(+), 41 deletions(-)

diff --git a/backend/app/Actions/ErrorReport/AddErrorReportAction.php b/backend/app/Actions/ErrorReport/AddErrorReportAction.php
index 636a705d..caab7c52 100644
--- a/backend/app/Actions/ErrorReport/AddErrorReportAction.php
+++ b/backend/app/Actions/ErrorReport/AddErrorReportAction.php
@@ -46,7 +46,7 @@ public function execute(AddErrorReportActionRequest $request): void
 
         if(!$websiteId) {
             $websiteId = $this->websiteRepository
-                ->getByTrackNumber((int) $request->trackingNumber())->id;
+                ->getByTrackNumber($request->trackNumber())->id;
         }
 
         $page = $this->getOrCreatePage(
@@ -83,4 +83,3 @@ private function getOrCreatePage(int $websiteId, string $pageTitle, string $page
         return $this->pageRepository->save($page);
     }
 }
-
diff --git a/backend/app/Actions/ErrorReport/AddErrorReportActionRequest.php b/backend/app/Actions/ErrorReport/AddErrorReportActionRequest.php
index a3d40291..92ce9c69 100644
--- a/backend/app/Actions/ErrorReport/AddErrorReportActionRequest.php
+++ b/backend/app/Actions/ErrorReport/AddErrorReportActionRequest.php
@@ -11,21 +11,21 @@ final class AddErrorReportActionRequest
     private $page;
     private $token;
     private $message;
-    private $trackingNumber;
+    private $trackNumber;
     private $stackTrace;
     private $pageTitle;
 
     private function __construct(
         string $page,
         string $message,
-        string $trackingNumber,
+        int $trackNumber,
         string $stackTrace,
         string $pageTitle,
         ?string $token
     ) {
         $this->page = $page;
         $this->message = $message;
-        $this->trackingNumber = $trackingNumber;
+        $this->trackNumber = $trackNumber;
         $this->stackTrace = $stackTrace;
         $this->pageTitle = $pageTitle;
         $this->token = $token;
@@ -36,7 +36,7 @@ public static function fromRequest(AddErrorReportsHttpRequest $request): self
         return new static(
             $request->page(),
             $request->message(),
-            $request->trackingNumber(),
+            (int) $request->trackNumber(),
             $request->stackTrace(),
             $request->pageTitle(),
             $request->token()
@@ -52,9 +52,9 @@ public function message(): string
     {
         return $this->message;
     }
-    public function trackingNumber(): string
+    public function trackNumber(): int
     {
-        return $this->trackingNumber;
+        return $this->trackNumber;
     }
 
     public function stackTrace(): string
diff --git a/backend/app/Actions/Visitors/CreateVisitorAction.php b/backend/app/Actions/Visitors/CreateVisitorAction.php
index d0935404..72c5377d 100644
--- a/backend/app/Actions/Visitors/CreateVisitorAction.php
+++ b/backend/app/Actions/Visitors/CreateVisitorAction.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace App\Actions\Visitors;
 
@@ -30,7 +31,7 @@ public function __construct(
     public function execute(CreateVisitorRequest $request)
     {
         $websiteId = $this->websiteRepository
-            ->getByTrackNumber((int) $request->trackNumber())->id;
+            ->getByTrackNumber($request->trackNumber())->id;
 
         $visitorInstance = Visitor::make([
             'website_id' => $websiteId,
diff --git a/backend/app/Actions/Visitors/CreateVisitorRequest.php b/backend/app/Actions/Visitors/CreateVisitorRequest.php
index 4a91e089..2fa5631d 100644
--- a/backend/app/Actions/Visitors/CreateVisitorRequest.php
+++ b/backend/app/Actions/Visitors/CreateVisitorRequest.php
@@ -10,7 +10,7 @@ final class CreateVisitorRequest
 {
     private $trackNumber;
 
-    private function __construct(string $trackNumber)
+    private function __construct(int $trackNumber)
     {
         $this->trackNumber = $trackNumber;
     }
@@ -18,11 +18,11 @@ private function __construct(string $trackNumber)
     public static function fromRequest(CreateVisitorHttpRequest $request): self
     {
         return new static(
-            $request->trackNumber()
+            (int) $request->trackNumber()
         );
     }
 
-    public function trackNumber(): string
+    public function trackNumber(): int
     {
         return $this->trackNumber;
     }
diff --git a/backend/app/Http/Controllers/OpenApi/ErrorReportController.php b/backend/app/Http/Controllers/OpenApi/ErrorReportController.php
index 48568987..76ba9db6 100644
--- a/backend/app/Http/Controllers/OpenApi/ErrorReportController.php
+++ b/backend/app/Http/Controllers/OpenApi/ErrorReportController.php
@@ -19,7 +19,7 @@ public function __construct(AddErrorReportAction $addErrorReportsAction)
         $this->addErrorReportsAction = $addErrorReportsAction;
     }
 
-    public function addErrorReports(AddErrorReportsHttpRequest $request): ApiResponse
+    public function addErrorReport(AddErrorReportsHttpRequest $request): ApiResponse
     {
         $this->addErrorReportsAction->execute(AddErrorReportActionRequest::fromRequest($request));
 
diff --git a/backend/app/Http/Requests/ErrorReport/AddErrorReportsHttpRequest.php b/backend/app/Http/Requests/ErrorReport/AddErrorReportsHttpRequest.php
index a880fd7e..2ec76ea0 100644
--- a/backend/app/Http/Requests/ErrorReport/AddErrorReportsHttpRequest.php
+++ b/backend/app/Http/Requests/ErrorReport/AddErrorReportsHttpRequest.php
@@ -8,6 +8,13 @@
 
 final class AddErrorReportsHttpRequest extends ApiFormRequest
 {
+    const PAGE = 'page';
+    const MESSAGE = 'message';
+    const PAGE_TITLE = 'page_title';
+    const STACK_TRACE = 'stack_trace';
+    const TRACKING_NUMBER = 'X-Visitor';
+    const HEADER_X_WEBSITE = 'X-Website';
+
     public function rules(): array
     {
         return [
@@ -20,36 +27,31 @@ public function rules(): array
 
     public function page(): string
     {
-        return $this->validated()['page'];
+        return $this->get(self::PAGE);
     }
 
     public function message(): string
     {
-        return $this->validated()['message'];
+        return $this->get(self::MESSAGE);
     }
 
     public function pageTitle(): string
     {
-        return $this->get('page_title');
+        return $this->get(self::PAGE_TITLE);
     }
 
     public function stackTrace(): string
     {
-        return $this->validated()['stack_trace'];
-    }
-
-    public function trackingNumber(): string
-    {
-        return $this->validated()['tracking_number'];
+        return $this->get(self::STACK_TRACE);
     }
 
     public function token(): ?string
     {
-        return $this->header('X-Visitor');
+        return $this->header(self::TRACKING_NUMBER);
     }
 
     public function trackNumber(): string
     {
-        return $this->header('X-Website');
+        return $this->header(self::HEADER_X_WEBSITE);
     }
 }
diff --git a/backend/app/Http/Requests/Visit/CreateVisitHttpRequest.php b/backend/app/Http/Requests/Visit/CreateVisitHttpRequest.php
index 6232cb4a..86c0c51d 100644
--- a/backend/app/Http/Requests/Visit/CreateVisitHttpRequest.php
+++ b/backend/app/Http/Requests/Visit/CreateVisitHttpRequest.php
@@ -9,10 +9,19 @@
 
 final class CreateVisitHttpRequest extends ApiFormRequest
 {
+    const PAGE = 'page';
+    const LANGUAGE = 'language';
+    const PAGE_TITLE = 'page_title';
+    const DEVICE = 'device';
+    const RESOLUTION_WIDTH = 'resolution_width';
+    const RESOLUTION_HEIGHT = 'resolution_height';
+    const PAGE_LOAD_TIME = 'page_load_time';
+    const HEADER_X_VISITOR = 'X-Visitor';
+
     public function rules(): array
     {
-        if (!$this->hasHeader('X-Visitor')) {
-            throw new MissingHeaderException('X-Visitor');
+        if (!$this->hasHeader(self::HEADER_X_VISITOR)) {
+            throw new MissingHeaderException(self::HEADER_X_VISITOR);
         }
 
         return [
@@ -28,41 +37,41 @@ public function rules(): array
 
     public function page(): string
     {
-        return $this->get('page');
+        return $this->get(self::PAGE);
     }
 
     public function pageTitle(): string
     {
-        return $this->get('page_title');
+        return $this->get(self::PAGE_TITLE);
     }
 
     public function language(): string
     {
-        return $this->get('language');
+        return $this->get(self::LANGUAGE);
     }
 
     public function device(): string
     {
-        return $this->get('device');
+        return $this->get(self::DEVICE);
     }
 
     public function resolutionWidth(): int
     {
-        return $this->get('resolution_width');
+        return $this->get(self::RESOLUTION_WIDTH);
     }
 
     public function resolutionHeight(): int
     {
-        return $this->get('resolution_height');
+        return $this->get(self::RESOLUTION_HEIGHT);
     }
 
     public function pageLoadTime(): ?int
     {
-        return $this->get('page_load_time');
+        return $this->get(self::PAGE_LOAD_TIME);
     }
 
     public function token(): string
     {
-        return $this->header('X-Visitor');
+        return $this->header(self::HEADER_X_VISITOR);
     }
 }
diff --git a/backend/app/Http/Requests/Visitor/CreateVisitorHttpRequest.php b/backend/app/Http/Requests/Visitor/CreateVisitorHttpRequest.php
index 9045d729..a1f0a1d9 100644
--- a/backend/app/Http/Requests/Visitor/CreateVisitorHttpRequest.php
+++ b/backend/app/Http/Requests/Visitor/CreateVisitorHttpRequest.php
@@ -8,6 +8,8 @@
 
 final class CreateVisitorHttpRequest extends ApiFormRequest
 {
+    const HEADER_X_WEBSITE = 'X-Website';
+
     public function rules(): array
     {
         return [];
@@ -15,6 +17,6 @@ public function rules(): array
 
     public function trackNumber(): string
     {
-        return $this->header('X-Website');
+        return $this->header(self::HEADER_X_WEBSITE);
     }
 }
diff --git a/backend/tests/Feature/OpenApiErrorReportsTest.php b/backend/tests/Feature/OpenApiErrorReportsTest.php
index 218a9fdc..6dca83e4 100644
--- a/backend/tests/Feature/OpenApiErrorReportsTest.php
+++ b/backend/tests/Feature/OpenApiErrorReportsTest.php
@@ -26,7 +26,7 @@ class openApiErrorReportsTest extends TestCase
     private $system;
     private $session;
     private $website;
-    private $url = 'api/v1/error-reports/add-error-reports/';
+    private $url = 'api/v1/error-reports/';
 
     protected function setUp(): void
     {
@@ -59,11 +59,11 @@ public function testAddErrorWithVisitor()
             'page_title' => $this->page->name,
             'message' => $message,
             'stack_trace' => $stack_trace,
-            'tracking_number' =>$this->website->tracking_number,
         ];
 
         $headers = [
-            'X-Visitor' => 'Bearer ' . $token
+            'X-Visitor' => 'Bearer ' . $token,
+            'X-Website' => $this->website->tracking_number
         ];
 
         $this->actingAs($this->user)
@@ -88,13 +88,14 @@ public function testAddErrorWithoutVisitor()
             'page_title' => $this->page->name,
             'message' => $message,
             'stack_trace' => $stack_trace,
-            'tracking_number' =>$this->website->tracking_number,
         ];
 
-
+        $headers = [
+            'X-Website' => $this->website->tracking_number
+        ];
 
         $this->actingAs($this->user)
-            ->json('POST', $this->url, $data)
+            ->json('POST', $this->url, $data, $headers)
             ->assertStatus(200);
 
         $this->assertDatabaseHas('errors', [

From ab6b163b5e4ec326f30e03de5dd1a3e96c923810 Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Sat, 7 Sep 2019 23:13:20 +0300
Subject: [PATCH 051/183] edit style code

---
 backend/app/Actions/ErrorReport/AddErrorReportAction.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/app/Actions/ErrorReport/AddErrorReportAction.php b/backend/app/Actions/ErrorReport/AddErrorReportAction.php
index caab7c52..5d19a4ad 100644
--- a/backend/app/Actions/ErrorReport/AddErrorReportAction.php
+++ b/backend/app/Actions/ErrorReport/AddErrorReportAction.php
@@ -44,7 +44,7 @@ public function execute(AddErrorReportActionRequest $request): void
             $websiteId = $visitor->website_id;
         }
 
-        if(!$websiteId) {
+        if (!$websiteId) {
             $websiteId = $this->websiteRepository
                 ->getByTrackNumber($request->trackNumber())->id;
         }

From 661b9f0c59604da668eed865c80bb4c32ec294a5 Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Sat, 7 Sep 2019 23:15:17 +0300
Subject: [PATCH 052/183] remove unused local variables

---
 backend/tests/Feature/ActivityVisitorTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/tests/Feature/ActivityVisitorTest.php b/backend/tests/Feature/ActivityVisitorTest.php
index aca140c0..44e346d9 100644
--- a/backend/tests/Feature/ActivityVisitorTest.php
+++ b/backend/tests/Feature/ActivityVisitorTest.php
@@ -51,7 +51,8 @@ public function testGetActivityUsersAction()
             "meta" => [],
 
         ];
-        $k = $this->actingAs($this->user)
+
+        $this->actingAs($this->user)
             ->call('GET', 'api/v1/visitors/activity-visitors')
             ->assertStatus(200)
             ->assertJson($expectedData);

From a1e4963e5e50467032e71d7e0d9004f4093ca598 Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Sat, 7 Sep 2019 23:23:01 +0300
Subject: [PATCH 053/183] add exit arcs

---
 .../visitors_flow/VisitorsFlowDiagram.vue     | 75 ++++++++++++++++---
 1 file changed, 63 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
index 0563c741..232080ff 100644
--- a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
+++ b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
@@ -54,7 +54,8 @@
                     { id: 14, name: '/sales' },
                     { id: 15, name: '(> 100 more pages)'},
                 ],
-                links: []
+                links: [],
+                exits: []
             };
         },
         computed: {
@@ -86,16 +87,29 @@
                 }
             },
 
+            createExits() {
+                this.exits = [];
+                let lastNodeId = this.nodes.slice(-1)[0].id;
+
+                for (let sourceInd = 5; sourceInd < lastNodeId; sourceInd++) {
+                    let sourceId = this.nodes[sourceInd].id;
+                    let value = Math.floor(Math.random() * 50);
+                    let exit = { source: sourceId, value: value };
+                    this.exits.push(exit);
+                }
+            },
+
             addInteraction () {
                 let lastNodeId = this.nodes.slice(-1)[0].id;
+
                 for (let i = lastNodeId + 1; i < lastNodeId + 6; i++) {
                     this.nodes.push({ id: i, name: `/link${i}`});
                 }
+
                 this.drawDiagram();
 
                 d3.transition()
                     .select('#visitors-flow-container')
-                    .duration(1000)
                     .tween("scroll", function () {
                         return (t) => {
                             this.scrollLeft += this.scrollWidth * t;
@@ -109,6 +123,7 @@
                 d3.select('.diagram-tooltip')
                     .remove();
                 this.createLinks();
+                this.createExits();
 
                 const _sankey = sankey()
                     .nodeSort(null)
@@ -123,7 +138,7 @@
                 const svg = d3.select('#visitors-flow-container')
                     .insert('svg', ':first-child')
                     .attr('id', 'visitors-flow-diagram')
-                    .attr("viewBox", `0 -40 ${this.width} ${this.height + 40}`)
+                    .attr("viewBox", `0 -40 ${this.width + 60} ${this.height + 80}`)
                     .style("width", "100%")
                     .style("min-width", this.width / 1.5)
                     .style("height", "auto");
@@ -139,9 +154,20 @@
                     .join("rect")
                     .attr("x", d => d.x0)
                     .attr("y", d => d.y0)
-                    .attr("rx", "5")
-                    .attr("ry", "5")
-                    .attr("height", d => d.y1 - d.y0)
+                    .attr("rx", "4")
+                    .attr("ry", "4")
+                    .attr("height", d => {
+                        /*let exit = this.exits.find((exit) => {
+                            console.log(d, exit);
+                            return d.id === exit.source;
+                        });
+
+                        if (exit) {
+                            return d.y1 - d.y0 + exit.value;
+                        }*/
+
+                        return d.y1 - d.y0;
+                    })
                     .attr("width", d => d.x1 - d.x0)
                     .attr("fill", () => '#526ede');
 
@@ -150,13 +176,12 @@
                     .attr("stroke-opacity", 0.5)
                     .selectAll("g")
                     .data(links)
-                    .join("g")
-                    .style("mix-blend-mode", "multiply");
+                    .join("g");
 
                 link.append("path")
                     .attr("d", sankeyLinkHorizontal())
                     .attr("class", "link")
-                    .attr("stroke", () => '#829afa')
+                    .attr("stroke", '#829afa')
                     .attr("stroke-width", d => Math.max(1, d.width));
 
                 const tooltip = d3.select("#visitors-flow-container")
@@ -168,9 +193,8 @@
                         .style("visibility", "visible");
                 })
                     .on("mouseleave", () => tooltip.style("visibility", "hidden"))
-                    .on("mousemove", function () {
-                        tooltip
-                            .style("left", (d3.event.pageX + 20) + "px")
+                    .on("mousemove", () => {
+                        tooltip.style("left", (d3.event.pageX + 20) + "px")
                             .style("top", (d3.event.pageY - 40) + "px");
                     });
 
@@ -202,6 +226,33 @@
                         }
                         return `${[d.depth]}th Interaction`;
                     });
+
+                svg.append("g")
+                    .attr("stroke-opacity", 0.5)
+                    .attr("fill", "none")
+                    .selectAll("rect")
+                    .data(this.exits)
+                    .join("path")
+                    .attr("stroke", "#fa514a")
+                    .attr("class", "link")
+                    .attr("d", d => {
+                        let node = nodes.find((node) => node.id === d.source);
+
+                        let mx = node.x1;
+                        let my = node.y1 - d.value / 2 - 2;
+
+                        return `M ${mx} ${my} a 35 45 0 0 1 35 45`;
+                    })
+                    .attr("stroke-width", d => d.value)
+                    .on("mouseover", d => {
+                        tooltip.text(`${d.value} drop-offs`)
+                            .style("visibility", "visible");
+                    })
+                    .on("mouseleave", () => tooltip.style("visibility", "hidden"))
+                    .on("mousemove", () => {
+                        tooltip.style("left", (d3.event.pageX + 20) + "px")
+                            .style("top", (d3.event.pageY - 40) + "px");
+                    });
             }
         }
     };

From f41b9d891c4aada628594211fcb5e7dba87a3620 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Sun, 8 Sep 2019 01:56:45 +0300
Subject: [PATCH 054/183] add VisitorsFlow controller

---
 .../VisitorsFlow/GetVisitorsFlowAction.php    | 10 +++++++++
 .../app/Http/Controllers/Api/VisitorsFlow.php | 22 +++++++++++++++++++
 .../VisitorsFlow/FlowAggregateService.php     |  8 ++-----
 backend/routes/api.php                        |  2 ++
 4 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
 create mode 100644 backend/app/Http/Controllers/Api/VisitorsFlow.php

diff --git a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
new file mode 100644
index 00000000..129ba194
--- /dev/null
+++ b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
@@ -0,0 +1,10 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Actions\VisitorsFlow;
+
+
+class GetVisitorsFlowAction
+{
+
+}
diff --git a/backend/app/Http/Controllers/Api/VisitorsFlow.php b/backend/app/Http/Controllers/Api/VisitorsFlow.php
new file mode 100644
index 00000000..be962cab
--- /dev/null
+++ b/backend/app/Http/Controllers/Api/VisitorsFlow.php
@@ -0,0 +1,22 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Api;
+
+use App\Actions\VisitorsFlow\GetVisitorsFlowAction;
+use App\Http\Controllers\Controller;
+
+final class VisitorsFlow extends Controller
+{
+    private $getVisitorsFlowAction;
+
+    public function __construct(GetVisitorsFlowAction $getVisitorsFlowAction)
+    {
+        $this->getVisitorsFlowAction = $getVisitorsFlowAction;
+    }
+
+    public function getVisitorsFlow()
+    {
+
+    }
+}
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 040fa08f..55569c17 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -124,7 +124,6 @@ public function aggregate(Visit $visit)
         if (!$browserAggregate) {
             $browserAggregate = $this->createBrowserAggregate($visit, $level, $previousVisit);
             $browserAggregate = $this->visitorFlowBrowserRepository->save($browserAggregate);
-//            dd($browserAggregate);
         } else {
             if ($level > 1) {
                 $previousAggregate = BrowserAggregate::getPreviousAggregate(
@@ -140,12 +139,11 @@ public function aggregate(Visit $visit)
             $browserAggregate->views++;
             $browserAggregate->exitCount++;
             $browserAggregate = $this->visitorFlowBrowserRepository->update($browserAggregate);
-//            dd($browserAggregate);
         }
         if (!$deviceAggregate) {
             $deviceAggregate = $this->createDeviceAggregate($visit, $level, $previousVisit);
             $deviceAggregate = $this->visitorFlowDeviceRepository->save($deviceAggregate);
-//            dd($deviceAggregate);
+            dd($deviceAggregate);
         } else {
             if ($level > 1) {
                 $previousAggregate = DeviceAggregate::getPreviousAggregate(
@@ -161,13 +159,12 @@ public function aggregate(Visit $visit)
             $deviceAggregate->views++;
             $deviceAggregate->exitCount++;
             $deviceAggregate = $this->visitorFlowDeviceRepository->update($deviceAggregate);
-//            dd($deviceAggregate);
+            dd($deviceAggregate);
         }
 
         if (!$screenAggregate) {
             $screenAggregate = $this->createScreenAggregate($visit, $level, $previousVisit);
             $screenAggregate = $this->visitorFlowScreenRepository->save($screenAggregate);
-            dd($screenAggregate);
         } else {
             if ($level > 1) {
                 $previousAggregate = ScreenAggregate::getPreviousAggregate(
@@ -183,7 +180,6 @@ public function aggregate(Visit $visit)
             $screenAggregate->views++;
             $screenAggregate->exitCount++;
             $screenAggregate = $this->visitorFlowScreenRepository->update($screenAggregate);
-            dd($screenAggregate);
         }
     }
 
diff --git a/backend/routes/api.php b/backend/routes/api.php
index 1b45e88d..7caba1c1 100644
--- a/backend/routes/api.php
+++ b/backend/routes/api.php
@@ -150,6 +150,8 @@
         Route::get('/geo-location-items', 'GeoLocationController');
 
         Route::get('/table-page-views', 'VisitController@getPageViewsItems');
+
+        Route::get('/visitors-flow', 'VisitorsFlowController@getVisitorsFlow');
     });
 
     Route::group([

From 408b33f48df729f5a53fc15c2b268315e707d93b Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Sun, 8 Sep 2019 04:28:32 +0300
Subject: [PATCH 055/183] rename aggregate's fields

---
 .../app/Aggregates/VisitorsFlow/Aggregate.php  | 18 +++++++++---------
 .../VisitorsFlow/BrowserAggregate.php          | 16 ++++++++--------
 .../VisitorsFlow/CountryAggregate.php          | 16 ++++++++--------
 .../VisitorsFlow/DeviceAggregate.php           | 16 ++++++++--------
 .../VisitorsFlow/ScreenAggregate.php           | 16 ++++++++--------
 .../VisitorsFlow/BrowserCriteria.php           | 10 +++++-----
 .../VisitorsFlow/Contracts/Criteria.php        |  2 +-
 .../VisitorsFlow/CountryCriteria.php           | 10 +++++-----
 .../VisitorsFlow/DeviceCriteria.php            | 10 +++++-----
 ...asticsearchVisitorFlowBrowserRepository.php |  6 +++---
 ...asticsearchVisitorFlowCountryRepository.php |  6 +++---
 ...lasticsearchVisitorFlowDeviceRepository.php |  6 +++---
 ...lasticsearchVisitorFlowScreenRepository.php |  6 +++---
 .../VisitorsFlow/ScreenCriteria.php            | 10 +++++-----
 .../VisitorsFlow/FlowAggregateService.php      | 12 ++++++------
 15 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/backend/app/Aggregates/VisitorsFlow/Aggregate.php b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
index eeb9a290..8af4521e 100644
--- a/backend/app/Aggregates/VisitorsFlow/Aggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
@@ -11,7 +11,7 @@ abstract class Aggregate
 {
     public $id;
     public $websiteId;
-    public $url;
+    public $targetUrl;
     public $title;
     public $prevPage;
     public $views;
@@ -22,7 +22,7 @@ abstract class Aggregate
     public function __construct(
         int $id,
         int $websiteId,
-        string $url,
+        string $targetUrl,
         string $title,
         int $views,
         int $level,
@@ -33,7 +33,7 @@ public function __construct(
     {
         $this->id = $id;
         $this->websiteId = $websiteId;
-        $this->url = $url;
+        $this->targetUrl = $targetUrl;
         $this->title = $title;
         $this->views = $views;
         $this->level = $level;
@@ -47,17 +47,17 @@ public function toArray(): array
     {
         return [
             'id' => $this->id,
-            'websiteId' => $this->websiteId,
-            'url' => $this->url,
+            'website_id' => $this->websiteId,
+            'target_url' => $this->targetUrl,
             'title' => $this->title,
-            'prevPage' => [
+            'prev_page' => [
                 'id' => $this->prevPage->id,
-                'url' => $this->prevPage->url
+                'source_url' => $this->prevPage->url
             ],
             'level' => $this->level,
             'views' => $this->views,
-            'isLastPage' => $this->isLastPage,
-            'exitCount' => $this->exitCount
+            'is_last_page' => $this->isLastPage,
+            'exit_count' => $this->exitCount
         ];
     }
 
diff --git a/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php b/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
index 9b3a917f..5eba3d43 100644
--- a/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
@@ -15,7 +15,7 @@ class BrowserAggregate extends Aggregate
     public function __construct(
         int $id,
         int $websiteId,
-        string $url,
+        string $targetUrl,
         string $title,
         int $views,
         int $level,
@@ -25,7 +25,7 @@ public function __construct(
         PageValue $prevPage
     )
     {
-        parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
+        parent::__construct($id, $websiteId, $targetUrl, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
         $this->browser = $browser;
     }
 
@@ -38,17 +38,17 @@ public static function fromResult(array $result): Aggregate
     {
         return new static(
             (int)$result['id'],
-            (int)$result['websiteId'],
-            (string)$result['url'],
+            (int)$result['website_id'],
+            (string)$result['target_url'],
             (string)$result['title'],
             (int)$result['views'],
             (int)$result['level'],
-            (bool)$result['isLastPage'],
-            (int)$result['exitCount'],
+            (bool)$result['is_last_page'],
+            (int)$result['exit_count'],
             (string)$result['browser'],
             new PageValue(
-                (int)$result['prevPage']['id'],
-                (string)$result['prevPage']['url']
+                (int)$result['prev_page']['id'],
+                (string)$result['prev_page']['source_url']
             )
         );
     }
diff --git a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
index 5e79fd5a..26ffb475 100644
--- a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
@@ -15,7 +15,7 @@ class CountryAggregate extends Aggregate
     public function __construct(
         int $id,
         int $websiteId,
-        string $url,
+        string $targetUrl,
         string $title,
         int $views,
         int $level,
@@ -25,7 +25,7 @@ public function __construct(
         PageValue $prevPage
     )
     {
-        parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
+        parent::__construct($id, $websiteId, $targetUrl, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
         $this->country = $country;
     }
 
@@ -38,17 +38,17 @@ public static function fromResult(array $result): Aggregate
     {
         return new static(
             (int)$result['id'],
-            (int)$result['websiteId'],
-            (string)$result['url'],
+            (int)$result['website_id'],
+            (string)$result['target_url'],
             (string)$result['title'],
             (int)$result['views'],
             (int)$result['level'],
-            (bool)$result['isLastPage'],
-            (int)$result['exitCount'],
+            (bool)$result['is_last_page'],
+            (int)$result['exit_count'],
             (string)$result['country'],
             new PageValue(
-                (int)$result['prevPage']['id'],
-                (string)$result['prevPage']['url']
+                (int)$result['prev_page']['id'],
+                (string)$result['prev_page']['source_url']
             )
         );
     }
diff --git a/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php b/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
index 14ef6c7f..8d32e28c 100644
--- a/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
@@ -15,7 +15,7 @@ class DeviceAggregate extends Aggregate
     public function __construct(
         int $id,
         int $websiteId,
-        string $url,
+        string $targetUrl,
         string $title,
         int $views,
         int $level,
@@ -25,7 +25,7 @@ public function __construct(
         PageValue $prevPage
     )
     {
-        parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
+        parent::__construct($id, $websiteId, $targetUrl, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
         $this->device = $device;
     }
 
@@ -38,17 +38,17 @@ public static function fromResult(array $result): Aggregate
     {
         return new static(
             (int)$result['id'],
-            (int)$result['websiteId'],
-            (string)$result['url'],
+            (int)$result['website_id'],
+            (string)$result['target_url'],
             (string)$result['title'],
             (int)$result['views'],
             (int)$result['level'],
-            (bool)$result['isLastPage'],
-            (int)$result['exitCount'],
+            (bool)$result['is_last_page'],
+            (int)$result['exit_count'],
             (string)$result['device'],
             new PageValue(
-                (int)$result['prevPage']['id'],
-                (string)$result['prevPage']['url']
+                (int)$result['prev_page']['id'],
+                (string)$result['prev_page']['source_url']
             )
         );
     }
diff --git a/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php b/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
index 8f6fc47c..2aa3b4ea 100644
--- a/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
@@ -16,7 +16,7 @@ class ScreenAggregate extends Aggregate
     public function __construct(
         int $id,
         int $websiteId,
-        string $url,
+        string $targetUrl,
         string $title,
         int $views,
         int $level,
@@ -27,7 +27,7 @@ public function __construct(
         PageValue $prevPage
     )
     {
-        parent::__construct($id, $websiteId, $url, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
+        parent::__construct($id, $websiteId, $targetUrl, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
         $this->resolutionWidth = $resolutionWidth;
         $this->resolutionHeight = $resolutionHeight;
     }
@@ -44,18 +44,18 @@ public static function fromResult(array $result): Aggregate
     {
         return new static(
             (int)$result['id'],
-            (int)$result['websiteId'],
-            (string)$result['url'],
+            (int)$result['website_id'],
+            (string)$result['target_url'],
             (string)$result['title'],
             (int)$result['views'],
             (int)$result['level'],
-            (bool)$result['isLastPage'],
-            (int)$result['exitCount'],
+            (bool)$result['is_last_page'],
+            (int)$result['exit_count'],
             (string)$result['resolution_width'],
             (string)$result['resolution_height'],
             new PageValue(
-                (int)$result['prevPage']['id'],
-                (string)$result['prevPage']['url']
+                (int)$result['prev_page']['id'],
+                (string)$result['prev_page']['source_url']
             )
         );
     }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php
index f4145976..b3b14c77 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php
@@ -8,25 +8,25 @@
 class BrowserCriteria implements Criteria
 {
     public $websiteId;
-    public $url;
+    public $targetUrl;
     public $level;
     public $browser;
     public $prevPageUrl;
 
-    private function __construct(int $websiteId, string $url, int $level, ?string $prevPageUrl, string $browser)
+    private function __construct(int $websiteId, string $targetUrl, int $level, ?string $prevPageUrl, string $browser)
     {
         $this->websiteId = $websiteId;
-        $this->url = $url;
+        $this->targetUrl = $targetUrl;
         $this->level = $level;
         $this->browser = $browser;
         $this->prevPageUrl = $prevPageUrl;
     }
 
-    public static function getCriteria(int $websiteId, string $url, int $level, ?string $prevPageUrl, ...$params)
+    public static function getCriteria(int $websiteId, string $targetUrl, int $level, ?string $prevPageUrl, ...$params)
     {
         return new static(
             $websiteId,
-            $url,
+            $targetUrl,
             $level,
             $prevPageUrl,
             $params[0]
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php
index 57c893f7..f3aab4d1 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/Criteria.php
@@ -5,5 +5,5 @@
 
 interface Criteria
 {
-    public static function getCriteria(int $websiteId, string $url, int $level, ?string $prevPageUrl, ...$params);
+    public static function getCriteria(int $websiteId, string $targetUrl, int $level, ?string $prevPageUrl, ...$params);
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php
index c6374f44..4b0bed75 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/CountryCriteria.php
@@ -8,25 +8,25 @@
 class CountryCriteria implements Criteria
 {
     public $websiteId;
-    public $url;
+    public $targetUrl;
     public $level;
     public $country;
     public $prevPageUrl;
 
-    private function __construct(int $websiteId, string $url, int $level, ?string $prevPageUrl, string $country)
+    private function __construct(int $websiteId, string $targetUrl, int $level, ?string $prevPageUrl, string $country)
     {
         $this->websiteId = $websiteId;
-        $this->url = $url;
+        $this->targetUrl = $targetUrl;
         $this->level = $level;
         $this->country = $country;
         $this->prevPageUrl = $prevPageUrl;
     }
 
-    public static function getCriteria(int $websiteId, string $url, int $level, ?string $prevPageUrl, ...$params)
+    public static function getCriteria(int $websiteId, string $targetUrl, int $level, ?string $prevPageUrl, ...$params)
     {
         return new static(
             $websiteId,
-            $url,
+            $targetUrl,
             $level,
             $prevPageUrl,
             $params[0]
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/DeviceCriteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/DeviceCriteria.php
index 667c93aa..795516d0 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/DeviceCriteria.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/DeviceCriteria.php
@@ -8,25 +8,25 @@
 class DeviceCriteria implements Criteria
 {
     public $websiteId;
-    public $url;
+    public $targetUrl;
     public $level;
     public $device;
     public $prevPageUrl;
 
-    private function __construct(int $websiteId, string $url, int $level, ?string $prevPageUrl, string $device)
+    private function __construct(int $websiteId, string $targetUrl, int $level, ?string $prevPageUrl, string $device)
     {
         $this->websiteId = $websiteId;
-        $this->url = $url;
+        $this->targetUrl = $targetUrl;
         $this->level = $level;
         $this->device = $device;
         $this->prevPageUrl = $prevPageUrl;
     }
 
-    public static function getCriteria(int $websiteId, string $url, int $level, ?string $prevPageUrl, ...$params)
+    public static function getCriteria(int $websiteId, string $targetUrl, int $level, ?string $prevPageUrl, ...$params)
     {
         return new static(
             $websiteId,
-            $url,
+            $targetUrl,
             $level,
             $prevPageUrl,
             $params[0]
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
index 6da34285..8712022f 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
@@ -52,13 +52,13 @@ public function getByCriteria(Criteria $criteria): ?BrowserAggregate
                 'query' => [
                     'bool' => [
                         'must' => [
-                            ['match' => ['websiteId' => $criteria->websiteId]],
+                            ['match' => ['website_id' => $criteria->websiteId]],
                         ],
                         'filter' => [
                             ['term' => ['level' => $criteria->level]],
-                            ['match_phrase' => ['url' => $criteria->url]],
+                            ['match_phrase' => ['target_url' => $criteria->targetUrl]],
                             ['match_phrase' => ['browser' => $criteria->browser]],
-                            ['match_phrase'=>['prevPage.url'=>$criteria->prevPageUrl]]
+                            ['match_phrase'=>['prev_page.source_url'=>$criteria->prevPageUrl]]
                         ],
                     ]
                 ]
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
index c3788b2a..2fe6d8d4 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
@@ -52,13 +52,13 @@ public function getByCriteria(Criteria $criteria): ?CountryAggregate
                 'query' => [
                     'bool' => [
                         'must' => [
-                            ['match' => ['websiteId' => $criteria->websiteId]],
+                            ['match' => ['website_id' => $criteria->websiteId]],
                         ],
                         'filter' => [
                             ['term' => ['level' => $criteria->level]],
-                            ['match_phrase' => ['url' => $criteria->url]],
+                            ['match_phrase' => ['target_url' => $criteria->targetUrl]],
                             ['match_phrase' => ['country' => $criteria->country]],
-                            ['match_phrase'=>['prevPage.url'=>$criteria->prevPageUrl]]
+                            ['match_phrase'=>['prev_page.source_url'=>$criteria->prevPageUrl]]
                         ],
                     ]
                 ]
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
index 3a97105e..ac65a0a8 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
@@ -53,13 +53,13 @@ public function getByCriteria(Criteria $criteria): ?DeviceAggregate
                 'query' => [
                     'bool' => [
                         'must' => [
-                            ['match' => ['websiteId' => $criteria->websiteId]],
+                            ['match' => ['website_id' => $criteria->websiteId]],
                         ],
                         'filter' => [
                             ['term' => ['level' => $criteria->level]],
-                            ['match_phrase' => ['url' => $criteria->url]],
+                            ['match_phrase' => ['target_url' => $criteria->targetUrl]],
                             ['match_phrase' => ['device' => $criteria->device]],
-                            ['match_phrase'=>['prevPage.url'=>$criteria->prevPageUrl]]
+                            ['match_phrase'=>['prev_page.source_url'=>$criteria->prevPageUrl]]
                         ],
                     ]
                 ]
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
index 7d455520..8316b54f 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
@@ -53,14 +53,14 @@ public function getByCriteria(Criteria $criteria): ?ScreenAggregate
                 'query' => [
                     'bool' => [
                         'must' => [
-                            ['match' => ['websiteId' => $criteria->websiteId]],
+                            ['match' => ['website_id' => $criteria->websiteId]],
                         ],
                         'filter' => [
                             ['term' => ['level' => $criteria->level]],
                             ['match_phrase' => ['resolution_width' => $criteria->resolutionWidth]],
                             ['match_phrase' => ['resolution_height' => $criteria->resolutionHeight]],
-                            ['match_phrase' => ['url' => $criteria->url]],
-                            ['match_phrase'=>['prevPage.url'=>$criteria->prevPageUrl]]
+                            ['match_phrase' => ['target_url' => $criteria->targetUrl]],
+                            ['match_phrase'=>['prev_page.source_url'=>$criteria->prevPageUrl]]
                         ],
                     ]
                 ]
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ScreenCriteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ScreenCriteria.php
index 2aba6e30..7866bb09 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ScreenCriteria.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ScreenCriteria.php
@@ -8,7 +8,7 @@
 class ScreenCriteria implements Criteria
 {
     public $websiteId;
-    public $url;
+    public $targetUrl;
     public $level;
     public $resolutionWidth;
     public $resolutionHeight;
@@ -16,7 +16,7 @@ class ScreenCriteria implements Criteria
 
     private function __construct(
         int $websiteId,
-        string $url,
+        string $targetUrl,
         int $level,
         ?string $prevPageUrl,
         string $resolutionWidth,
@@ -24,18 +24,18 @@ private function __construct(
     )
     {
         $this->websiteId = $websiteId;
-        $this->url = $url;
+        $this->targetUrl = $targetUrl;
         $this->level = $level;
         $this->resolutionWidth = $resolutionWidth;
         $this->resolutionHeight = $resolutionHeight;
         $this->prevPageUrl = $prevPageUrl;
     }
 
-    public static function getCriteria(int $websiteId, string $url, int $level, ?string $prevPageUrl, ...$params)
+    public static function getCriteria(int $websiteId, string $targetUrl, int $level, ?string $prevPageUrl, ...$params)
     {
         return new static(
             $websiteId,
-            $url,
+            $targetUrl,
             $level,
             $prevPageUrl,
             $params[0],
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 55569c17..0aa7c42c 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -124,6 +124,7 @@ public function aggregate(Visit $visit)
         if (!$browserAggregate) {
             $browserAggregate = $this->createBrowserAggregate($visit, $level, $previousVisit);
             $browserAggregate = $this->visitorFlowBrowserRepository->save($browserAggregate);
+            dd($browserAggregate);
         } else {
             if ($level > 1) {
                 $previousAggregate = BrowserAggregate::getPreviousAggregate(
@@ -139,11 +140,11 @@ public function aggregate(Visit $visit)
             $browserAggregate->views++;
             $browserAggregate->exitCount++;
             $browserAggregate = $this->visitorFlowBrowserRepository->update($browserAggregate);
+            dd($browserAggregate);
         }
         if (!$deviceAggregate) {
             $deviceAggregate = $this->createDeviceAggregate($visit, $level, $previousVisit);
             $deviceAggregate = $this->visitorFlowDeviceRepository->save($deviceAggregate);
-            dd($deviceAggregate);
         } else {
             if ($level > 1) {
                 $previousAggregate = DeviceAggregate::getPreviousAggregate(
@@ -159,7 +160,6 @@ public function aggregate(Visit $visit)
             $deviceAggregate->views++;
             $deviceAggregate->exitCount++;
             $deviceAggregate = $this->visitorFlowDeviceRepository->update($deviceAggregate);
-            dd($deviceAggregate);
         }
 
         if (!$screenAggregate) {
@@ -227,7 +227,7 @@ private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit
             $previousAggregate->isLastPage = false;
             $previousAggregate->exitCount--;
             $this->visitorFlowCountryRepository->update($previousAggregate);
-            $prevPage = new PageValue($previousVisit->id, $previousAggregate->url);
+            $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
         }
 
         $isLatPage = true;
@@ -262,7 +262,7 @@ private function createBrowserAggregate(Visit $currentVisit, int $level, ?Visit
             $previousAggregate->isLastPage = false;
             $previousAggregate->exitCount--;
             $this->visitorFlowBrowserRepository->update($previousAggregate);
-            $prevPage = new PageValue($previousVisit->id, $previousAggregate->url);
+            $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
         }
         $exitCount = 1;
         $isLatPage = true;
@@ -296,7 +296,7 @@ private function createDeviceAggregate(Visit $currentVisit, int $level, ?Visit $
             $previousAggregate->isLastPage = false;
             $previousAggregate->exitCount--;
             $this->visitorFlowDeviceRepository->update($previousAggregate);
-            $prevPage = new PageValue($previousVisit->id, $previousAggregate->url);
+            $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
         }
         $exitCount = 1;
         $isLatPage = true;
@@ -330,7 +330,7 @@ private function createScreenAggregate(Visit $currentVisit, int $level, ?Visit $
             $previousAggregate->isLastPage = false;
             $previousAggregate->exitCount--;
             $this->visitorFlowScreenRepository->update($previousAggregate);
-            $prevPage = new PageValue($previousVisit->id, $previousAggregate->url);
+            $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
         }
         $exitCount = 1;
         $isLatPage = true;

From f660eca802fec3f9527b889e90527d52ef188759 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Sun, 8 Sep 2019 13:19:23 +0300
Subject: [PATCH 056/183] add mapping to migrations

---
 ...215_create_country_visitors_flow_index.php | 45 +++++++++++++++++++
 ...610_create_browser_visitors_flow_index.php | 43 ++++++++++++++++++
 ...3620_create_device_visitors_flow_index.php | 44 ++++++++++++++++++
 ...3634_create_screen_visitors_flow_index.php | 44 ++++++++++++++++++
 4 files changed, 176 insertions(+)
 create mode 100644 backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php
 create mode 100644 backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php
 create mode 100644 backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php
 create mode 100644 backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php

diff --git a/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php
new file mode 100644
index 00000000..96a542b7
--- /dev/null
+++ b/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php
@@ -0,0 +1,45 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+
+class CreateCountryVisitorsFlowIndex extends Migration
+{
+    private const INDEX_NAME = 'country-visitors-flow-index';
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $client = app('elasticsearch');
+        $params = [
+            'index' => self::INDEX_NAME,
+            'body' => [
+                'mappings' => [
+                    "properties" => [
+                        "country" => [
+                            "type" => "keyword"
+                        ]
+                    ]
+                ]
+            ]
+        ];
+
+        $client->indices()->create($params);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        $client = app('elasticsearch');
+        $params = ['index' => self::INDEX_NAME];
+        $client->indices()->delete($params);
+    }
+}
diff --git a/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php
new file mode 100644
index 00000000..fb4c8666
--- /dev/null
+++ b/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php
@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class CreateBrowserVisitorsFlowIndex extends Migration
+{
+    private const INDEX_NAME = 'browser-visitors-flow-index';
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $client = app('elasticsearch');
+        $params = [
+            'index' => self::INDEX_NAME,
+            'body' => [
+                'mappings' => [
+                    "properties" => [
+                        "browser" => [
+                            "type" => "keyword"
+                        ]
+                    ]
+                ]
+            ]
+        ];
+        $client->indices()->create($params);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        $client = app('elasticsearch');
+        $params = ['index' => self::INDEX_NAME];
+        $client->indices()->delete($params);
+    }
+}
diff --git a/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php
new file mode 100644
index 00000000..768c3e3d
--- /dev/null
+++ b/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php
@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class CreateDeviceVisitorsFlowIndex extends Migration
+{
+    private const INDEX_NAME = 'device-visitors-flow-index';
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $client = app('elasticsearch');
+        $params = [
+            'index' => self::INDEX_NAME,
+            'body' => [
+                'mappings' => [
+                    "properties" => [
+                        "device" => [
+                            "type" => "keyword"
+                        ]
+                    ]
+                ]
+            ]
+        ];
+        $client->indices()->create($params);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        $client = app('elasticsearch');
+        $params = ['index' => self::INDEX_NAME];
+        $client->indices()->delete($params);
+    }
+
+}
diff --git a/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php
new file mode 100644
index 00000000..a5d736e3
--- /dev/null
+++ b/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php
@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class CreateScreenVisitorsFlowIndex extends Migration
+{
+    private const INDEX_NAME = 'screen-visitors-flow-index';
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $client = app('elasticsearch');
+        $params = [
+            'index' => self::INDEX_NAME,
+            'body' => [
+                'mappings' => [
+                    "properties" => [
+                        "screen" => [
+                            "type" => "keyword"
+                        ]
+                    ]
+                ]
+            ]
+        ];
+        $client->indices()->create($params);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        $client = app('elasticsearch');
+        $params = ['index' => self::INDEX_NAME];
+        $client->indices()->delete($params);
+    }
+
+}

From ecb3c3298628815b91079d288724423a9ddc5a5e Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Sun, 8 Sep 2019 14:01:35 +0300
Subject: [PATCH 057/183] edit get JWT string

---
 backend/app/Actions/Visitors/CreateVisitorAction.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/app/Actions/Visitors/CreateVisitorAction.php b/backend/app/Actions/Visitors/CreateVisitorAction.php
index 72c5377d..3896ce44 100644
--- a/backend/app/Actions/Visitors/CreateVisitorAction.php
+++ b/backend/app/Actions/Visitors/CreateVisitorAction.php
@@ -50,6 +50,6 @@ public function execute(CreateVisitorRequest $request)
 
         $token = JWTAuth::encode($payload);
 
-        return new CreateVisitorResponse($token);
+        return new CreateVisitorResponse($token->get());
     }
 }

From 626b4360afeb02a4d3c3e0293c41b02161a29692 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Sun, 8 Sep 2019 14:03:48 +0300
Subject: [PATCH 058/183] fix index name in elasticsearch repositories

---
 .../VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php  | 2 +-
 .../VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php  | 2 +-
 .../VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php   | 2 +-
 .../VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
index 8712022f..84a3b230 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
@@ -11,7 +11,7 @@
 
 class ElasticsearchVisitorFlowBrowserRepository implements VisitorFlowBrowserRepository
 {
-    const INDEX_NAME = 'browser-visitors-flow';
+    const INDEX_NAME = 'browser-visitors-flow-index';
     private $client;
 
     public function __construct(ElasticsearchManager $client)
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
index 2fe6d8d4..bef8810a 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
@@ -11,7 +11,7 @@
 
 final class ElasticsearchVisitorFlowCountryRepository implements VisitorFlowCountryRepository
 {
-    const INDEX_NAME = 'country-visitors-flow';
+    const INDEX_NAME = 'country-visitors-flow-index';
     private $client;
 
     public function __construct(ElasticsearchManager $client)
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
index ac65a0a8..fd5b241e 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
@@ -12,7 +12,7 @@
 
 class ElasticsearchVisitorFlowDeviceRepository implements VisitorFlowDeviceRepository
 {
-    const INDEX_NAME = 'device-visitors-flow';
+    const INDEX_NAME = 'device-visitors-flow-index';
     private $client;
 
     public function __construct(ElasticsearchManager $client)
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
index 8316b54f..3e9a1072 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
@@ -12,7 +12,7 @@
 
 class ElasticsearchVisitorFlowScreenRepository implements VisitorFlowScreenRepository
 {
-    const INDEX_NAME = 'screen-visitors-flow';
+    const INDEX_NAME = 'screen-visitors-flow-index';
     private $client;
 
     public function __construct(ElasticsearchManager $client)

From 56a5ec50e97cc5f1725f6361842dc00453f469fd Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Sun, 8 Sep 2019 15:07:59 +0300
Subject: [PATCH 059/183] add getVisitorsFlowRequest

---
 .../VisitorsFlow/GetVisitorsFlowAction.php    | 35 +++++++++++++++++++
 .../VisitorsFlow/GetVisitorsFlowRequest.php   | 28 +++++++++++++++
 ...orsFlow.php => VisitorsFlowController.php} |  8 +++--
 .../GetVisitorsFlowHttpRequest.php            | 21 +++++++++++
 .../VisitorsFlow/FlowAggregateService.php     |  2 --
 5 files changed, 89 insertions(+), 5 deletions(-)
 create mode 100644 backend/app/Actions/VisitorsFlow/GetVisitorsFlowRequest.php
 rename backend/app/Http/Controllers/Api/{VisitorsFlow.php => VisitorsFlowController.php} (52%)
 create mode 100644 backend/app/Http/Requests/VisitorsFlow/GetVisitorsFlowHttpRequest.php

diff --git a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
index 129ba194..e1617711 100644
--- a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
+++ b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
@@ -4,7 +4,42 @@
 namespace App\Actions\VisitorsFlow;
 
 
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowDeviceRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowScreenRepository;
+
 class GetVisitorsFlowAction
 {
+    private $visitorsFlowCountryRepository;
+    private $visitorsFlowBrowserRepository;
+    private $visitorsFlowDeviceRepository;
+    private $visitorsFlowScreenRepository;
+
+    public function __construct(
+        VisitorFlowCountryRepository $visitorFlowCountryRepository,
+        VisitorFlowBrowserRepository $visitorFlowBrowserRepository,
+        VisitorFlowDeviceRepository $visitorFlowDeviceRepository,
+        VisitorFlowScreenRepository $visitorFlowScreenRepository
+    )
+    {
+        $this->visitorsFlowCountryRepository = $visitorFlowCountryRepository;
+        $this->visitorsFlowBrowserRepository = $visitorFlowBrowserRepository;
+        $this->visitorsFlowDeviceRepository = $visitorFlowDeviceRepository;
+        $this->visitorsFlowScreenRepository = $visitorFlowScreenRepository;
+    }
 
+    public function execute(GetVisitorsFlowRequest $request)
+    {
+        switch ($request->getType()) {
+            case 'browser':
+                break;
+            case 'country':
+                break;
+            case 'device':
+                break;
+            case 'screen':
+                break;
+        }
+    }
 }
diff --git a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowRequest.php b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowRequest.php
new file mode 100644
index 00000000..b18a0dfb
--- /dev/null
+++ b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowRequest.php
@@ -0,0 +1,28 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Actions\VisitorsFlow;
+
+use App\Http\Requests\VisitorsFlow\GetVisitorsFlowHttpRequest;
+
+class GetVisitorsFlowRequest
+{
+    private $type;
+
+    public function __construct(string $type)
+    {
+        $this->type = $type;
+    }
+
+    public static function fromRequest(GetVisitorsFlowHttpRequest $request): self
+    {
+        return new static(
+            $request->getType()
+        );
+    }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+}
diff --git a/backend/app/Http/Controllers/Api/VisitorsFlow.php b/backend/app/Http/Controllers/Api/VisitorsFlowController.php
similarity index 52%
rename from backend/app/Http/Controllers/Api/VisitorsFlow.php
rename to backend/app/Http/Controllers/Api/VisitorsFlowController.php
index be962cab..1bf3e2bb 100644
--- a/backend/app/Http/Controllers/Api/VisitorsFlow.php
+++ b/backend/app/Http/Controllers/Api/VisitorsFlowController.php
@@ -4,9 +4,11 @@
 namespace App\Http\Controllers\Api;
 
 use App\Actions\VisitorsFlow\GetVisitorsFlowAction;
+use App\Actions\VisitorsFlow\GetVisitorsFlowRequest;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\VisitorsFlow\GetVisitorsFlowHttpRequest;
 
-final class VisitorsFlow extends Controller
+final class VisitorsFlowController extends Controller
 {
     private $getVisitorsFlowAction;
 
@@ -15,8 +17,8 @@ public function __construct(GetVisitorsFlowAction $getVisitorsFlowAction)
         $this->getVisitorsFlowAction = $getVisitorsFlowAction;
     }
 
-    public function getVisitorsFlow()
+    public function getVisitorsFlow(GetVisitorsFlowHttpRequest $request)
     {
-
+        $this->getVisitorsFlowAction->execute(GetVisitorsFlowRequest::fromRequest($request));
     }
 }
diff --git a/backend/app/Http/Requests/VisitorsFlow/GetVisitorsFlowHttpRequest.php b/backend/app/Http/Requests/VisitorsFlow/GetVisitorsFlowHttpRequest.php
new file mode 100644
index 00000000..f05583db
--- /dev/null
+++ b/backend/app/Http/Requests/VisitorsFlow/GetVisitorsFlowHttpRequest.php
@@ -0,0 +1,21 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Http\Requests\VisitorsFlow;
+
+use App\Http\Request\ApiFormRequest;
+
+final class GetVisitorsFlowHttpRequest extends ApiFormRequest
+{
+    public function rules()
+    {
+        return [
+            'filter' => 'required|string',
+        ];
+    }
+
+    public function getType(): string
+    {
+        return $this->get('filter');
+    }
+}
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 0aa7c42c..68f4f3e3 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -124,7 +124,6 @@ public function aggregate(Visit $visit)
         if (!$browserAggregate) {
             $browserAggregate = $this->createBrowserAggregate($visit, $level, $previousVisit);
             $browserAggregate = $this->visitorFlowBrowserRepository->save($browserAggregate);
-            dd($browserAggregate);
         } else {
             if ($level > 1) {
                 $previousAggregate = BrowserAggregate::getPreviousAggregate(
@@ -140,7 +139,6 @@ public function aggregate(Visit $visit)
             $browserAggregate->views++;
             $browserAggregate->exitCount++;
             $browserAggregate = $this->visitorFlowBrowserRepository->update($browserAggregate);
-            dd($browserAggregate);
         }
         if (!$deviceAggregate) {
             $deviceAggregate = $this->createDeviceAggregate($visit, $level, $previousVisit);

From 3ac6daf2bde5ddb7c6448542c9810671349f4914 Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Sun, 8 Sep 2019 16:37:09 +0300
Subject: [PATCH 060/183] add Errors details modal window component

---
 frontend/package-lock.json                    | 13 +++
 frontend/package.json                         |  3 +-
 .../dashboard/errors/ErrorsDetailsModal.vue   | 93 +++++++++++++++++++
 .../dashboard/errors/ErrorsTable.vue          | 18 +++-
 .../src/pages/speed_overview/ErrorReports.vue | 34 ++++++-
 5 files changed, 153 insertions(+), 8 deletions(-)
 create mode 100644 frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 5af01a8b..b311172f 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -11558,6 +11558,11 @@
       "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=",
       "dev": true
     },
+    "resize-detector": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/resize-detector/-/resize-detector-0.1.10.tgz",
+      "integrity": "sha512-iLcXC8A6Fb0DfA+TRiywrK/0A22bFqkhntjMJMEzXDA4XkcEkfwpNbv7W8iewUiD0xYIaeiXOfiEehTqGKsUFw=="
+    },
     "resolve": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
@@ -13410,6 +13415,14 @@
       "resolved": "https://registry.npmjs.org/vue-apexcharts/-/vue-apexcharts-1.4.0.tgz",
       "integrity": "sha512-x3HplG6UZ5ZEoyNYaFZlMUgijyBvkG65mB4AY4RMvEMMxp83kh0QZV8x47vimZ96K7vDkPeUrIH5Uy6FjSY8lg=="
     },
+    "vue-clamp": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/vue-clamp/-/vue-clamp-0.2.2.tgz",
+      "integrity": "sha512-WohCN3oTRz8PGWT2m1c1qsmb1oKKNA4A9MyGxUspfONkQJ7vrlk50R4NAG3H80F/CTdpkit6mxQh3eLtlpLccw==",
+      "requires": {
+        "resize-detector": "^0.1.10"
+      }
+    },
     "vue-cli-plugin-vuetify": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-0.6.1.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 85d22586..599e4232 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -16,9 +16,9 @@
     "apexcharts": "^3.8.5",
     "axios": "^0.19.0",
     "core-js": "^2.6.9",
-    "dotenv-webpack": "^1.7.0",
     "d3": "^5.11.0",
     "d3-sankey": "^0.12.1",
+    "dotenv-webpack": "^1.7.0",
     "jwt-decode": "^2.2.0",
     "laravel-echo": "^1.5.4",
     "lodash": "^4.17.15",
@@ -29,6 +29,7 @@
     "sass": "^1.22.9",
     "vue": "^2.6.10",
     "vue-apexcharts": "^1.4.0",
+    "vue-clamp": "^0.2.2",
     "vue-google-charts": "^0.3.2",
     "vue-router": "^3.1.0",
     "vuetify": "^2.0.4",
diff --git a/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue b/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue
new file mode 100644
index 00000000..3eb32998
--- /dev/null
+++ b/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue
@@ -0,0 +1,93 @@
+<template>
+    <VLayout justify-center>
+        <VDialog
+            persistent
+            v-model="dialog"
+            max-width="400"
+        >
+            <VCard>
+                <VCardTitle>Error on page {{ errorItem.page }}</VCardTitle>
+                <VCardText>
+                    <div class="mb-2">
+                        Message
+                    </div>
+                    <div class="text--primary message-block">
+                        {{ errorItem.message }}
+                    </div>
+                    <div class="mt-5 mb-2">
+                        Stack trace
+                    </div>
+                    <VClamp
+                        autoresize
+                        :max-lines="3"
+                        class="text--primary message-block"
+                    >
+                        {{ errorItem.stack_trace }}
+                        <template v-slot:after="{ toggle }">
+                            <a
+                                class="toggle-link px-3"
+                                @click.stop="toggle"
+                            >
+                                More
+                            </a>
+                        </template>
+                    </VClamp>
+                </VCardText>
+                <VCardActions class="justify-end">
+                    <VBtn
+                        color="primary"
+                        text
+                        @click="closeDetailsItem()"
+                    >
+                        Close
+                    </VBtn>
+                </VCardActions>
+            </VCard>
+        </VDialog>
+    </VLayout>
+</template>
+
+<script>
+    import VClamp from 'vue-clamp';
+
+    export default {
+        name: "ErrorsDetailsModal",
+        components: {
+            VClamp
+        },
+        props: {
+            dialog: {
+                type: Boolean,
+                default: false
+            },
+            errorItem: {
+                type: Object,
+                required: true
+            }
+        },
+        methods: {
+            changeSelect () {
+                this.$emit('change', this.selected);
+            },
+            closeDetailsItem () {
+                this.$emit('close');
+            }
+        }
+    };
+</script>
+
+<style scoped lang="scss">
+    .message-block {
+        border-radius: 6px;
+        padding: 10px;
+        border: 1px solid rgba(60, 87, 222, 0.52);
+
+        .toggle-link {
+            color: #3c57de;
+        }
+        .toggle-link:hover {
+            color: #3c57de;
+            text-decoration: underline;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/frontend/src/components/dashboard/errors/ErrorsTable.vue b/frontend/src/components/dashboard/errors/ErrorsTable.vue
index 5c22214d..42c5184c 100644
--- a/frontend/src/components/dashboard/errors/ErrorsTable.vue
+++ b/frontend/src/components/dashboard/errors/ErrorsTable.vue
@@ -37,7 +37,16 @@
                 hide-default-header
                 :headers="headers"
                 :items="errorItems"
-            />
+            >
+                <template v-slot:item.details="{ item }">
+                    <VBtn
+                        class="mr-2"
+                        @click.stop="detailsItem(item)"
+                    >
+                        Details
+                    </VBtn>
+                </template>
+            </VDataTable>
         </VContainer>
     </VContainer>
 </template>
@@ -49,10 +58,6 @@
             errorItems: {
                 type: Array,
                 required: true
-            },
-            fetching: {
-                type: Boolean,
-                required: true
             }
         },
         data () {
@@ -84,6 +89,9 @@
         methods: {
             changeSelect () {
                 this.$emit('change', this.selected);
+            },
+            detailsItem (item) {
+                this.$emit('open', item);
             }
         }
     };
diff --git a/frontend/src/pages/speed_overview/ErrorReports.vue b/frontend/src/pages/speed_overview/ErrorReports.vue
index 1e0f0157..25f2a2a3 100644
--- a/frontend/src/pages/speed_overview/ErrorReports.vue
+++ b/frontend/src/pages/speed_overview/ErrorReports.vue
@@ -1,13 +1,18 @@
 <template>
     <ContentLayout :title="title">
         <VRow class="position-relative">
-            <Spinner v-if="fetching" />
+            <Spinner v-if="tableData.isFetching" />
             <ErrorsTable
+                @open="openModal"
                 :error-items="tableData.items"
-                :fetching="tableData.isFetching"
                 @change="changeGroupedParameter"
             />
         </VRow>
+        <ErrorsDetailsModal
+            :dialog="dialog"
+            :error-item="modalItem"
+            @close="dialog = false"
+        />
     </ContentLayout>
 </template>
 
@@ -16,18 +21,24 @@
     import ErrorsTable from '../../components/dashboard/errors/ErrorsTable.vue';
     import { isWebsite } from "../../mixins/isWebsite";
     import Spinner from '../../components/utilites/Spinner';
+    import ErrorsDetailsModal from '../../components/dashboard/errors/ErrorsDetailsModal';
 
 
     export default {
         name: "ErrorReports",
         components: {
             ContentLayout,
+            ErrorsDetailsModal,
             ErrorsTable,
             Spinner
         },
         mixins: [isWebsite],
         data() {
             return {
+                dialog:false,
+                modalItem:{
+                    message: 'message'
+                },
                 title: "Error Reports",
                 current_paremeter: 'page',
                 tableData: {
@@ -37,24 +48,36 @@
                             parameter_value: '/contacts',
                             page: '/contacts',
                             message: 'SyntaxError',
+                            stack_trasce: 'at Object.device.tablet (metrica.js?tracking_id=00000186:317)\n' +
+                                'at Object.device.desktop (metrica.js?tracking_id=00000186:325)\n' +
+                                'at Object.getDevice (metrica.js?tracking_id=00000186:130)',
                             page_views: 45
                         },
                         {
                             parameter_value: '/home',
                             page: '/home',
                             message: 'ReferenceError',
+                            stack_trace: 'at Object.device.tablet (metrica.js?tracking_id=00000186:317)\n' +
+                                'at Object.device.desktop (metrica.js?tracking_id=00000186:325)\n' +
+                                'at Object.getDevice (metrica.js?tracking_id=00000186:130)',
                             page_views: 34
                         },
                         {
                             parameter_value: '/products',
                             page: '/products',
                             message: 'TypeError',
+                            stack_trace: 'at Object.device.tablet (metrica.js?tracking_id=00000186:317)\n' +
+                                'at Object.device.desktop (metrica.js?tracking_id=00000186:325)\n' +
+                                'at Object.getDevice (metrica.js?tracking_id=00000186:130)',
                             page_views: 12
                         },
                         {
                             parameter_value: '/user',
                             page: '/user',
                             message: 'InternalError',
+                            stack_trace: 'at Object.device.tablet (metrica.js?tracking_id=00000186:317)\n' +
+                                'at Object.device.desktop (metrica.js?tracking_id=00000186:325)\n' +
+                                'at Object.getDevice (metrica.js?tracking_id=00000186:130)',
                             page_views: 3
                         }
                     ]
@@ -66,6 +89,13 @@
                 if (this.currentParameter !== parameter) {
                     this.currentParameter = parameter;
                 }
+            },
+            openModal(item) {
+                this.dialog = true;
+                this.modalItem = {
+                    ...this.modalItem,
+                    ...item
+                };
             }
         }
     };

From 20281868d5f5d318822e78ba46ed273df8c2eeac Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Sun, 8 Sep 2019 16:53:19 +0300
Subject: [PATCH 061/183] change toggle link style

---
 .../components/dashboard/errors/ErrorsDetailsModal.vue    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue b/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue
index 3eb32998..986d2636 100644
--- a/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue
+++ b/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue
@@ -25,7 +25,7 @@
                         {{ errorItem.stack_trace }}
                         <template v-slot:after="{ toggle }">
                             <a
-                                class="toggle-link px-3"
+                                class="toggle-link text-center px-4"
                                 @click.stop="toggle"
                             >
                                 More
@@ -83,11 +83,15 @@
         border: 1px solid rgba(60, 87, 222, 0.52);
 
         .toggle-link {
+            display: inline-block;
+            line-height: 36px;
+            height: 36px;
             color: #3c57de;
+            border-radius: 3px;
         }
         .toggle-link:hover {
             color: #3c57de;
-            text-decoration: underline;
+            background-color: rgb(60, 87, 222, 0.04);
         }
     }
 </style>
\ No newline at end of file

From 6ef1d087e9c5569c7dbc2ef13c7d555db236d429 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Sun, 8 Sep 2019 18:25:30 +0300
Subject: [PATCH 062/183] implement getBrowserVisitorFlow endpoint action

---
 .../GetBrowserVisitorFlowResponse.php         | 28 +++++++++
 .../VisitorsFlow/GetVisitorsFlowAction.php    |  6 +-
 .../VisitorsFlow/BrowserFlowCollection.php    | 23 +++++++
 .../VisitorsFlow/BrowserFlowItem.php          | 55 +++++++++++++++++
 .../VisitorsFlow/BrowserItem.php              | 27 ++++++++
 .../VisitorsFlow/BrowsersCollection.php       | 24 ++++++++
 .../Api/VisitorsFlowController.php            |  5 +-
 .../Resources/BrowserVisitorsFlowResource.php | 58 ++++++++++++++++++
 .../VisitorFlowBrowserRepository.php          |  6 ++
 ...sticsearchVisitorFlowBrowserRepository.php | 61 ++++++++++++++++++-
 ...sticsearchVisitorFlowCountryRepository.php |  2 +
 11 files changed, 292 insertions(+), 3 deletions(-)
 create mode 100644 backend/app/Actions/VisitorsFlow/GetBrowserVisitorFlowResponse.php
 create mode 100644 backend/app/DataTransformer/VisitorsFlow/BrowserFlowCollection.php
 create mode 100644 backend/app/DataTransformer/VisitorsFlow/BrowserFlowItem.php
 create mode 100644 backend/app/DataTransformer/VisitorsFlow/BrowserItem.php
 create mode 100644 backend/app/DataTransformer/VisitorsFlow/BrowsersCollection.php
 create mode 100644 backend/app/Http/Resources/BrowserVisitorsFlowResource.php

diff --git a/backend/app/Actions/VisitorsFlow/GetBrowserVisitorFlowResponse.php b/backend/app/Actions/VisitorsFlow/GetBrowserVisitorFlowResponse.php
new file mode 100644
index 00000000..820c891a
--- /dev/null
+++ b/backend/app/Actions/VisitorsFlow/GetBrowserVisitorFlowResponse.php
@@ -0,0 +1,28 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Actions\VisitorsFlow;
+
+
+use Illuminate\Support\Collection;
+
+class GetBrowserVisitorFlowResponse
+{
+    private $browsersViews;
+    private $browsersFlow;
+
+    public function __construct(Collection $browsersViews, Collection $browsersFlow)
+    {
+        $this->browsersViews = $browsersViews;
+        $this->browsersFlow = $browsersFlow;
+    }
+
+    public function getCollection(): Collection
+    {
+        return collect(
+            ['browsers_views' => $this->browsersViews,
+                'browsers_flow' => $this->browsersFlow
+            ]
+        );
+    }
+}
diff --git a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
index e1617711..82cdf88f 100644
--- a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
+++ b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
@@ -29,10 +29,14 @@ public function __construct(
         $this->visitorsFlowScreenRepository = $visitorFlowScreenRepository;
     }
 
-    public function execute(GetVisitorsFlowRequest $request)
+    public function execute(GetVisitorsFlowRequest $request): GetBrowserVisitorFlowResponse
     {
+        $websiteId = auth()->user()->website->id;
         switch ($request->getType()) {
             case 'browser':
+                $browsersViews = $this->visitorsFlowBrowserRepository->getViewsByEachBrowser($request->getType(), $websiteId);
+                $browsersFlow = $this->visitorsFlowBrowserRepository->getFlow($websiteId);
+                return new GetBrowserVisitorFlowResponse($browsersViews->getCollection(), $browsersFlow->getCollection());
                 break;
             case 'country':
                 break;
diff --git a/backend/app/DataTransformer/VisitorsFlow/BrowserFlowCollection.php b/backend/app/DataTransformer/VisitorsFlow/BrowserFlowCollection.php
new file mode 100644
index 00000000..b28591c2
--- /dev/null
+++ b/backend/app/DataTransformer/VisitorsFlow/BrowserFlowCollection.php
@@ -0,0 +1,23 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DataTransformer\VisitorsFlow;
+
+use Illuminate\Support\Collection;
+
+class BrowserFlowCollection
+{
+    private $collection;
+
+    public function __construct(array $collection)
+    {
+        $this->collection = $collection;
+    }
+
+    public function getCollection():Collection
+    {
+        return collect($this->collection)->map(function ($item) {
+            return new BrowserFlowItem($item['_source']);
+        });
+    }
+}
diff --git a/backend/app/DataTransformer/VisitorsFlow/BrowserFlowItem.php b/backend/app/DataTransformer/VisitorsFlow/BrowserFlowItem.php
new file mode 100644
index 00000000..589dead1
--- /dev/null
+++ b/backend/app/DataTransformer/VisitorsFlow/BrowserFlowItem.php
@@ -0,0 +1,55 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DataTransformer\VisitorsFlow;
+
+
+class BrowserFlowItem
+{
+    private $browser;
+    private $targetUrl;
+    private $views;
+    private $exitCount;
+    private $level;
+    private $sourceUrl;
+
+    public function __construct(array $item)
+    {
+        $this->browser = $item['browser'];
+        $this->targetUrl = $item['target_url'];
+        $this->views = $item['views'];
+        $this->level = $item['level'];
+        $this->exitCount = $item['exit_count'];
+        $this->sourceUrl = $item['prev_page']['source_url'];
+    }
+
+    public function getBrowser(): string
+    {
+        return $this->browser;
+    }
+
+    public function getTargetUrl(): string
+    {
+        return $this->targetUrl;
+    }
+
+    public function getViews(): int
+    {
+        return $this->views;
+    }
+
+    public function getExitCount(): int
+    {
+        return $this->exitCount;
+    }
+
+    public function getLevel(): int
+    {
+        return $this->level;
+    }
+
+    public function getSourceUrl(): string
+    {
+        return $this->sourceUrl;
+    }
+}
diff --git a/backend/app/DataTransformer/VisitorsFlow/BrowserItem.php b/backend/app/DataTransformer/VisitorsFlow/BrowserItem.php
new file mode 100644
index 00000000..7dfd32f1
--- /dev/null
+++ b/backend/app/DataTransformer/VisitorsFlow/BrowserItem.php
@@ -0,0 +1,27 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DataTransformer\VisitorsFlow;
+
+
+class BrowserItem
+{
+    private $title;
+    private $count;
+
+    public function __construct(array $item)
+    {
+        $this->title = $item['key'];
+        $this->count = (int)$item['views']['value'];
+    }
+
+    public function getTitle(): string
+    {
+        return $this->title;
+    }
+
+    public function getCount(): int
+    {
+        return $this->count;
+    }
+}
diff --git a/backend/app/DataTransformer/VisitorsFlow/BrowsersCollection.php b/backend/app/DataTransformer/VisitorsFlow/BrowsersCollection.php
new file mode 100644
index 00000000..ed12bb46
--- /dev/null
+++ b/backend/app/DataTransformer/VisitorsFlow/BrowsersCollection.php
@@ -0,0 +1,24 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DataTransformer\VisitorsFlow;
+
+
+use Illuminate\Support\Collection;
+
+class BrowsersCollection
+{
+    private $collection;
+
+    public function __construct(array $collection)
+    {
+        $this->collection = $collection;
+    }
+
+    public function getCollection(): Collection
+    {
+        return collect($this->collection)->map(function ($item) {
+            return new BrowserItem($item);
+        });
+    }
+}
diff --git a/backend/app/Http/Controllers/Api/VisitorsFlowController.php b/backend/app/Http/Controllers/Api/VisitorsFlowController.php
index 1bf3e2bb..347f2ade 100644
--- a/backend/app/Http/Controllers/Api/VisitorsFlowController.php
+++ b/backend/app/Http/Controllers/Api/VisitorsFlowController.php
@@ -7,6 +7,8 @@
 use App\Actions\VisitorsFlow\GetVisitorsFlowRequest;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\VisitorsFlow\GetVisitorsFlowHttpRequest;
+use App\Http\Resources\BrowserVisitorsFlowResource;
+use App\Http\Response\ApiResponse;
 
 final class VisitorsFlowController extends Controller
 {
@@ -19,6 +21,7 @@ public function __construct(GetVisitorsFlowAction $getVisitorsFlowAction)
 
     public function getVisitorsFlow(GetVisitorsFlowHttpRequest $request)
     {
-        $this->getVisitorsFlowAction->execute(GetVisitorsFlowRequest::fromRequest($request));
+        $result = $this->getVisitorsFlowAction->execute(GetVisitorsFlowRequest::fromRequest($request));
+        return ApiResponse::success(new BrowserVisitorsFlowResource($result->getCollection()));
     }
 }
diff --git a/backend/app/Http/Resources/BrowserVisitorsFlowResource.php b/backend/app/Http/Resources/BrowserVisitorsFlowResource.php
new file mode 100644
index 00000000..abafcd09
--- /dev/null
+++ b/backend/app/Http/Resources/BrowserVisitorsFlowResource.php
@@ -0,0 +1,58 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Http\Resources;
+
+use App\Contracts\ApiResponse;
+use App\DataTransformer\VisitorsFlow\BrowserFlowItem;
+use App\DataTransformer\VisitorsFlow\BrowserItem;
+use Illuminate\Http\Resources\Json\ResourceCollection;
+use Illuminate\Support\Collection;
+
+class BrowserVisitorsFlowResource extends ResourceCollection implements ApiResponse
+{
+    public function toArray($request): array
+    {
+        return $this->presentCollection($this->collection);
+    }
+
+    public function presentBrowserViews(BrowserItem $item): array
+    {
+        return [
+            'title' => $item->getTitle(),
+            'count' => $item->getCount(),
+        ];
+    }
+
+    public function presentBrowsersFlow(BrowserFlowItem $item): array
+    {
+        return [
+            'browser' => $item->getBrowser(),
+            'target_url' => $item->getTargetUrl(),
+            'level' => $item->getLevel(),
+            'views' => $item->getViews(),
+            'exit_count' => $item->getExitCount(),
+            'source_url' => $item->getSourceUrl()
+        ];
+    }
+
+    public function presentCollection(Collection $collection): array
+    {
+        return $collection
+            ->map(
+                function (Collection $items, $key) {
+                    switch ($key) {
+                        case 'browsers_views':
+                            return $items->map(function (BrowserItem $item) {
+                                return $this->presentBrowserViews($item);
+                            });
+                        case 'browsers_flow':
+                            return $items->map(function (BrowserFlowItem $item) {
+                                return $this->presentBrowsersFlow($item);
+                            });
+                    }
+                }
+            )
+            ->all();
+    }
+}
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php
index efc12f80..1f8855af 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php
@@ -5,6 +5,8 @@
 
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\BrowserAggregate;
+use App\DataTransformer\VisitorsFlow\BrowserFlowCollection;
+use App\DataTransformer\VisitorsFlow\BrowsersCollection;
 
 interface VisitorFlowBrowserRepository extends VisitorFlowRepository
 {
@@ -13,4 +15,8 @@ public function save(Aggregate $browserAggregate): Aggregate;
     public function update(Aggregate $browserAggregate): Aggregate;
 
     public function getByCriteria(Criteria $criteria): ?BrowserAggregate;
+
+    public function getViewsByEachBrowser(string $type, int $websiteId):BrowsersCollection;
+
+    public function getFlow(int $websiteId):BrowserFlowCollection;
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
index 84a3b230..87f7af50 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
@@ -5,6 +5,8 @@
 
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\BrowserAggregate;
+use App\DataTransformer\VisitorsFlow\BrowserFlowCollection;
+use App\DataTransformer\VisitorsFlow\BrowsersCollection;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
 use Cviebrock\LaravelElasticsearch\Manager as ElasticsearchManager;
@@ -58,7 +60,7 @@ public function getByCriteria(Criteria $criteria): ?BrowserAggregate
                             ['term' => ['level' => $criteria->level]],
                             ['match_phrase' => ['target_url' => $criteria->targetUrl]],
                             ['match_phrase' => ['browser' => $criteria->browser]],
-                            ['match_phrase'=>['prev_page.source_url'=>$criteria->prevPageUrl]]
+                            ['match_phrase' => ['prev_page.source_url' => $criteria->prevPageUrl]]
                         ],
                     ]
                 ]
@@ -74,4 +76,61 @@ public function getByCriteria(Criteria $criteria): ?BrowserAggregate
         }
         return BrowserAggregate::fromResult($result['hits']['hits'][0]['_source']);
     }
+
+    public function getViewsByEachBrowser(string $type, int $websiteId): BrowsersCollection
+    {
+        $params = [
+            'index' => self::INDEX_NAME,
+            'body' => [
+                'query' => [
+                    'bool' => [
+                        'must' => [
+                            ['match' => ['website_id' => $websiteId]],
+                        ]
+                    ]
+                ],
+                'aggregations' => [
+                    'browsers' => [
+                        'terms' => [
+                            'field' => $type
+                        ],
+                        'aggregations' => [
+                            'views' => [
+                                'sum' => [
+                                    'field' => 'views'
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+
+        ];
+        $result = $this->client->search($params);
+        return new BrowsersCollection($result['aggregations']['browsers']['buckets']);
+    }
+
+    public function getFlow(int $websiteId): BrowserFlowCollection
+    {
+        $params = [
+            'index' => self::INDEX_NAME,
+            'body' => [
+                'query' => [
+                    'bool' => [
+                        'must' => [
+                            ['match' => ['website_id' => $websiteId]],
+                        ]
+                    ]
+                ],
+                'sort' => [
+                    'level' => 'asc',
+                    'views' => 'desc'
+                ]
+            ]
+        ];
+        $result = $this->client->search($params);
+        return new BrowserFlowCollection($result['hits']['hits']);
+    }
 }
+
+
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
index bef8810a..9a9cb918 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
@@ -74,4 +74,6 @@ public function getByCriteria(Criteria $criteria): ?CountryAggregate
         }
         return CountryAggregate::fromResult($result['hits']['hits'][0]['_source']);
     }
+
+//    public function
 }

From abc2b11c9d695daaeb8399f2f3cb826631b96dcd Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Sun, 8 Sep 2019 18:27:38 +0300
Subject: [PATCH 063/183] change toggle button-link

---
 .../dashboard/errors/ErrorsDetailsModal.vue   | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue b/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue
index 986d2636..49857baa 100644
--- a/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue
+++ b/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue
@@ -23,12 +23,20 @@
                         class="text--primary message-block"
                     >
                         {{ errorItem.stack_trace }}
-                        <template v-slot:after="{ toggle }">
+                        <template
+                            slot="after"
+                            slot-scope="{ toggle, expanded }"
+                        >
                             <a
                                 class="toggle-link text-center px-4"
-                                @click.stop="toggle"
+                                @click="toggle"
                             >
-                                More
+                                <span v-if="expanded">
+                                    Collapse
+                                </span>
+                                <span v-else>
+                                    More
+                                </span>
                             </a>
                         </template>
                     </VClamp>
@@ -65,13 +73,18 @@
                 required: true
             }
         },
+        data () {
+            return {
+                toggleMore: false
+            };
+        },
         methods: {
             changeSelect () {
                 this.$emit('change', this.selected);
             },
             closeDetailsItem () {
                 this.$emit('close');
-            }
+            },
         }
     };
 </script>
@@ -91,7 +104,8 @@
         }
         .toggle-link:hover {
             color: #3c57de;
-            background-color: rgb(60, 87, 222, 0.04);
+            opacity: 0.75;
+
         }
     }
 </style>
\ No newline at end of file

From ce697da3b99ce0b5a1a94793ef28fe13f0c39130 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Sun, 8 Sep 2019 19:33:59 +0300
Subject: [PATCH 064/183] change logic from 4 endpoints to 1 visitoirsFlow
 endpoint

---
 .../GetBrowserVisitorFlowResponse.php         | 28 -------------------
 .../VisitorsFlow/GetVisitorFlowResponse.php   | 27 ++++++++++++++++++
 .../VisitorsFlow/GetVisitorsFlowAction.php    |  4 +--
 .../VisitorsFlow/BrowserFlowItem.php          |  5 ++--
 .../VisitorsFlow/BrowserItem.php              |  2 +-
 .../VisitorsFlow/ParameterFlowItem.php        | 10 +++++++
 .../VisitorsFlow/ParameterItem.php            | 10 +++++++
 .../Api/VisitorsFlowController.php            |  4 +--
 ...wResource.php => VisitorsFlowResource.php} | 24 ++++++++--------
 9 files changed, 66 insertions(+), 48 deletions(-)
 delete mode 100644 backend/app/Actions/VisitorsFlow/GetBrowserVisitorFlowResponse.php
 create mode 100644 backend/app/Actions/VisitorsFlow/GetVisitorFlowResponse.php
 create mode 100644 backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php
 create mode 100644 backend/app/DataTransformer/VisitorsFlow/ParameterItem.php
 rename backend/app/Http/Resources/{BrowserVisitorsFlowResource.php => VisitorsFlowResource.php} (57%)

diff --git a/backend/app/Actions/VisitorsFlow/GetBrowserVisitorFlowResponse.php b/backend/app/Actions/VisitorsFlow/GetBrowserVisitorFlowResponse.php
deleted file mode 100644
index 820c891a..00000000
--- a/backend/app/Actions/VisitorsFlow/GetBrowserVisitorFlowResponse.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Actions\VisitorsFlow;
-
-
-use Illuminate\Support\Collection;
-
-class GetBrowserVisitorFlowResponse
-{
-    private $browsersViews;
-    private $browsersFlow;
-
-    public function __construct(Collection $browsersViews, Collection $browsersFlow)
-    {
-        $this->browsersViews = $browsersViews;
-        $this->browsersFlow = $browsersFlow;
-    }
-
-    public function getCollection(): Collection
-    {
-        return collect(
-            ['browsers_views' => $this->browsersViews,
-                'browsers_flow' => $this->browsersFlow
-            ]
-        );
-    }
-}
diff --git a/backend/app/Actions/VisitorsFlow/GetVisitorFlowResponse.php b/backend/app/Actions/VisitorsFlow/GetVisitorFlowResponse.php
new file mode 100644
index 00000000..b9be4d04
--- /dev/null
+++ b/backend/app/Actions/VisitorsFlow/GetVisitorFlowResponse.php
@@ -0,0 +1,27 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Actions\VisitorsFlow;
+
+use Illuminate\Support\Collection;
+
+class GetVisitorFlowResponse
+{
+    private $parameterViews;
+    private $visitorsFlow;
+
+    public function __construct(Collection $parameterViews, Collection $visitorsFlow)
+    {
+        $this->parameterViews = $parameterViews;
+        $this->visitorsFlow = $visitorsFlow;
+    }
+
+    public function getCollection(): Collection
+    {
+        return collect(
+            ['parameter_views' => $this->parameterViews,
+                'visitors_flow' => $this->visitorsFlow
+            ]
+        );
+    }
+}
diff --git a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
index 82cdf88f..b7b33c63 100644
--- a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
+++ b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
@@ -29,14 +29,14 @@ public function __construct(
         $this->visitorsFlowScreenRepository = $visitorFlowScreenRepository;
     }
 
-    public function execute(GetVisitorsFlowRequest $request): GetBrowserVisitorFlowResponse
+    public function execute(GetVisitorsFlowRequest $request): GetVisitorFlowResponse
     {
         $websiteId = auth()->user()->website->id;
         switch ($request->getType()) {
             case 'browser':
                 $browsersViews = $this->visitorsFlowBrowserRepository->getViewsByEachBrowser($request->getType(), $websiteId);
                 $browsersFlow = $this->visitorsFlowBrowserRepository->getFlow($websiteId);
-                return new GetBrowserVisitorFlowResponse($browsersViews->getCollection(), $browsersFlow->getCollection());
+                return new GetVisitorFlowResponse($browsersViews->getCollection(), $browsersFlow->getCollection());
                 break;
             case 'country':
                 break;
diff --git a/backend/app/DataTransformer/VisitorsFlow/BrowserFlowItem.php b/backend/app/DataTransformer/VisitorsFlow/BrowserFlowItem.php
index 589dead1..691c88c1 100644
--- a/backend/app/DataTransformer/VisitorsFlow/BrowserFlowItem.php
+++ b/backend/app/DataTransformer/VisitorsFlow/BrowserFlowItem.php
@@ -3,8 +3,7 @@
 
 namespace App\DataTransformer\VisitorsFlow;
 
-
-class BrowserFlowItem
+class BrowserFlowItem implements ParameterFlowItem
 {
     private $browser;
     private $targetUrl;
@@ -23,7 +22,7 @@ public function __construct(array $item)
         $this->sourceUrl = $item['prev_page']['source_url'];
     }
 
-    public function getBrowser(): string
+    public function getParameter(): string
     {
         return $this->browser;
     }
diff --git a/backend/app/DataTransformer/VisitorsFlow/BrowserItem.php b/backend/app/DataTransformer/VisitorsFlow/BrowserItem.php
index 7dfd32f1..cc83bcbc 100644
--- a/backend/app/DataTransformer/VisitorsFlow/BrowserItem.php
+++ b/backend/app/DataTransformer/VisitorsFlow/BrowserItem.php
@@ -4,7 +4,7 @@
 namespace App\DataTransformer\VisitorsFlow;
 
 
-class BrowserItem
+class BrowserItem implements ParameterItem
 {
     private $title;
     private $count;
diff --git a/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php b/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php
new file mode 100644
index 00000000..ba3ed144
--- /dev/null
+++ b/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php
@@ -0,0 +1,10 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DataTransformer\VisitorsFlow;
+
+
+interface ParameterFlowItem
+{
+
+}
diff --git a/backend/app/DataTransformer/VisitorsFlow/ParameterItem.php b/backend/app/DataTransformer/VisitorsFlow/ParameterItem.php
new file mode 100644
index 00000000..61f13277
--- /dev/null
+++ b/backend/app/DataTransformer/VisitorsFlow/ParameterItem.php
@@ -0,0 +1,10 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DataTransformer\VisitorsFlow;
+
+
+interface ParameterItem
+{
+
+}
diff --git a/backend/app/Http/Controllers/Api/VisitorsFlowController.php b/backend/app/Http/Controllers/Api/VisitorsFlowController.php
index 347f2ade..85627233 100644
--- a/backend/app/Http/Controllers/Api/VisitorsFlowController.php
+++ b/backend/app/Http/Controllers/Api/VisitorsFlowController.php
@@ -7,7 +7,7 @@
 use App\Actions\VisitorsFlow\GetVisitorsFlowRequest;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\VisitorsFlow\GetVisitorsFlowHttpRequest;
-use App\Http\Resources\BrowserVisitorsFlowResource;
+use App\Http\Resources\VisitorsFlowResource;
 use App\Http\Response\ApiResponse;
 
 final class VisitorsFlowController extends Controller
@@ -22,6 +22,6 @@ public function __construct(GetVisitorsFlowAction $getVisitorsFlowAction)
     public function getVisitorsFlow(GetVisitorsFlowHttpRequest $request)
     {
         $result = $this->getVisitorsFlowAction->execute(GetVisitorsFlowRequest::fromRequest($request));
-        return ApiResponse::success(new BrowserVisitorsFlowResource($result->getCollection()));
+        return ApiResponse::success(new VisitorsFlowResource($result->getCollection()));
     }
 }
diff --git a/backend/app/Http/Resources/BrowserVisitorsFlowResource.php b/backend/app/Http/Resources/VisitorsFlowResource.php
similarity index 57%
rename from backend/app/Http/Resources/BrowserVisitorsFlowResource.php
rename to backend/app/Http/Resources/VisitorsFlowResource.php
index abafcd09..05ea155e 100644
--- a/backend/app/Http/Resources/BrowserVisitorsFlowResource.php
+++ b/backend/app/Http/Resources/VisitorsFlowResource.php
@@ -4,19 +4,19 @@
 namespace App\Http\Resources;
 
 use App\Contracts\ApiResponse;
-use App\DataTransformer\VisitorsFlow\BrowserFlowItem;
-use App\DataTransformer\VisitorsFlow\BrowserItem;
+use App\DataTransformer\VisitorsFlow\ParameterFlowItem;
+use App\DataTransformer\VisitorsFlow\ParameterItem;
 use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Collection;
 
-class BrowserVisitorsFlowResource extends ResourceCollection implements ApiResponse
+class VisitorsFlowResource extends ResourceCollection implements ApiResponse
 {
     public function toArray($request): array
     {
         return $this->presentCollection($this->collection);
     }
 
-    public function presentBrowserViews(BrowserItem $item): array
+    public function presentParameterViews(ParameterItem $item): array
     {
         return [
             'title' => $item->getTitle(),
@@ -24,10 +24,10 @@ public function presentBrowserViews(BrowserItem $item): array
         ];
     }
 
-    public function presentBrowsersFlow(BrowserFlowItem $item): array
+    public function presentVisitorsFlow(ParameterFlowItem $item): array
     {
         return [
-            'browser' => $item->getBrowser(),
+            "{$item->getParameter()}" => $item->getParameter(),
             'target_url' => $item->getTargetUrl(),
             'level' => $item->getLevel(),
             'views' => $item->getViews(),
@@ -42,13 +42,13 @@ public function presentCollection(Collection $collection): array
             ->map(
                 function (Collection $items, $key) {
                     switch ($key) {
-                        case 'browsers_views':
-                            return $items->map(function (BrowserItem $item) {
-                                return $this->presentBrowserViews($item);
+                        case 'parameter_views':
+                            return $items->map(function (ParameterItem $item) {
+                                return $this->presentParameterViews($item);
                             });
-                        case 'browsers_flow':
-                            return $items->map(function (BrowserFlowItem $item) {
-                                return $this->presentBrowsersFlow($item);
+                        case 'visitors_flow':
+                            return $items->map(function (ParameterFlowItem $item) {
+                                return $this->presentVisitorsFlow($item);
                             });
                     }
                 }

From 3da928614be4732981c4dfbf5bb50b21be31cbc5 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Sun, 8 Sep 2019 20:52:08 +0300
Subject: [PATCH 065/183] fix browserVisitorsFlow

---
 .../VisitorsFlow/GetVisitorFlowResponse.php   | 11 +++-
 .../VisitorsFlow/GetVisitorsFlowAction.php    | 12 +++--
 .../VisitorsFlow/GetVisitorsFlowRequest.php   | 20 ++++---
 .../VisitorsFlow/BrowserFlowItem.php          | 54 -------------------
 .../VisitorsFlow/BrowserItem.php              | 27 ----------
 ...ection.php => ParameterFlowCollection.php} |  4 +-
 .../VisitorsFlow/ParameterFlowItem.php        | 42 ++++++++++++++-
 .../VisitorsFlow/ParameterItem.php            | 19 ++++++-
 ...ollection.php => ParametersCollection.php} |  4 +-
 .../Api/VisitorsFlowController.php            |  2 +-
 .../GetVisitorsFlowHttpRequest.php            |  8 ++-
 .../Http/Resources/VisitorsFlowResource.php   |  1 -
 .../VisitorFlowBrowserRepository.php          |  8 +--
 ...sticsearchVisitorFlowBrowserRepository.php | 22 +++++---
 14 files changed, 121 insertions(+), 113 deletions(-)
 delete mode 100644 backend/app/DataTransformer/VisitorsFlow/BrowserFlowItem.php
 delete mode 100644 backend/app/DataTransformer/VisitorsFlow/BrowserItem.php
 rename backend/app/DataTransformer/VisitorsFlow/{BrowserFlowCollection.php => ParameterFlowCollection.php} (81%)
 rename backend/app/DataTransformer/VisitorsFlow/{BrowsersCollection.php => ParametersCollection.php} (84%)

diff --git a/backend/app/Actions/VisitorsFlow/GetVisitorFlowResponse.php b/backend/app/Actions/VisitorsFlow/GetVisitorFlowResponse.php
index b9be4d04..cfb2b19b 100644
--- a/backend/app/Actions/VisitorsFlow/GetVisitorFlowResponse.php
+++ b/backend/app/Actions/VisitorsFlow/GetVisitorFlowResponse.php
@@ -10,7 +10,7 @@ class GetVisitorFlowResponse
     private $parameterViews;
     private $visitorsFlow;
 
-    public function __construct(Collection $parameterViews, Collection $visitorsFlow)
+    public function __construct(Collection $visitorsFlow, Collection $parameterViews = null)
     {
         $this->parameterViews = $parameterViews;
         $this->visitorsFlow = $visitorsFlow;
@@ -18,8 +18,15 @@ public function __construct(Collection $parameterViews, Collection $visitorsFlow
 
     public function getCollection(): Collection
     {
+        if ($this->parameterViews) {
+            return collect(
+                ['parameter_views' => $this->parameterViews,
+                    'visitors_flow' => $this->visitorsFlow
+                ]
+            );
+        }
         return collect(
-            ['parameter_views' => $this->parameterViews,
+            [
                 'visitors_flow' => $this->visitorsFlow
             ]
         );
diff --git a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
index b7b33c63..1c9700cd 100644
--- a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
+++ b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
@@ -32,11 +32,15 @@ public function __construct(
     public function execute(GetVisitorsFlowRequest $request): GetVisitorFlowResponse
     {
         $websiteId = auth()->user()->website->id;
-        switch ($request->getType()) {
+        switch ($request->getParameter()) {
             case 'browser':
-                $browsersViews = $this->visitorsFlowBrowserRepository->getViewsByEachBrowser($request->getType(), $websiteId);
-                $browsersFlow = $this->visitorsFlowBrowserRepository->getFlow($websiteId);
-                return new GetVisitorFlowResponse($browsersViews->getCollection(), $browsersFlow->getCollection());
+                if ($request->getLevel() > 2) {
+                    $browsersFlow = $this->visitorsFlowBrowserRepository->getFlow($websiteId, $request->getLevel());
+                    return new GetVisitorFlowResponse($browsersFlow->getCollection());
+                }
+                $browsersViews = $this->visitorsFlowBrowserRepository->getViewsByEachBrowser($request->getParameter(), $websiteId);
+                $browsersFlow = $this->visitorsFlowBrowserRepository->getFlow($websiteId, $request->getLevel());
+                return new GetVisitorFlowResponse($browsersFlow->getCollection(), $browsersViews->getCollection());
                 break;
             case 'country':
                 break;
diff --git a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowRequest.php b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowRequest.php
index b18a0dfb..35fccde9 100644
--- a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowRequest.php
+++ b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowRequest.php
@@ -7,22 +7,30 @@
 
 class GetVisitorsFlowRequest
 {
-    private $type;
+    private $parameter;
+    private $level;
 
-    public function __construct(string $type)
+    public function __construct(string $parameter, int $level)
     {
-        $this->type = $type;
+        $this->parameter = $parameter;
+        $this->level = $level;
     }
 
     public static function fromRequest(GetVisitorsFlowHttpRequest $request): self
     {
         return new static(
-            $request->getType()
+            $request->getParameter(),
+            $request->getLevel()
         );
     }
 
-    public function getType(): string
+    public function getParameter(): string
     {
-        return $this->type;
+        return $this->parameter;
+    }
+
+    public function getLevel(): int
+    {
+        return $this->level;
     }
 }
diff --git a/backend/app/DataTransformer/VisitorsFlow/BrowserFlowItem.php b/backend/app/DataTransformer/VisitorsFlow/BrowserFlowItem.php
deleted file mode 100644
index 691c88c1..00000000
--- a/backend/app/DataTransformer/VisitorsFlow/BrowserFlowItem.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DataTransformer\VisitorsFlow;
-
-class BrowserFlowItem implements ParameterFlowItem
-{
-    private $browser;
-    private $targetUrl;
-    private $views;
-    private $exitCount;
-    private $level;
-    private $sourceUrl;
-
-    public function __construct(array $item)
-    {
-        $this->browser = $item['browser'];
-        $this->targetUrl = $item['target_url'];
-        $this->views = $item['views'];
-        $this->level = $item['level'];
-        $this->exitCount = $item['exit_count'];
-        $this->sourceUrl = $item['prev_page']['source_url'];
-    }
-
-    public function getParameter(): string
-    {
-        return $this->browser;
-    }
-
-    public function getTargetUrl(): string
-    {
-        return $this->targetUrl;
-    }
-
-    public function getViews(): int
-    {
-        return $this->views;
-    }
-
-    public function getExitCount(): int
-    {
-        return $this->exitCount;
-    }
-
-    public function getLevel(): int
-    {
-        return $this->level;
-    }
-
-    public function getSourceUrl(): string
-    {
-        return $this->sourceUrl;
-    }
-}
diff --git a/backend/app/DataTransformer/VisitorsFlow/BrowserItem.php b/backend/app/DataTransformer/VisitorsFlow/BrowserItem.php
deleted file mode 100644
index cc83bcbc..00000000
--- a/backend/app/DataTransformer/VisitorsFlow/BrowserItem.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DataTransformer\VisitorsFlow;
-
-
-class BrowserItem implements ParameterItem
-{
-    private $title;
-    private $count;
-
-    public function __construct(array $item)
-    {
-        $this->title = $item['key'];
-        $this->count = (int)$item['views']['value'];
-    }
-
-    public function getTitle(): string
-    {
-        return $this->title;
-    }
-
-    public function getCount(): int
-    {
-        return $this->count;
-    }
-}
diff --git a/backend/app/DataTransformer/VisitorsFlow/BrowserFlowCollection.php b/backend/app/DataTransformer/VisitorsFlow/ParameterFlowCollection.php
similarity index 81%
rename from backend/app/DataTransformer/VisitorsFlow/BrowserFlowCollection.php
rename to backend/app/DataTransformer/VisitorsFlow/ParameterFlowCollection.php
index b28591c2..48001ae2 100644
--- a/backend/app/DataTransformer/VisitorsFlow/BrowserFlowCollection.php
+++ b/backend/app/DataTransformer/VisitorsFlow/ParameterFlowCollection.php
@@ -5,7 +5,7 @@
 
 use Illuminate\Support\Collection;
 
-class BrowserFlowCollection
+class ParameterFlowCollection
 {
     private $collection;
 
@@ -17,7 +17,7 @@ public function __construct(array $collection)
     public function getCollection():Collection
     {
         return collect($this->collection)->map(function ($item) {
-            return new BrowserFlowItem($item['_source']);
+            return new ParameterFlowItem($item['_source']);
         });
     }
 }
diff --git a/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php b/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php
index ba3ed144..f389fd79 100644
--- a/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php
+++ b/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php
@@ -3,8 +3,46 @@
 
 namespace App\DataTransformer\VisitorsFlow;
 
-
-interface ParameterFlowItem
+class ParameterFlowItem
 {
+    private $targetUrl;
+    private $views;
+    private $exitCount;
+    private $level;
+    private $sourceUrl;
+
+    public function __construct(array $item)
+    {
+        $this->targetUrl = $item['target_url'];
+        $this->views = $item['views'];
+        $this->level = $item['level'];
+        $this->exitCount = $item['exit_count'];
+        $this->sourceUrl = $item['prev_page']['source_url'];
+    }
+
+
+    public function getTargetUrl(): string
+    {
+        return $this->targetUrl;
+    }
+
+    public function getViews(): int
+    {
+        return $this->views;
+    }
+
+    public function getExitCount(): int
+    {
+        return $this->exitCount;
+    }
+
+    public function getLevel(): int
+    {
+        return $this->level;
+    }
 
+    public function getSourceUrl(): string
+    {
+        return $this->sourceUrl;
+    }
 }
diff --git a/backend/app/DataTransformer/VisitorsFlow/ParameterItem.php b/backend/app/DataTransformer/VisitorsFlow/ParameterItem.php
index 61f13277..8a14f455 100644
--- a/backend/app/DataTransformer/VisitorsFlow/ParameterItem.php
+++ b/backend/app/DataTransformer/VisitorsFlow/ParameterItem.php
@@ -4,7 +4,24 @@
 namespace App\DataTransformer\VisitorsFlow;
 
 
-interface ParameterItem
+class ParameterItem
 {
+    private $title;
+    private $count;
 
+    public function __construct(array $item)
+    {
+        $this->title = $item['key'];
+        $this->count = (int)$item['views']['value'];
+    }
+
+    public function getTitle(): string
+    {
+        return $this->title;
+    }
+
+    public function getCount(): int
+    {
+        return $this->count;
+    }
 }
diff --git a/backend/app/DataTransformer/VisitorsFlow/BrowsersCollection.php b/backend/app/DataTransformer/VisitorsFlow/ParametersCollection.php
similarity index 84%
rename from backend/app/DataTransformer/VisitorsFlow/BrowsersCollection.php
rename to backend/app/DataTransformer/VisitorsFlow/ParametersCollection.php
index ed12bb46..693180e4 100644
--- a/backend/app/DataTransformer/VisitorsFlow/BrowsersCollection.php
+++ b/backend/app/DataTransformer/VisitorsFlow/ParametersCollection.php
@@ -6,7 +6,7 @@
 
 use Illuminate\Support\Collection;
 
-class BrowsersCollection
+class ParametersCollection
 {
     private $collection;
 
@@ -18,7 +18,7 @@ public function __construct(array $collection)
     public function getCollection(): Collection
     {
         return collect($this->collection)->map(function ($item) {
-            return new BrowserItem($item);
+            return new ParameterItem($item);
         });
     }
 }
diff --git a/backend/app/Http/Controllers/Api/VisitorsFlowController.php b/backend/app/Http/Controllers/Api/VisitorsFlowController.php
index 85627233..173c75ae 100644
--- a/backend/app/Http/Controllers/Api/VisitorsFlowController.php
+++ b/backend/app/Http/Controllers/Api/VisitorsFlowController.php
@@ -22,6 +22,6 @@ public function __construct(GetVisitorsFlowAction $getVisitorsFlowAction)
     public function getVisitorsFlow(GetVisitorsFlowHttpRequest $request)
     {
         $result = $this->getVisitorsFlowAction->execute(GetVisitorsFlowRequest::fromRequest($request));
-        return ApiResponse::success(new VisitorsFlowResource($result->getCollection()));
+        return ApiResponse::success(new VisitorsFlowResource($result->getCollection()),['level'=>$request->getLevel()]);
     }
 }
diff --git a/backend/app/Http/Requests/VisitorsFlow/GetVisitorsFlowHttpRequest.php b/backend/app/Http/Requests/VisitorsFlow/GetVisitorsFlowHttpRequest.php
index f05583db..47d73e19 100644
--- a/backend/app/Http/Requests/VisitorsFlow/GetVisitorsFlowHttpRequest.php
+++ b/backend/app/Http/Requests/VisitorsFlow/GetVisitorsFlowHttpRequest.php
@@ -11,11 +11,17 @@ public function rules()
     {
         return [
             'filter' => 'required|string',
+            'level' => 'required|int'
         ];
     }
 
-    public function getType(): string
+    public function getParameter(): string
     {
         return $this->get('filter');
     }
+
+    public function getLevel(): int
+    {
+        return $this->get('level');
+    }
 }
diff --git a/backend/app/Http/Resources/VisitorsFlowResource.php b/backend/app/Http/Resources/VisitorsFlowResource.php
index 05ea155e..41a394f8 100644
--- a/backend/app/Http/Resources/VisitorsFlowResource.php
+++ b/backend/app/Http/Resources/VisitorsFlowResource.php
@@ -27,7 +27,6 @@ public function presentParameterViews(ParameterItem $item): array
     public function presentVisitorsFlow(ParameterFlowItem $item): array
     {
         return [
-            "{$item->getParameter()}" => $item->getParameter(),
             'target_url' => $item->getTargetUrl(),
             'level' => $item->getLevel(),
             'views' => $item->getViews(),
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php
index 1f8855af..9b914d7e 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php
@@ -5,8 +5,8 @@
 
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\BrowserAggregate;
-use App\DataTransformer\VisitorsFlow\BrowserFlowCollection;
-use App\DataTransformer\VisitorsFlow\BrowsersCollection;
+use App\DataTransformer\VisitorsFlow\ParameterFlowCollection;
+use App\DataTransformer\VisitorsFlow\ParametersCollection;
 
 interface VisitorFlowBrowserRepository extends VisitorFlowRepository
 {
@@ -16,7 +16,7 @@ public function update(Aggregate $browserAggregate): Aggregate;
 
     public function getByCriteria(Criteria $criteria): ?BrowserAggregate;
 
-    public function getViewsByEachBrowser(string $type, int $websiteId):BrowsersCollection;
+    public function getViewsByEachBrowser(string $type, int $websiteId): ParametersCollection;
 
-    public function getFlow(int $websiteId):BrowserFlowCollection;
+    public function getFlow(int $websiteId, int $level): ParameterFlowCollection;
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
index 87f7af50..162ed0b1 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
@@ -5,8 +5,8 @@
 
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\BrowserAggregate;
-use App\DataTransformer\VisitorsFlow\BrowserFlowCollection;
-use App\DataTransformer\VisitorsFlow\BrowsersCollection;
+use App\DataTransformer\VisitorsFlow\ParameterFlowCollection;
+use App\DataTransformer\VisitorsFlow\ParametersCollection;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
 use Cviebrock\LaravelElasticsearch\Manager as ElasticsearchManager;
@@ -77,7 +77,7 @@ public function getByCriteria(Criteria $criteria): ?BrowserAggregate
         return BrowserAggregate::fromResult($result['hits']['hits'][0]['_source']);
     }
 
-    public function getViewsByEachBrowser(string $type, int $websiteId): BrowsersCollection
+    public function getViewsByEachBrowser(string $type, int $websiteId): ParametersCollection
     {
         $params = [
             'index' => self::INDEX_NAME,
@@ -107,10 +107,10 @@ public function getViewsByEachBrowser(string $type, int $websiteId): BrowsersCol
 
         ];
         $result = $this->client->search($params);
-        return new BrowsersCollection($result['aggregations']['browsers']['buckets']);
+        return new ParametersCollection($result['aggregations']['browsers']['buckets']);
     }
 
-    public function getFlow(int $websiteId): BrowserFlowCollection
+    public function getFlow(int $websiteId, int $level): ParameterFlowCollection
     {
         $params = [
             'index' => self::INDEX_NAME,
@@ -119,6 +119,16 @@ public function getFlow(int $websiteId): BrowserFlowCollection
                     'bool' => [
                         'must' => [
                             ['match' => ['website_id' => $websiteId]],
+                        ],
+                        'filter' => [
+                            $level > 2 ? ['term' => ['level' => $level]] : [
+                                'range' => [
+                                    "level" => [
+                                        'gte' => 1,
+                                        'lte' => 2
+                                    ]
+                                ]
+                            ],
                         ]
                     ]
                 ],
@@ -129,7 +139,7 @@ public function getFlow(int $websiteId): BrowserFlowCollection
             ]
         ];
         $result = $this->client->search($params);
-        return new BrowserFlowCollection($result['hits']['hits']);
+        return new ParameterFlowCollection($result['hits']['hits']);
     }
 }
 

From 9b61d90cf5de8084f17783ce93a052823ca08053 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Sun, 8 Sep 2019 21:11:49 +0300
Subject: [PATCH 066/183] implement countryVisitorsFlow and deviceVsitorsFlow

---
 .../VisitorsFlow/GetVisitorsFlowAction.php    | 14 ++++
 .../VisitorFlowCountryRepository.php          |  6 ++
 .../Contracts/VisitorFlowDeviceRepository.php |  6 ++
 ...sticsearchVisitorFlowCountryRepository.php | 65 +++++++++++++++++-
 ...asticsearchVisitorFlowDeviceRepository.php | 67 +++++++++++++++++++
 .../VisitorsFlow/FlowAggregateService.php     | 16 ++---
 6 files changed, 165 insertions(+), 9 deletions(-)

diff --git a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
index 1c9700cd..45e4e88d 100644
--- a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
+++ b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
@@ -43,8 +43,22 @@ public function execute(GetVisitorsFlowRequest $request): GetVisitorFlowResponse
                 return new GetVisitorFlowResponse($browsersFlow->getCollection(), $browsersViews->getCollection());
                 break;
             case 'country':
+                if ($request->getLevel() > 2) {
+                    $countriesFlow = $this->visitorsFlowCountryRepository->getFlow($websiteId, $request->getLevel());
+                    return new GetVisitorFlowResponse($countriesFlow->getCollection());
+                }
+                $countriesViews = $this->visitorsFlowCountryRepository->getViewsByEachCountry($request->getParameter(), $websiteId);
+                $countriesFlow = $this->visitorsFlowCountryRepository->getFlow($websiteId, $request->getLevel());
+                return new GetVisitorFlowResponse($countriesFlow->getCollection(), $countriesViews->getCollection());
                 break;
             case 'device':
+                if ($request->getLevel() > 2) {
+                    $devicesFlow = $this->visitorsFlowDeviceRepository->getFlow($websiteId, $request->getLevel());
+                    return new GetVisitorFlowResponse($devicesFlow->getCollection());
+                }
+                $devicesViews = $this->visitorsFlowDeviceRepository->getViewsByEachDevice($request->getParameter(), $websiteId);
+                $devicesFlow = $this->visitorsFlowDeviceRepository->getFlow($websiteId, $request->getLevel());
+                return new GetVisitorFlowResponse($devicesFlow->getCollection(), $devicesViews->getCollection());
                 break;
             case 'screen':
                 break;
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php
index 36da6c8b..8438e8b0 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php
@@ -5,6 +5,8 @@
 
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\CountryAggregate;
+use App\DataTransformer\VisitorsFlow\ParameterFlowCollection;
+use App\DataTransformer\VisitorsFlow\ParametersCollection;
 
 interface VisitorFlowCountryRepository extends VisitorFlowRepository
 {
@@ -13,4 +15,8 @@ public function save(Aggregate $tableAggregate): Aggregate;
     public function update(Aggregate $tableAggregate): Aggregate;
 
     public function getByCriteria(Criteria $criteria): ?CountryAggregate;
+
+    public function getFlow(int $websiteId, int $level): ParameterFlowCollection;
+
+    public function getViewsByEachCountry(string $type, int $websiteId): ParametersCollection;
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowDeviceRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowDeviceRepository.php
index 6174152b..28853f7d 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowDeviceRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowDeviceRepository.php
@@ -5,6 +5,8 @@
 
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\DeviceAggregate;
+use App\DataTransformer\VisitorsFlow\ParameterFlowCollection;
+use App\DataTransformer\VisitorsFlow\ParametersCollection;
 
 interface VisitorFlowDeviceRepository extends VisitorFlowRepository
 {
@@ -13,4 +15,8 @@ public function save(Aggregate $deviceAggregate): Aggregate;
     public function update(Aggregate $deviceAggregate): Aggregate;
 
     public function getByCriteria(Criteria $criteria): ?DeviceAggregate;
+
+    public function getFlow(int $websiteId, int $level): ParameterFlowCollection;
+
+    public function getViewsByEachDevice(string $type, int $websiteId): ParametersCollection;
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
index 9a9cb918..5e89956a 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
@@ -5,6 +5,8 @@
 
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\CountryAggregate;
+use App\DataTransformer\VisitorsFlow\ParameterFlowCollection;
+use App\DataTransformer\VisitorsFlow\ParametersCollection;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
 use Cviebrock\LaravelElasticsearch\Manager as ElasticsearchManager;
@@ -74,6 +76,67 @@ public function getByCriteria(Criteria $criteria): ?CountryAggregate
         }
         return CountryAggregate::fromResult($result['hits']['hits'][0]['_source']);
     }
+    public function getViewsByEachCountry(string $type, int $websiteId): ParametersCollection
+    {
+        $params = [
+            'index' => self::INDEX_NAME,
+            'body' => [
+                'query' => [
+                    'bool' => [
+                        'must' => [
+                            ['match' => ['website_id' => $websiteId]],
+                        ]
+                    ]
+                ],
+                'aggregations' => [
+                    'countries' => [
+                        'terms' => [
+                            'field' => $type
+                        ],
+                        'aggregations' => [
+                            'views' => [
+                                'sum' => [
+                                    'field' => 'views'
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
+            ]
 
-//    public function
+        ];
+        $result = $this->client->search($params);
+        return new ParametersCollection($result['aggregations']['countries']['buckets']);
+    }
+    public function getFlow(int $websiteId, int $level): ParameterFlowCollection
+    {
+        $params = [
+            'index' => self::INDEX_NAME,
+            'body' => [
+                'query' => [
+                    'bool' => [
+                        'must' => [
+                            ['match' => ['website_id' => $websiteId]],
+                        ],
+                        'filter' => [
+                            $level > 2 ? ['term' => ['level' => $level]] : [
+                                'range' => [
+                                    "level" => [
+                                        'gte' => 1,
+                                        'lte' => 2
+                                    ]
+                                ]
+                            ],
+                        ]
+                    ]
+                ],
+                'sort' => [
+                    'level' => 'asc',
+                    'views' => 'desc'
+                ]
+            ]
+        ];
+        $result = $this->client->search($params);
+        return new ParameterFlowCollection($result['hits']['hits']);
+    }
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
index fd5b241e..45fc1cd9 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
@@ -6,6 +6,8 @@
 
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\DeviceAggregate;
+use App\DataTransformer\VisitorsFlow\ParameterFlowCollection;
+use App\DataTransformer\VisitorsFlow\ParametersCollection;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowDeviceRepository;
 use Cviebrock\LaravelElasticsearch\Manager as ElasticsearchManager;
@@ -75,4 +77,69 @@ public function getByCriteria(Criteria $criteria): ?DeviceAggregate
         }
         return DeviceAggregate::fromResult($result['hits']['hits'][0]['_source']);
     }
+
+    public function getViewsByEachDevice(string $type, int $websiteId): ParametersCollection
+    {
+        $params = [
+            'index' => self::INDEX_NAME,
+            'body' => [
+                'query' => [
+                    'bool' => [
+                        'must' => [
+                            ['match' => ['website_id' => $websiteId]],
+                        ]
+                    ]
+                ],
+                'aggregations' => [
+                    'devices' => [
+                        'terms' => [
+                            'field' => $type
+                        ],
+                        'aggregations' => [
+                            'views' => [
+                                'sum' => [
+                                    'field' => 'views'
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+
+        ];
+        $result = $this->client->search($params);
+        return new ParametersCollection($result['aggregations']['devices']['buckets']);
+    }
+
+    public function getFlow(int $websiteId, int $level): ParameterFlowCollection
+    {
+        $params = [
+            'index' => self::INDEX_NAME,
+            'body' => [
+                'query' => [
+                    'bool' => [
+                        'must' => [
+                            ['match' => ['website_id' => $websiteId]],
+                        ],
+                        'filter' => [
+                            $level > 2 ? ['term' => ['level' => $level]] : [
+                                'range' => [
+                                    "level" => [
+                                        'gte' => 1,
+                                        'lte' => 2
+                                    ]
+                                ]
+                            ],
+                        ]
+                    ]
+                ],
+                'sort' => [
+                    'level' => 'asc',
+                    'views' => 'desc'
+                ]
+            ]
+        ];
+        $result = $this->client->search($params);
+        return new ParameterFlowCollection($result['hits']['hits']);
+    }
 }
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 68f4f3e3..92fc901b 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -103,7 +103,7 @@ public function aggregate(Visit $visit)
         );
         if (!$countryAggregate) {
             $countryAggregate = $this->createCountryAggregate($visit, $level, $previousVisit);
-            $countryAggregate = $this->visitorFlowCountryRepository->save($countryAggregate);
+            $this->visitorFlowCountryRepository->save($countryAggregate);
         } else {
             if ($level > 1) {
                 $previousAggregate = CountryAggregate::getPreviousAggregate(
@@ -118,12 +118,12 @@ public function aggregate(Visit $visit)
             }
             $countryAggregate->views++;
             $countryAggregate->exitCount++;
-            $countryAggregate = $this->visitorFlowCountryRepository->update($countryAggregate);
+            $this->visitorFlowCountryRepository->update($countryAggregate);
         }
 
         if (!$browserAggregate) {
             $browserAggregate = $this->createBrowserAggregate($visit, $level, $previousVisit);
-            $browserAggregate = $this->visitorFlowBrowserRepository->save($browserAggregate);
+            $this->visitorFlowBrowserRepository->save($browserAggregate);
         } else {
             if ($level > 1) {
                 $previousAggregate = BrowserAggregate::getPreviousAggregate(
@@ -138,11 +138,11 @@ public function aggregate(Visit $visit)
             }
             $browserAggregate->views++;
             $browserAggregate->exitCount++;
-            $browserAggregate = $this->visitorFlowBrowserRepository->update($browserAggregate);
+            $this->visitorFlowBrowserRepository->update($browserAggregate);
         }
         if (!$deviceAggregate) {
             $deviceAggregate = $this->createDeviceAggregate($visit, $level, $previousVisit);
-            $deviceAggregate = $this->visitorFlowDeviceRepository->save($deviceAggregate);
+            $this->visitorFlowDeviceRepository->save($deviceAggregate);
         } else {
             if ($level > 1) {
                 $previousAggregate = DeviceAggregate::getPreviousAggregate(
@@ -157,12 +157,12 @@ public function aggregate(Visit $visit)
             }
             $deviceAggregate->views++;
             $deviceAggregate->exitCount++;
-            $deviceAggregate = $this->visitorFlowDeviceRepository->update($deviceAggregate);
+            $this->visitorFlowDeviceRepository->update($deviceAggregate);
         }
 
         if (!$screenAggregate) {
             $screenAggregate = $this->createScreenAggregate($visit, $level, $previousVisit);
-            $screenAggregate = $this->visitorFlowScreenRepository->save($screenAggregate);
+            $this->visitorFlowScreenRepository->save($screenAggregate);
         } else {
             if ($level > 1) {
                 $previousAggregate = ScreenAggregate::getPreviousAggregate(
@@ -177,7 +177,7 @@ public function aggregate(Visit $visit)
             }
             $screenAggregate->views++;
             $screenAggregate->exitCount++;
-            $screenAggregate = $this->visitorFlowScreenRepository->update($screenAggregate);
+            $this->visitorFlowScreenRepository->update($screenAggregate);
         }
     }
 

From 3874bff853ec9ecc1ddfb78781f884aca5294ad4 Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Sun, 8 Sep 2019 22:53:11 +0300
Subject: [PATCH 067/183] add paths highlight

---
 .../visitors_flow/VisitorsFlowDiagram.vue     | 214 +++++++++++++-----
 1 file changed, 155 insertions(+), 59 deletions(-)

diff --git a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
index 232080ff..4545932b 100644
--- a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
+++ b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
@@ -35,6 +35,7 @@
                     '3rd Interaction'
                 ],
                 height: 600,
+                tooltip: {},
                 nodes: [
                     { id: 1, name: 'United States' },
                     { id: 2, name: 'United Kingdom' },
@@ -94,7 +95,7 @@
                 for (let sourceInd = 5; sourceInd < lastNodeId; sourceInd++) {
                     let sourceId = this.nodes[sourceInd].id;
                     let value = Math.floor(Math.random() * 50);
-                    let exit = { source: sourceId, value: value };
+                    let exit = { source: sourceId, value: value, index: sourceId - 1 };
                     this.exits.push(exit);
                 }
             },
@@ -111,9 +112,7 @@
                 d3.transition()
                     .select('#visitors-flow-container')
                     .tween("scroll", function () {
-                        return (t) => {
-                            this.scrollLeft += this.scrollWidth * t;
-                        };
+                        this.scrollLeft += this.scrollWidth;
                     });
             },
 
@@ -122,6 +121,7 @@
                     .remove();
                 d3.select('.diagram-tooltip')
                     .remove();
+
                 this.createLinks();
                 this.createExits();
 
@@ -156,43 +156,111 @@
                     .attr("y", d => d.y0)
                     .attr("rx", "4")
                     .attr("ry", "4")
-                    .attr("height", d => {
-                        /*let exit = this.exits.find((exit) => {
-                            console.log(d, exit);
-                            return d.id === exit.source;
-                        });
+                    .attr("height", d => d.y1 - d.y0)
+                    .attr("width", d => d.x1 - d.x0)
+                    .attr("fill", '#526ede')
+                    .attr("class", "node")
+                    .attr("id", d => `node-${d.index}`)
+                    .on("mouseover", (node, i, nodes) => {
+                        d3.selectAll("rect")
+                            .style("opacity", "0.2");
+                        d3.selectAll("path")
+                            .attr("stroke-opacity", ".2");
+
+                        this.highlightLeftSide(d3.select(nodes[i]));
+                        this.highlightRightSide(d3.select(nodes[i]));
+                    })
+                    .on("mouseleave", () => {
+                        d3.selectAll("rect")
+                            .style("opacity", "1");
 
-                        if (exit) {
-                            return d.y1 - d.y0 + exit.value;
-                        }*/
+                        d3.selectAll("path")
+                            .attr("stroke-opacity", ".5");
+                    });
 
-                        return d.y1 - d.y0;
-                    })
-                    .attr("width", d => d.x1 - d.x0)
-                    .attr("fill", () => '#526ede');
+                const tooltip = d3.select("#visitors-flow-container")
+                    .append("div")
+                    .attr("class", "diagram-tooltip");
 
-                const link = svg.append("g")
+                svg.append("g")
                     .attr("fill", "none")
-                    .attr("stroke-opacity", 0.5)
                     .selectAll("g")
                     .data(links)
-                    .join("g");
-
-                link.append("path")
+                    .join("path")
                     .attr("d", sankeyLinkHorizontal())
                     .attr("class", "link")
+                    .attr("id", d => `link-${d.index}`)
                     .attr("stroke", '#829afa')
-                    .attr("stroke-width", d => Math.max(1, d.width));
+                    .attr("stroke-opacity", ".5")
+                    .attr("stroke-width", d => Math.max(1, d.width))
+                    .on("mouseover", (d, i, links) => {
+                        tooltip.text(`${d.source.name} → ${d.target.name}, ${d.value}`)
+                            .style("visibility", "visible");
 
-                const tooltip = d3.select("#visitors-flow-container")
-                    .append("div")
-                    .attr("class", "diagram-tooltip");
+                        d3.selectAll("rect")
+                            .style("opacity", ".2");
+                        d3.selectAll("path")
+                            .attr("stroke-opacity", ".2");
+
+                        const link = d3.select(links[i]);
+
+                        link.attr("stroke-opacity", "1");
+                        this.highlightRightSide(d3.select(`#node-${link.data()[0].target.index}`));
+                        this.highlightLeftSide(d3.select(`#node-${link.data()[0].source.index}`));
+                    })
+                    .on("mouseleave", function () {
+                        tooltip.style("visibility", "hidden");
+
+                        d3.selectAll("rect")
+                            .style("opacity", "1");
+                        d3.selectAll("path")
+                            .attr("stroke-opacity", ".5");
+                    })
+                    .on("mousemove", () => {
+                        tooltip.style("left", (d3.event.pageX + 20) + "px")
+                            .style("top", (d3.event.pageY - 40) + "px");
+                    });
+
+                svg.append("g")
+                    .attr("fill", "none")
+                    .selectAll("rect")
+                    .data(this.exits)
+                    .join("path")
+                    .attr("d", d => {
+                        let node = nodes.find((node) => node.id === d.source);
+
+                        let mx = node.x1;
+                        let my = node.y1 - d.value / 2 - 2;
+
+                        return `M ${mx} ${my} a 25 40 0 0 1 25 40`;
+                    })
+                    .attr("class", "drops")
+                    .attr("id", d => `drop-${d.index}`)
+                    .attr("stroke", "#fa514a")
+                    .attr("stroke-opacity", ".5")
+                    .attr("stroke-width", d => d.value)
+                    .on("mouseover", (d, i, drops) => {
+                        tooltip.text(`${d.value} drop-offs`)
+                            .style("visibility", "visible");
+
+                        d3.selectAll("rect")
+                            .style("opacity", ".2");
+                        d3.selectAll("path")
+                            .attr("stroke-opacity", ".2");
+
+                        const drop = d3.select(drops[i]);
 
-                link.on("mouseover", (d) => {
-                    tooltip.text(`${d.source.name} → ${d.target.name}, ${d.value}`)
-                        .style("visibility", "visible");
-                })
-                    .on("mouseleave", () => tooltip.style("visibility", "hidden"))
+                        drop.attr("stroke-opacity", "1");
+                        this.highlightLeftSide(d3.select(`#node-${drop.data()[0].index}`));
+                    })
+                    .on("mouseleave", () =>  {
+                        tooltip.style("visibility", "hidden");
+
+                        d3.selectAll("rect")
+                            .style("opacity", "1");
+                        d3.selectAll("path")
+                            .attr("stroke-opacity", ".5");
+                    })
                     .on("mousemove", () => {
                         tooltip.style("left", (d3.event.pageX + 20) + "px")
                             .style("top", (d3.event.pageY - 40) + "px");
@@ -208,7 +276,14 @@
                     .attr("y", d => (d.y1 + d.y0) / 2)
                     .attr("dy", "0.35em")
                     .attr("text-anchor", "middle")
-                    .text(d => `${d.name}, ${d.value}`);
+                    .attr("class", "node-text")
+                    .attr("id", d => `node-text-${d.index}`)
+                    .text(d => `${d.name}, ${d.value}`)
+                    .on("mouseover", (text, i, texts) => {
+                        const index = d3.select(texts[i]).data()[0].index;
+                        d3.select(`#node-${index}`)
+                            .dispatch("mouseover");
+                    });
 
                 svg.append("g")
                     .selectAll("rect")
@@ -226,35 +301,48 @@
                         }
                         return `${[d.depth]}th Interaction`;
                     });
+            },
 
-                svg.append("g")
-                    .attr("stroke-opacity", 0.5)
-                    .attr("fill", "none")
-                    .selectAll("rect")
-                    .data(this.exits)
-                    .join("path")
-                    .attr("stroke", "#fa514a")
-                    .attr("class", "link")
-                    .attr("d", d => {
-                        let node = nodes.find((node) => node.id === d.source);
+            highlightRightSide (node) {
+                node.style("opacity", "1");
 
-                        let mx = node.x1;
-                        let my = node.y1 - d.value / 2 - 2;
+                const nodeData = node.data()[0];
 
-                        return `M ${mx} ${my} a 35 45 0 0 1 35 45`;
-                    })
-                    .attr("stroke-width", d => d.value)
-                    .on("mouseover", d => {
-                        tooltip.text(`${d.value} drop-offs`)
-                            .style("visibility", "visible");
-                    })
-                    .on("mouseleave", () => tooltip.style("visibility", "hidden"))
-                    .on("mousemove", () => {
-                        tooltip.style("left", (d3.event.pageX + 20) + "px")
-                            .style("top", (d3.event.pageY - 40) + "px");
+                d3.select(`#drop-${nodeData.index}`)
+                    .attr("stroke-opacity", "1");
+
+                nodeData.sourceLinks
+                    .forEach((link) => {
+                        d3.select(`#link-${link.index}`)
+                            .attr("stroke-opacity", ".9");
+
+                        let next = d3.select(`#node-${link.target.index}`);
+                        if (next) {
+                            this.highlightRightSide(next);
+                        }
+                    });
+            },
+
+            highlightLeftSide (node) {
+                node.style("opacity", "1");
+
+                const nodeData = node.data()[0];
+
+                d3.select(`#drop-${nodeData.index}`)
+                    .attr("stroke-opacity", "1");
+
+                nodeData.targetLinks
+                    .forEach((link) => {
+                        d3.select(`#link-${link.index}`)
+                            .attr("stroke-opacity", ".9");
+
+                        let next = d3.select(`#node-${link.source.index}`);
+                        if (next) {
+                            this.highlightLeftSide(next);
+                        }
                     });
             }
-        }
+        },
     };
 </script>
 
@@ -296,15 +384,23 @@
         }
 
         #visitors-flow-diagram {
-
-            .link:hover {
-                stroke-opacity: 1;
+            .link {
+                transition: all .4s;
                 cursor: pointer;
             }
 
             .title{
                 font-size: 1rem;
             }
+
+            .node {
+                transition: all .4s;
+                cursor: pointer;
+            }
+
+            .node-text {
+                cursor: pointer;
+            }
         }
 
         .diagram-tooltip {
@@ -347,4 +443,4 @@
             }
         }
     }
-</style>
\ No newline at end of file
+</style>

From ff1dde2fcdbc8231e7714ebcff487f26de523701 Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Sun, 8 Sep 2019 22:55:24 +0300
Subject: [PATCH 068/183] add line chart

---
 .../src/pages/speed_overview/ErrorReports.vue | 51 +++++++++++++++-
 frontend/src/store/index.js                   |  4 +-
 .../src/store/modules/error_report/actions.js | 61 +++++++++++++++++++
 .../src/store/modules/error_report/getters.js | 19 ++++++
 .../src/store/modules/error_report/index.js   | 12 ++++
 .../store/modules/error_report/mutations.js   | 33 ++++++++++
 .../src/store/modules/error_report/state.js   |  9 +++
 .../modules/error_report/types/actions.js     |  4 ++
 .../modules/error_report/types/getters.js     |  5 ++
 .../modules/error_report/types/mutations.js   |  8 +++
 10 files changed, 202 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/store/modules/error_report/actions.js
 create mode 100644 frontend/src/store/modules/error_report/getters.js
 create mode 100644 frontend/src/store/modules/error_report/index.js
 create mode 100644 frontend/src/store/modules/error_report/mutations.js
 create mode 100644 frontend/src/store/modules/error_report/state.js
 create mode 100644 frontend/src/store/modules/error_report/types/actions.js
 create mode 100644 frontend/src/store/modules/error_report/types/getters.js
 create mode 100644 frontend/src/store/modules/error_report/types/mutations.js

diff --git a/frontend/src/pages/speed_overview/ErrorReports.vue b/frontend/src/pages/speed_overview/ErrorReports.vue
index 1e0f0157..0f4c2978 100644
--- a/frontend/src/pages/speed_overview/ErrorReports.vue
+++ b/frontend/src/pages/speed_overview/ErrorReports.vue
@@ -1,5 +1,17 @@
 <template>
     <ContentLayout :title="title">
+        <VRow>
+            <VContainer class="white card px-7 py-6">
+                <LineChart
+                    :data="formatLineChartData"
+                    :is-fetching="chartData.isFetching"
+                />
+                <PeriodDropdown
+                    :value="getSelectedPeriod"
+                    @change="changePeriod"
+                />
+            </VContainer>
+        </VRow>
         <VRow class="position-relative">
             <Spinner v-if="fetching" />
             <ErrorsTable
@@ -13,17 +25,32 @@
 
 <script>
     import ContentLayout from '../../components/layout/ContentLayout.vue';
+    import LineChart from "../../components/common/LineChart";
     import ErrorsTable from '../../components/dashboard/errors/ErrorsTable.vue';
     import { isWebsite } from "../../mixins/isWebsite";
+    import PeriodDropdown from "../../components/dashboard/common/PeriodDropdown.vue";
     import Spinner from '../../components/utilites/Spinner';
-
+    import {mapGetters, mapActions} from 'vuex';
+    import {
+        GET_SELECTED_PERIOD,
+        GET_LINE_CHART_DATA,
+        GET_FORMAT_LINE_CHART_DATA
+    } from "@/store/modules/error_report/types/getters";
+    import {
+        CHANGE_FETCHED_BUTTON_STATE,
+        CHANGE_SELECTED_PERIOD,
+        FETCH_PAGE_DATA
+    } from "@/store/modules/error_report/types/actions";
 
     export default {
         name: "ErrorReports",
         components: {
             ContentLayout,
             ErrorsTable,
-            Spinner
+            Spinner,
+            LineChart,
+            PeriodDropdown
+
         },
         mixins: [isWebsite],
         data() {
@@ -61,12 +88,30 @@
                 }
             };
         },
+        computed: {
+            ...mapGetters('error_report', {
+                getSelectedPeriod: GET_SELECTED_PERIOD,
+                chartData: GET_LINE_CHART_DATA,
+                formatLineChartData:GET_FORMAT_LINE_CHART_DATA,
+            }),
+        },
+        created () {
+            this.fetchPageData();
+        },
         methods: {
             changeGroupedParameter (parameter) {
                 if (this.currentParameter !== parameter) {
                     this.currentParameter = parameter;
                 }
-            }
+            },
+            ...mapActions('visitors', {
+                changeFetchingButtonState: CHANGE_FETCHED_BUTTON_STATE,
+                changeSelectedPeriod: CHANGE_SELECTED_PERIOD,
+                fetchPageData: FETCH_PAGE_DATA
+            }),
+            changePeriod (data) {
+                this.changeSelectedPeriod(data);
+            },
         }
     };
 </script>
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index 852ea31f..f4813369 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -10,6 +10,7 @@ import page_views from './modules/page_views';
 import page_timings from './modules/page_timings';
 import geo_location from './modules/geo_location';
 import devices from './modules/devices';
+import error_report from './modules/error_report';
 import visits_density_widget from './modules/visits_density_widget';
 
 Vue.use(Vuex);
@@ -25,7 +26,8 @@ export default new Vuex.Store({
         dashboard,
         geo_location,
         devices,
-        visits_density_widget
+        visits_density_widget,
+        error_report
     },
     plugins: [authPlugin]
 });
diff --git a/frontend/src/store/modules/error_report/actions.js b/frontend/src/store/modules/error_report/actions.js
new file mode 100644
index 00000000..b3be0dfc
--- /dev/null
+++ b/frontend/src/store/modules/error_report/actions.js
@@ -0,0 +1,61 @@
+import {
+    CHANGE_SELECTED_PERIOD,
+    CHANGE_FETCHED_BUTTON_STATE,
+    FETCH_PAGE_DATA,
+    FETCH_CHART_DATA,
+} from "./types/actions";
+
+//import {getTimeByPeriod} from "@/services/periodService";
+
+import {
+    SET_SELECTED_PERIOD,
+    RESET_BUTTON_FETCHING,
+    SET_BUTTON_FETCHING,
+    SET_CHART_VALUES,
+    //RESET_CHART_FETCHING,
+} from "./types/mutations";
+
+export default {
+    [CHANGE_SELECTED_PERIOD]: (context, payload) => {
+        context.commit(SET_SELECTED_PERIOD, payload.value);
+        context.dispatch(FETCH_PAGE_DATA);
+    },
+    [CHANGE_FETCHED_BUTTON_STATE]: (context, data) => {
+
+        if (data.value) {
+            context.commit(SET_BUTTON_FETCHING, data.button);
+        } else {
+            context.commit(RESET_BUTTON_FETCHING, data.button);
+        }
+    },
+    [FETCH_PAGE_DATA]: (context) => {
+        context.dispatch(FETCH_CHART_DATA);
+    },
+
+    [FETCH_CHART_DATA]: (context) => {
+       // const time = getTimeByPeriod(context.state.selectedPeriod);
+       // context.commit(SET_CHART_FETCHING);
+
+        console.log(context);
+        const items = [
+            {
+                date:'1565700000',
+                value:2,
+            },
+            {
+                date:'1565820000',
+                value:2,
+            },
+        ];
+        context.commit(SET_CHART_VALUES, items);
+        /*fetchChartValues(
+            time.startDate.unix(),
+            time.endDate.unix(),
+            time.interval
+        ).then(response => {
+                context.commit(SET_CHART_VALUES, response);
+                context.commit(RESET_CHART_FETCHING);
+            }
+        ).finally(() => context.commit(RESET_CHART_FETCHING));*/
+    },
+};
diff --git a/frontend/src/store/modules/error_report/getters.js b/frontend/src/store/modules/error_report/getters.js
new file mode 100644
index 00000000..696b3b2a
--- /dev/null
+++ b/frontend/src/store/modules/error_report/getters.js
@@ -0,0 +1,19 @@
+import {
+    GET_SELECTED_PERIOD,
+    GET_BUTTON_DATA,
+    GET_ACTIVE_BUTTON,
+    GET_LINE_CHART_DATA,
+    GET_FORMAT_LINE_CHART_DATA,
+} from "./types/getters";
+
+import { chartDataTransformer } from "@/api/widgets/transformers";
+
+export default {
+    [GET_SELECTED_PERIOD]: (state) => state.selectedPeriod,
+    [GET_BUTTON_DATA]: (state) => state.buttonData,
+    [GET_ACTIVE_BUTTON]: (state) => state.activeButton,
+    [GET_LINE_CHART_DATA]: (state) => state.chartData,
+    [GET_FORMAT_LINE_CHART_DATA]: (state) => {
+        return chartDataTransformer(state.chartData.items, state.selectedPeriod);
+    },
+};
diff --git a/frontend/src/store/modules/error_report/index.js b/frontend/src/store/modules/error_report/index.js
new file mode 100644
index 00000000..a8a9d106
--- /dev/null
+++ b/frontend/src/store/modules/error_report/index.js
@@ -0,0 +1,12 @@
+import state from './state';
+import getters from './getters';
+import actions from './actions';
+import mutations from './mutations';
+
+export default {
+    namespaced: true,
+    state,
+    getters,
+    actions,
+    mutations
+};
diff --git a/frontend/src/store/modules/error_report/mutations.js b/frontend/src/store/modules/error_report/mutations.js
new file mode 100644
index 00000000..39e99396
--- /dev/null
+++ b/frontend/src/store/modules/error_report/mutations.js
@@ -0,0 +1,33 @@
+import {
+    SET_SELECTED_PERIOD,
+    SET_BUTTON_FETCHING,
+    RESET_BUTTON_FETCHING,
+    SET_BUTTON_VALUE,
+    SET_CHART_VALUES,
+    SET_CHART_FETCHING,
+    RESET_CHART_FETCHING,
+} from "./types/mutations";
+
+export default {
+    [SET_SELECTED_PERIOD]: (state, period) => {
+        state.selectedPeriod = period;
+    },
+    [SET_BUTTON_FETCHING]: (state, button) => {
+        state.buttonData[button].isFetching = true;
+    },
+    [RESET_BUTTON_FETCHING]: (state, button) => {
+        state.buttonData[button].isFetching = false;
+    },
+    [SET_BUTTON_VALUE]: (state, payload) => {
+        state.buttonData[payload.buttonType].value = payload.value;
+    },
+    [SET_CHART_VALUES]: (state, items) => {
+        state.chartData.items = items;
+    },
+    [SET_CHART_FETCHING]: (state) => {
+        state.chartData.isFetching = true;
+    },
+    [RESET_CHART_FETCHING]: (state) => {
+        state.chartData.isFetching = false;
+    }
+};
diff --git a/frontend/src/store/modules/error_report/state.js b/frontend/src/store/modules/error_report/state.js
new file mode 100644
index 00000000..3d728581
--- /dev/null
+++ b/frontend/src/store/modules/error_report/state.js
@@ -0,0 +1,9 @@
+import {period} from "@/services/periodService";
+
+export default {
+    selectedPeriod: period.PERIOD_LAST_WEEK,
+    chartData: {
+        items: [],
+        isFetching: false
+    },
+};
diff --git a/frontend/src/store/modules/error_report/types/actions.js b/frontend/src/store/modules/error_report/types/actions.js
new file mode 100644
index 00000000..dd09f0c7
--- /dev/null
+++ b/frontend/src/store/modules/error_report/types/actions.js
@@ -0,0 +1,4 @@
+export const CHANGE_SELECTED_PERIOD = 'changeSelectedPeriod';
+export const CHANGE_FETCHED_BUTTON_STATE = 'changeFetchedButtonState';
+export const FETCH_PAGE_DATA = 'fetchPageData';
+export const FETCH_CHART_DATA = 'fetchChartData';
diff --git a/frontend/src/store/modules/error_report/types/getters.js b/frontend/src/store/modules/error_report/types/getters.js
new file mode 100644
index 00000000..efec3001
--- /dev/null
+++ b/frontend/src/store/modules/error_report/types/getters.js
@@ -0,0 +1,5 @@
+export const GET_SELECTED_PERIOD = 'getSelectedPeriod';
+export const GET_BUTTON_DATA = 'getButtonData';
+export const GET_ACTIVE_BUTTON = 'getActiveButton';
+export const GET_LINE_CHART_DATA = 'getLineChartData';
+export const GET_FORMAT_LINE_CHART_DATA = 'getFormatLineChartData';
diff --git a/frontend/src/store/modules/error_report/types/mutations.js b/frontend/src/store/modules/error_report/types/mutations.js
new file mode 100644
index 00000000..efe7b5df
--- /dev/null
+++ b/frontend/src/store/modules/error_report/types/mutations.js
@@ -0,0 +1,8 @@
+export const SET_SELECTED_PERIOD = 'SET_SELECTED_PERIOD';
+export const SET_ACTIVE_BUTTON = 'SET_ACTIVE_BUTTON';
+export const RESET_BUTTON_FETCHING = 'RESET_BUTTON_FETCHING';
+export const SET_BUTTON_FETCHING = 'SET_BUTTON_FETCHING';
+export const SET_BUTTON_VALUE = 'SET_BUTTON_VALUE';
+export const SET_CHART_VALUES = 'SET_CHART_VALUES';
+export const RESET_CHART_FETCHING = 'RESET_CHART_FETCHING';
+export const SET_CHART_FETCHING = 'SET_CHART_FETCHING';

From b52c32e7bd10a1ae6c27af2291cb015c6aa717ad Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Sun, 8 Sep 2019 20:19:00 +0300
Subject: [PATCH 069/183] add event

---
 backend/app/Events/StatsChangeEvent.php       | 28 +++++++++++
 backend/app/Listeners/CalculateStats.php      | 15 ++++++
 .../app/Providers/EventServiceProvider.php    |  1 +
 backend/routes/channels.php                   |  5 ++
 frontend/src/api/widgets/transformers.js      |  2 +-
 .../components/widgets/DevicesPieChart.vue    | 13 ++++-
 .../src/components/widgets/PieChartItem.vue   | 48 +++++++++++--------
 frontend/src/store/modules/devices/actions.js |  6 ++-
 8 files changed, 93 insertions(+), 25 deletions(-)
 create mode 100644 backend/app/Events/StatsChangeEvent.php
 create mode 100644 backend/app/Listeners/CalculateStats.php

diff --git a/backend/app/Events/StatsChangeEvent.php b/backend/app/Events/StatsChangeEvent.php
new file mode 100644
index 00000000..33c1feac
--- /dev/null
+++ b/backend/app/Events/StatsChangeEvent.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Events;
+
+use App\Entities\Visit;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Support\Facades\Event;
+
+class StatsChangeEvent extends Event implements ShouldBroadcast
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public $visit;
+
+    public function __construct(Visit $visit)
+    {
+        $this->visit = $visit;
+    }
+
+    public function broadcastOn()
+    {
+        return new PrivateChannel('stats.' . $this->visit->page->website_id);
+    }
+}
diff --git a/backend/app/Listeners/CalculateStats.php b/backend/app/Listeners/CalculateStats.php
new file mode 100644
index 00000000..0285994e
--- /dev/null
+++ b/backend/app/Listeners/CalculateStats.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Events\ActiveUserEvent;
+use App\Events\StatsChangeEvent;
+use App\Events\VisitCreated;
+
+class CalculateStats
+{
+    public function handle(VisitCreated $event)
+    {
+        event(new StatsChangeEvent($event->visit));
+    }
+}
diff --git a/backend/app/Providers/EventServiceProvider.php b/backend/app/Providers/EventServiceProvider.php
index caef2bd5..83d2eb6b 100644
--- a/backend/app/Providers/EventServiceProvider.php
+++ b/backend/app/Providers/EventServiceProvider.php
@@ -20,6 +20,7 @@ class EventServiceProvider extends ServiceProvider
         ],
         'App\Events\VisitCreated' => [
             'App\Listeners\SendVisitsNotification',
+            'App\Listeners\CalculateStats'
         ],
     ];
 
diff --git a/backend/routes/channels.php b/backend/routes/channels.php
index 99f83cff..e52587d7 100644
--- a/backend/routes/channels.php
+++ b/backend/routes/channels.php
@@ -11,6 +11,7 @@
 |
 */
 
+use App\Entities\Website;
 use Illuminate\Support\Facades\Broadcast;
 
 Broadcast::channel('App.User.{id}', function ($user, $id) {
@@ -20,3 +21,7 @@
 Broadcast::channel('active-users.{website_id}', function ($user, $website_id) {
     return (int)$user->website->id === (int)$website_id;
 });
+
+Broadcast::channel('stats.{website_id}', function ($user, $website_id) {
+    return (int) $user->id === (int) Website::find($website_id)->user->id;
+});
diff --git a/frontend/src/api/widgets/transformers.js b/frontend/src/api/widgets/transformers.js
index f11e96aa..f7eb60e9 100644
--- a/frontend/src/api/widgets/transformers.js
+++ b/frontend/src/api/widgets/transformers.js
@@ -23,7 +23,7 @@ function transformSytems(systemsData) {
 }
 
 function transformDevices(devicesData) {
-    const colors = ['#F03357', '#ff9900', '#FFD954'];
+    const colors = ['#F03357', '#FFD954', '#ff9900'];
     let percent = 0;
     let devices = [];
     devicesData.forEach((item, index) => {
diff --git a/frontend/src/components/widgets/DevicesPieChart.vue b/frontend/src/components/widgets/DevicesPieChart.vue
index e5e571f7..83288605 100644
--- a/frontend/src/components/widgets/DevicesPieChart.vue
+++ b/frontend/src/components/widgets/DevicesPieChart.vue
@@ -27,6 +27,7 @@
     import PeriodDropdown from "@/components/dashboard/common/PeriodDropdown";
     import PieChartItem from "@/components/widgets/PieChartItem";
     import { mapGetters, mapActions } from "vuex";
+    import { echoInstance } from "../../services/echoService";
     import {
         GET_SELECTED_PERIOD,
         GET_WIDGET_DATA,
@@ -36,6 +37,7 @@
         CHANGE_SELECTED_PERIOD,
         FETCH_WIDGET_INFO
     } from "@/store/modules/devices/types/actions";
+    import {GET_CURRENT_WEBSITE} from "../../store/modules/website/types/getters";
 
     export default {
         components: {
@@ -46,12 +48,21 @@
         created() {
             this.fetchWidgetInfo();
         },
+        mounted() {
+            const channel = echoInstance.private('stats.'+ this.website.id);
+            channel.listen('StatsChangeEvent', () => {
+                this.fetchWidgetInfo(false);
+            });
+        },
         computed: {
             ...mapGetters('devices', {
                 selectedPeriod: GET_SELECTED_PERIOD,
                 data: GET_WIDGET_DATA,
                 isFetching: GET_FETCHING_STATUS
-            })
+            }),
+            ...mapGetters('website', {
+                website: GET_CURRENT_WEBSITE
+            }),
         },
         methods: {
             ...mapActions('devices', {
diff --git a/frontend/src/components/widgets/PieChartItem.vue b/frontend/src/components/widgets/PieChartItem.vue
index f3c9b82d..fd7335bb 100644
--- a/frontend/src/components/widgets/PieChartItem.vue
+++ b/frontend/src/components/widgets/PieChartItem.vue
@@ -1,26 +1,32 @@
 <template>
-    <div class="d-flex">
-        <GChart
-            class="align-self-end mb-3"
-            type="PieChart"
-            :data="chartData"
-            :options="chartOptions"
-        />
-        <div class="flex-grow-1 pl-4">
+    <div class="d-flex flex-column">
+        <VRow>
             <VSubheader
                 v-text="dataType"
-                class="legend-title grey--text text--darken-1 pl-0 mb-3"
+                class="legend-title grey--text text--darken-1 mt-3 pl-3 col-7 offset-5"
             />
-            <VList>
-                <LegendItem
-                    v-for="(item, key) in data"
-                    :key="key"
-                    :color="item.color"
-                    :title="item.title"
-                    :percent="item.percent"
+        </VRow>
+        <VRow>
+            <VCol class="d-flex col-5">
+                <GChart
+                    class="align-self-center"
+                    type="PieChart"
+                    :data="chartData"
+                    :options="chartOptions"
                 />
-            </VList>
-        </div>
+            </VCol>
+            <VCol class="d-flex col-7 align-center">
+                <VList>
+                    <LegendItem
+                        v-for="(item, key) in data"
+                        :key="key"
+                        :color="item.color"
+                        :title="item.title"
+                        :percent="item.percent"
+                    />
+                </VList>
+            </VCol>
+        </VRow>
     </div>
 </template>
 
@@ -85,7 +91,7 @@
 .v-subheader {
     height: 20px;
 }
-/*.v-list {
-    width: max-content;
-}*/
+.v-list {
+    width: 100%;
+}
 </style>
\ No newline at end of file
diff --git a/frontend/src/store/modules/devices/actions.js b/frontend/src/store/modules/devices/actions.js
index d980a3c2..68034234 100644
--- a/frontend/src/store/modules/devices/actions.js
+++ b/frontend/src/store/modules/devices/actions.js
@@ -21,12 +21,14 @@ export default {
         context.dispatch(FETCH_WIDGET_INFO);
     },
 
-    [FETCH_WIDGET_INFO]: (context) => {
+    [FETCH_WIDGET_INFO]: (context, withOverlay=true) => {
         const period = getTimeByPeriod(context.state.selectedPeriod);
         const startDate = period.startDate;
         const endDate = period.endDate;
 
-        context.commit(SET_DATA_FETCHING);
+        if (withOverlay) {
+            context.commit(SET_DATA_FETCHING);
+        }
         return fetchDevicesAndSystemsData(startDate.unix(), endDate.unix())
             .then(response => {
                 context.commit(SET_WIDGET_DATA, response);

From cf2cc1c375148b46e1cecaf2bc7a6ba062cf6c0b Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Sun, 8 Sep 2019 23:42:43 +0300
Subject: [PATCH 070/183] add line chart in error page

---
 .../src/pages/speed_overview/ErrorReports.vue | 10 ++---
 .../src/store/modules/error_report/actions.js | 40 ++++++-------------
 .../src/store/modules/error_report/getters.js |  4 --
 .../store/modules/error_report/mutations.js   | 12 ------
 .../modules/error_report/types/actions.js     |  1 -
 .../modules/error_report/types/getters.js     |  2 -
 .../modules/error_report/types/mutations.js   |  4 --
 7 files changed, 17 insertions(+), 56 deletions(-)

diff --git a/frontend/src/pages/speed_overview/ErrorReports.vue b/frontend/src/pages/speed_overview/ErrorReports.vue
index 0f4c2978..371eec36 100644
--- a/frontend/src/pages/speed_overview/ErrorReports.vue
+++ b/frontend/src/pages/speed_overview/ErrorReports.vue
@@ -37,7 +37,6 @@
         GET_FORMAT_LINE_CHART_DATA
     } from "@/store/modules/error_report/types/getters";
     import {
-        CHANGE_FETCHED_BUTTON_STATE,
         CHANGE_SELECTED_PERIOD,
         FETCH_PAGE_DATA
     } from "@/store/modules/error_report/types/actions";
@@ -99,16 +98,15 @@
             this.fetchPageData();
         },
         methods: {
+            ...mapActions('error_report', {
+                changeSelectedPeriod: CHANGE_SELECTED_PERIOD,
+                fetchPageData: FETCH_PAGE_DATA
+            }),
             changeGroupedParameter (parameter) {
                 if (this.currentParameter !== parameter) {
                     this.currentParameter = parameter;
                 }
             },
-            ...mapActions('visitors', {
-                changeFetchingButtonState: CHANGE_FETCHED_BUTTON_STATE,
-                changeSelectedPeriod: CHANGE_SELECTED_PERIOD,
-                fetchPageData: FETCH_PAGE_DATA
-            }),
             changePeriod (data) {
                 this.changeSelectedPeriod(data);
             },
diff --git a/frontend/src/store/modules/error_report/actions.js b/frontend/src/store/modules/error_report/actions.js
index b3be0dfc..090f5ade 100644
--- a/frontend/src/store/modules/error_report/actions.js
+++ b/frontend/src/store/modules/error_report/actions.js
@@ -1,18 +1,14 @@
 import {
     CHANGE_SELECTED_PERIOD,
-    CHANGE_FETCHED_BUTTON_STATE,
     FETCH_PAGE_DATA,
     FETCH_CHART_DATA,
 } from "./types/actions";
 
-//import {getTimeByPeriod} from "@/services/periodService";
-
 import {
     SET_SELECTED_PERIOD,
-    RESET_BUTTON_FETCHING,
-    SET_BUTTON_FETCHING,
     SET_CHART_VALUES,
-    //RESET_CHART_FETCHING,
+    RESET_CHART_FETCHING,
+    SET_CHART_FETCHING
 } from "./types/mutations";
 
 export default {
@@ -20,23 +16,13 @@ export default {
         context.commit(SET_SELECTED_PERIOD, payload.value);
         context.dispatch(FETCH_PAGE_DATA);
     },
-    [CHANGE_FETCHED_BUTTON_STATE]: (context, data) => {
-
-        if (data.value) {
-            context.commit(SET_BUTTON_FETCHING, data.button);
-        } else {
-            context.commit(RESET_BUTTON_FETCHING, data.button);
-        }
-    },
     [FETCH_PAGE_DATA]: (context) => {
         context.dispatch(FETCH_CHART_DATA);
     },
 
     [FETCH_CHART_DATA]: (context) => {
-       // const time = getTimeByPeriod(context.state.selectedPeriod);
-       // context.commit(SET_CHART_FETCHING);
+        context.commit(SET_CHART_FETCHING);
 
-        console.log(context);
         const items = [
             {
                 date:'1565700000',
@@ -47,15 +33,15 @@ export default {
                 value:2,
             },
         ];
-        context.commit(SET_CHART_VALUES, items);
-        /*fetchChartValues(
-            time.startDate.unix(),
-            time.endDate.unix(),
-            time.interval
-        ).then(response => {
-                context.commit(SET_CHART_VALUES, response);
-                context.commit(RESET_CHART_FETCHING);
-            }
-        ).finally(() => context.commit(RESET_CHART_FETCHING));*/
+        new Promise((resolve) => {
+
+            resolve(items);
+
+        }).then(response => {
+
+            context.commit(SET_CHART_VALUES, response);
+            context.commit(RESET_CHART_FETCHING);
+
+        }).finally(() => context.commit(RESET_CHART_FETCHING));
     },
 };
diff --git a/frontend/src/store/modules/error_report/getters.js b/frontend/src/store/modules/error_report/getters.js
index 696b3b2a..4c5c6662 100644
--- a/frontend/src/store/modules/error_report/getters.js
+++ b/frontend/src/store/modules/error_report/getters.js
@@ -1,7 +1,5 @@
 import {
     GET_SELECTED_PERIOD,
-    GET_BUTTON_DATA,
-    GET_ACTIVE_BUTTON,
     GET_LINE_CHART_DATA,
     GET_FORMAT_LINE_CHART_DATA,
 } from "./types/getters";
@@ -10,8 +8,6 @@ import { chartDataTransformer } from "@/api/widgets/transformers";
 
 export default {
     [GET_SELECTED_PERIOD]: (state) => state.selectedPeriod,
-    [GET_BUTTON_DATA]: (state) => state.buttonData,
-    [GET_ACTIVE_BUTTON]: (state) => state.activeButton,
     [GET_LINE_CHART_DATA]: (state) => state.chartData,
     [GET_FORMAT_LINE_CHART_DATA]: (state) => {
         return chartDataTransformer(state.chartData.items, state.selectedPeriod);
diff --git a/frontend/src/store/modules/error_report/mutations.js b/frontend/src/store/modules/error_report/mutations.js
index 39e99396..1c12694f 100644
--- a/frontend/src/store/modules/error_report/mutations.js
+++ b/frontend/src/store/modules/error_report/mutations.js
@@ -1,8 +1,5 @@
 import {
     SET_SELECTED_PERIOD,
-    SET_BUTTON_FETCHING,
-    RESET_BUTTON_FETCHING,
-    SET_BUTTON_VALUE,
     SET_CHART_VALUES,
     SET_CHART_FETCHING,
     RESET_CHART_FETCHING,
@@ -12,15 +9,6 @@ export default {
     [SET_SELECTED_PERIOD]: (state, period) => {
         state.selectedPeriod = period;
     },
-    [SET_BUTTON_FETCHING]: (state, button) => {
-        state.buttonData[button].isFetching = true;
-    },
-    [RESET_BUTTON_FETCHING]: (state, button) => {
-        state.buttonData[button].isFetching = false;
-    },
-    [SET_BUTTON_VALUE]: (state, payload) => {
-        state.buttonData[payload.buttonType].value = payload.value;
-    },
     [SET_CHART_VALUES]: (state, items) => {
         state.chartData.items = items;
     },
diff --git a/frontend/src/store/modules/error_report/types/actions.js b/frontend/src/store/modules/error_report/types/actions.js
index dd09f0c7..2401fc29 100644
--- a/frontend/src/store/modules/error_report/types/actions.js
+++ b/frontend/src/store/modules/error_report/types/actions.js
@@ -1,4 +1,3 @@
 export const CHANGE_SELECTED_PERIOD = 'changeSelectedPeriod';
-export const CHANGE_FETCHED_BUTTON_STATE = 'changeFetchedButtonState';
 export const FETCH_PAGE_DATA = 'fetchPageData';
 export const FETCH_CHART_DATA = 'fetchChartData';
diff --git a/frontend/src/store/modules/error_report/types/getters.js b/frontend/src/store/modules/error_report/types/getters.js
index efec3001..b832b842 100644
--- a/frontend/src/store/modules/error_report/types/getters.js
+++ b/frontend/src/store/modules/error_report/types/getters.js
@@ -1,5 +1,3 @@
 export const GET_SELECTED_PERIOD = 'getSelectedPeriod';
-export const GET_BUTTON_DATA = 'getButtonData';
-export const GET_ACTIVE_BUTTON = 'getActiveButton';
 export const GET_LINE_CHART_DATA = 'getLineChartData';
 export const GET_FORMAT_LINE_CHART_DATA = 'getFormatLineChartData';
diff --git a/frontend/src/store/modules/error_report/types/mutations.js b/frontend/src/store/modules/error_report/types/mutations.js
index efe7b5df..8b6fcc2a 100644
--- a/frontend/src/store/modules/error_report/types/mutations.js
+++ b/frontend/src/store/modules/error_report/types/mutations.js
@@ -1,8 +1,4 @@
 export const SET_SELECTED_PERIOD = 'SET_SELECTED_PERIOD';
-export const SET_ACTIVE_BUTTON = 'SET_ACTIVE_BUTTON';
-export const RESET_BUTTON_FETCHING = 'RESET_BUTTON_FETCHING';
-export const SET_BUTTON_FETCHING = 'SET_BUTTON_FETCHING';
-export const SET_BUTTON_VALUE = 'SET_BUTTON_VALUE';
 export const SET_CHART_VALUES = 'SET_CHART_VALUES';
 export const RESET_CHART_FETCHING = 'RESET_CHART_FETCHING';
 export const SET_CHART_FETCHING = 'SET_CHART_FETCHING';

From 34392d2625f353b16af4c468ab677d8ed26f01b8 Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Mon, 9 Sep 2019 00:25:21 +0300
Subject: [PATCH 071/183] add endpoint to get errors grouped by page

---
 .../ErrorReport/GetErrorTableItemsAction.php  | 37 ++++++++
 .../ErrorReport/GetErrorTableItemsRequest.php | 20 +++++
 .../GetErrorTableItemsResponse.php            | 22 +++++
 .../ErrorReport/TableErrorReport.php          | 42 +++++++++
 backend/app/Entities/Error.php                |  9 ++
 backend/app/Entities/Page.php                 |  5 ++
 .../Controllers/Api/ErrorReportController.php | 35 ++++++++
 .../GetErrorTableItemsHttpRequest.php         | 51 +++++++++++
 .../app/Http/Resources/ErrorTableResource.php | 41 +++++++++
 .../ErrorReport/ErrorReportRepository.php     |  4 +
 .../EloquentErrorReportRepository.php         | 29 ++++++
 .../EloquentTableVisitorsRepository.php       |  1 -
 backend/app/Rules/ErrorTableParameter.php     | 26 ++++++
 backend/routes/api.php                        |  6 ++
 backend/tests/Feature/TableErrorTest.php      | 90 +++++++++++++++++++
 backend/tests/TestDataFactory.php             | 66 ++++++++++++++
 16 files changed, 483 insertions(+), 1 deletion(-)
 create mode 100644 backend/app/Actions/ErrorReport/GetErrorTableItemsAction.php
 create mode 100644 backend/app/Actions/ErrorReport/GetErrorTableItemsRequest.php
 create mode 100644 backend/app/Actions/ErrorReport/GetErrorTableItemsResponse.php
 create mode 100644 backend/app/DataTransformer/ErrorReport/TableErrorReport.php
 create mode 100644 backend/app/Http/Controllers/Api/ErrorReportController.php
 create mode 100644 backend/app/Http/Requests/ErrorReport/GetErrorTableItemsHttpRequest.php
 create mode 100644 backend/app/Http/Resources/ErrorTableResource.php
 create mode 100644 backend/app/Rules/ErrorTableParameter.php
 create mode 100644 backend/tests/Feature/TableErrorTest.php

diff --git a/backend/app/Actions/ErrorReport/GetErrorTableItemsAction.php b/backend/app/Actions/ErrorReport/GetErrorTableItemsAction.php
new file mode 100644
index 00000000..2c7779de
--- /dev/null
+++ b/backend/app/Actions/ErrorReport/GetErrorTableItemsAction.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\ErrorReport;
+
+use App\Repositories\Contracts\ErrorReport\ErrorReportRepository;
+use Illuminate\Support\Facades\Auth;
+
+class GetErrorTableItemsAction
+{
+    const COUNTRY = 'country';
+    const BROWSER = 'browser';
+    const PAGE = 'page';
+
+    private $repository;
+
+    public function __construct(ErrorReportRepository $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    public function execute(GetErrorTableItemsRequest $request): GetErrorTableItemsResponse
+    {
+        $period = $request->period();
+        $parameter = $request->parameter();
+        $website_id = Auth::user()->website->id;
+
+        switch ($parameter) {
+            case self::PAGE:
+                $errors = $this->repository->getErrorItemsGroupByPage($website_id, $period);
+                break;
+        }
+
+        return new GetErrorTableItemsResponse($errors);
+    }
+}
diff --git a/backend/app/Actions/ErrorReport/GetErrorTableItemsRequest.php b/backend/app/Actions/ErrorReport/GetErrorTableItemsRequest.php
new file mode 100644
index 00000000..361d11e8
--- /dev/null
+++ b/backend/app/Actions/ErrorReport/GetErrorTableItemsRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\ErrorReport;
+
+use App\Http\Requests\ErrorReport\GetErrorTableItemsHttpRequest;
+use App\Actions\TableDataRequest;
+
+class GetErrorTableItemsRequest extends TableDataRequest
+{
+    public static function fromRequest(GetErrorTableItemsHttpRequest $request)
+    {
+        return new static (
+            $request->startDate(),
+            $request->endDate(),
+            $request->parameter()
+        );
+    }
+}
diff --git a/backend/app/Actions/ErrorReport/GetErrorTableItemsResponse.php b/backend/app/Actions/ErrorReport/GetErrorTableItemsResponse.php
new file mode 100644
index 00000000..5e94d6f2
--- /dev/null
+++ b/backend/app/Actions/ErrorReport/GetErrorTableItemsResponse.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\ErrorReport;
+
+use Illuminate\Support\Collection;
+
+class GetErrorTableItemsResponse
+{
+    private $errors;
+
+    public function __construct(Collection $errors)
+    {
+        $this->errors = $errors;
+    }
+
+    public function getGroupedErrors(): Collection
+    {
+        return $this->errors;
+    }
+}
diff --git a/backend/app/DataTransformer/ErrorReport/TableErrorReport.php b/backend/app/DataTransformer/ErrorReport/TableErrorReport.php
new file mode 100644
index 00000000..cd1c37b2
--- /dev/null
+++ b/backend/app/DataTransformer/ErrorReport/TableErrorReport.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\DataTransformer\ErrorReport;
+
+use App\DataTransformer\Traits\TableValueTrait;
+
+final class TableErrorReport
+{
+    use TableValueTrait;
+
+    private $parameter;
+    private $parameterValue;
+    private $total;
+    private $message;
+    private $stackTrace;
+
+    public function __construct(
+        string $parameter,
+        string $parameterValue,
+        string $total,
+        string $message,
+        string $stackTrace
+    ) {
+        $this->parameter = $parameter;
+        $this->parameterValue = $parameterValue;
+        $this->total = $total;
+        $this->message = $message;
+        $this->stackTrace = $stackTrace;
+    }
+
+    public function message(): string
+    {
+        return $this->message;
+    }
+
+    public function stackTrace(): string
+    {
+        return $this->stackTrace;
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Entities/Error.php b/backend/app/Entities/Error.php
index 606dce58..c3cf0c75 100644
--- a/backend/app/Entities/Error.php
+++ b/backend/app/Entities/Error.php
@@ -6,6 +6,8 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Builder;
+use App\Utils\DatePeriod;
 
 final class Error extends Model
 {
@@ -25,4 +27,11 @@ public function page(): BelongsTo
     {
         return $this->belongsTo(Page::class, 'page_id');
     }
+
+    public function scopeForWebsite(Builder $query, int $websiteId): Builder
+    {
+        return $query->whereHas('page', function(Builder $query) use ($websiteId) {
+            $query->where('website_id', $websiteId);
+        });
+    }
 }
diff --git a/backend/app/Entities/Page.php b/backend/app/Entities/Page.php
index 6e02f151..9e70c6e7 100644
--- a/backend/app/Entities/Page.php
+++ b/backend/app/Entities/Page.php
@@ -41,4 +41,9 @@ public function sessions(): HasMany
     {
         return $this->hasMany(Session::class, 'entrance_page_id');
     }
+
+    public function errors(): HasMany
+    {
+        return $this->hasMany(Error::class);
+    }
 }
diff --git a/backend/app/Http/Controllers/Api/ErrorReportController.php b/backend/app/Http/Controllers/Api/ErrorReportController.php
new file mode 100644
index 00000000..7e8bcd64
--- /dev/null
+++ b/backend/app/Http/Controllers/Api/ErrorReportController.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Actions\ErrorReport\GetErrorTableItemsAction;
+use App\Http\Requests\ErrorReport\GetErrorTableItemsHttpRequest;
+use App\Http\Resources\ErrorTableResource;
+use App\Http\Response\ApiResponse;
+use App\Actions\ErrorReport\GetErrorTableItemsRequest;
+
+
+final class ErrorReportController extends Controller
+{
+    private $getErrorTableItemsAction;
+
+    public function __construct(
+        GetErrorTableItemsAction $getErrorTableItemsAction
+    ) {
+        $this->getErrorTableItemsAction = $getErrorTableItemsAction;
+    }
+
+    public function getErrorItemsByParameter(GetErrorTableItemsHttpRequest $request)
+    {
+        $response = $this->getErrorTableItemsAction->execute(
+            GetErrorTableItemsRequest::fromRequest($request)
+        );
+
+        return ApiResponse::success(
+            new ErrorTableResource(
+                $response->getGroupedErrors()
+            )
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Http/Requests/ErrorReport/GetErrorTableItemsHttpRequest.php b/backend/app/Http/Requests/ErrorReport/GetErrorTableItemsHttpRequest.php
new file mode 100644
index 00000000..6c2bf21f
--- /dev/null
+++ b/backend/app/Http/Requests/ErrorReport/GetErrorTableItemsHttpRequest.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\ErrorReport;
+
+use App\Http\Request\ApiFormRequest;
+use App\Rules\ErrorTableParameter;
+use App\Rules\Timestamp;
+use App\Rules\TimestampAfter;
+
+final class GetErrorTableItemsHttpRequest extends ApiFormRequest
+{
+    const START_DATE = 'startDate';
+    const END_DATE = 'endDate';
+    const PARAMETER = 'parameter';
+    const FILTER = 'filter';
+
+    public function rules()
+    {
+        return [
+            'filter' => 'required|array',
+            'filter.startDate' => [
+                'required',
+                new Timestamp()
+            ],
+            'filter.endDate' => [
+                'required',
+                new Timestamp(),
+                new TimestampAfter($this->get(self::FILTER)[self::START_DATE])
+            ],
+            'filter.parameter' => [
+                'required',
+                new ErrorTableParameter()
+            ],
+        ];
+    }
+    public function startDate(): string
+    {
+        return $this->get(self::FILTER)[self::START_DATE];
+    }
+    public function endDate(): string
+    {
+        return $this->get(self::FILTER)[self::END_DATE];
+    }
+
+    public function parameter(): string
+    {
+        return $this->get(self::FILTER)[self::PARAMETER];
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Http/Resources/ErrorTableResource.php b/backend/app/Http/Resources/ErrorTableResource.php
new file mode 100644
index 00000000..c74ac559
--- /dev/null
+++ b/backend/app/Http/Resources/ErrorTableResource.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources;
+
+use App\Contracts\ApiResponse;
+use App\DataTransformer\ErrorReport\TableErrorReport;
+use Illuminate\Http\Resources\Json\ResourceCollection;
+use Illuminate\Support\Collection;
+
+
+final class ErrorTableResource extends ResourceCollection implements ApiResponse
+{
+    public function toArray($request): array
+    {
+        return $this->presentCollection($this->collection);
+    }
+
+    public function present(TableErrorReport $table): array
+    {
+        return [
+            'parameter' => $table->parameter(),
+            'parameter_value' => $table->parameterValue(),
+            'count' => $table->total(),
+            'message' => $table->message(),
+            'stack_trace' => $table->stackTrace(),
+        ];
+    }
+
+    public function presentCollection(Collection $collection): array
+    {
+        return $collection
+            ->map(
+                function (TableErrorReport $table) {
+                    return $this->present($table);
+                }
+            )
+            ->all();
+    }
+}
\ No newline at end of file
diff --git a/backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php b/backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php
index d6fcef6d..3c0f87a7 100644
--- a/backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php
+++ b/backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php
@@ -3,8 +3,12 @@
 namespace App\Repositories\Contracts\ErrorReport;
 
 use App\Entities\Error;
+use Illuminate\Support\Collection;
+use App\Utils\DatePeriod;
 
 interface ErrorReportRepository
 {
     public function save(Error $visitor): Error;
+
+    public function getErrorItemsGroupByPage (int $websiteId, DatePeriod $datePeriod): Collection;
 }
diff --git a/backend/app/Repositories/EloquentErrorReportRepository.php b/backend/app/Repositories/EloquentErrorReportRepository.php
index 2e556902..7cb6ecc5 100644
--- a/backend/app/Repositories/EloquentErrorReportRepository.php
+++ b/backend/app/Repositories/EloquentErrorReportRepository.php
@@ -4,8 +4,12 @@
 
 namespace App\Repositories;
 
+use App\DataTransformer\ErrorReport\TableErrorReport;
 use App\Entities\Error;
 use App\Repositories\Contracts\ErrorReport\ErrorReportRepository;
+use Illuminate\Support\Collection;
+use App\Utils\DatePeriod;
+use Illuminate\Support\Facades\DB;
 
 final class EloquentErrorReportRepository implements ErrorReportRepository
 {
@@ -14,4 +18,29 @@ public function save(Error $error): Error
         $error->save();
         return $error;
     }
+
+    public function getErrorItemsGroupByPage(int $websiteId, DatePeriod $datePeriod): Collection
+    {
+        $errors = Error::ForWebsite($websiteId)
+            ->join('pages', 'pages.id', '=', 'errors.page_id')
+            ->select(DB::raw('pages.url as parameter_value, errors.message, errors.stack_trace, count(errors.id) as count_errors'))
+            ->whereBetween('errors.created_at', [$datePeriod->getStartDate(), $datePeriod->getEndDate()])
+            ->groupBy(['pages.id', 'errors.message', 'errors.stack_trace'])
+            ->get();
+
+        return $this->mapToTableValues($errors, 'page');
+    }
+
+    private function mapToTableValues(Collection $errors, string $parameter)
+    {
+        return $errors->map(function($item) use ($parameter) {
+            return new TableErrorReport(
+                $parameter,
+                $item->parameter_value,
+                strval($item->count_errors),
+                $item->message,
+                $item->stack_trace
+            );
+        });
+    }
 }
diff --git a/backend/app/Repositories/EloquentTableVisitorsRepository.php b/backend/app/Repositories/EloquentTableVisitorsRepository.php
index eca3d7f6..98f943df 100644
--- a/backend/app/Repositories/EloquentTableVisitorsRepository.php
+++ b/backend/app/Repositories/EloquentTableVisitorsRepository.php
@@ -6,7 +6,6 @@
 
 use App\Repositories\Contracts\TableVisitorsRepository;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use App\DataTransformer\TableValue;
 use App\Entities\Visitor;
diff --git a/backend/app/Rules/ErrorTableParameter.php b/backend/app/Rules/ErrorTableParameter.php
new file mode 100644
index 00000000..6d4d3efe
--- /dev/null
+++ b/backend/app/Rules/ErrorTableParameter.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Rules;
+
+use Illuminate\Contracts\Validation\Rule;
+
+final class ErrorTableParameter implements Rule
+{
+    private const AVAILABLE_PARAMETERS = [
+        'country',
+        'page',
+        'browser',
+    ];
+
+    public function passes($attribute, $value): bool
+    {
+        return in_array($value, self::AVAILABLE_PARAMETERS);
+    }
+
+    public function message(): string
+    {
+        return 'The :attribute must be one of available parameters.';
+    }
+}
\ No newline at end of file
diff --git a/backend/routes/api.php b/backend/routes/api.php
index 0a3a287e..b70f3eba 100644
--- a/backend/routes/api.php
+++ b/backend/routes/api.php
@@ -150,6 +150,12 @@
         Route::get('/geo-location-items', 'GeoLocationController');
 
         Route::get('/table-page-views', 'VisitController@getPageViewsItems');
+
+        Route::group([
+            'prefix' => 'errors'
+        ], function () {
+            Route::get('/table-items', 'ErrorReportController@getErrorItemsByParameter');
+        });
     });
 
     Route::group([
diff --git a/backend/tests/Feature/TableErrorTest.php b/backend/tests/Feature/TableErrorTest.php
new file mode 100644
index 00000000..1c6de193
--- /dev/null
+++ b/backend/tests/Feature/TableErrorTest.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Tests\Feature;
+
+use Tests\TestCase;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestDataFactory;
+use Carbon\Carbon;
+
+
+class TableErrorTest extends TestCase
+{
+    use RefreshDatabase;
+
+    const DATE_FROM = '2019-08-20 00:00:00';
+    const DATE_TO = '2019-08-24 23:59:59';
+    const ENDPOINT = 'api/v1/errors/table-items';
+    const PARAMETERS = [
+        'page',
+    ];
+    const RESPONSE_STRUCTURE = [
+        'data' => [
+            '*' => [
+                'parameter',
+                'parameter_value',
+                'count',
+                'message',
+                'stack_trace'
+            ]
+        ],
+        'meta' => []
+    ];
+
+    private $user;
+    private $fromTimeStamp;
+    private $toTimeStamp;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->user = TestDataFactory::createUser();
+        $this->fromTimeStamp = (new Carbon(self::DATE_FROM))->timestamp;
+        $this->toTimeStamp = (new Carbon(self::DATE_TO))->timestamp;
+        TestDataFactory::createErrorsBetweenDates($this->user, self::DATE_FROM, self::DATE_TO);
+    }
+    public function testGetErrorsByParameterAction()
+    {
+        foreach (self::PARAMETERS as $parameter) {
+            $query = [
+                'filter' => [
+                    'startDate' => self::DATE_FROM,
+                    'endDate' => self::DATE_TO,
+                    'parameter' => $parameter
+                ]
+            ];
+
+            $result = $this->actingAs($this->user)
+                ->json('GET', self::ENDPOINT, $query)
+                ->assertStatus(200)
+                ->assertJsonStructure(self::RESPONSE_STRUCTURE)
+                ->assertJsonCount($this->getAssertedCount($parameter), 'data')
+                ->json();
+
+            $this->assertNotEmpty($result);
+        }
+    }
+
+    public function testFailedGetErrorsByParameterAction()
+    {
+        $query = [
+            'filter' => [
+                'startDate' => self::DATE_FROM,
+                'endDate' => self::DATE_TO,
+                'parameter' => 'wrong_parameter'
+            ],
+        ];
+
+        $result = $this->actingAs($this->user)
+            ->json('GET', self::ENDPOINT, $query)
+            ->assertStatus(400)
+            ->assertJsonStructure([
+                'error' => [
+                    'message'
+                ]
+            ])
+            ->json();
+        $this->assertEquals('The filter.parameter must be one of available parameters.', $result['error']['message']);
+    }
+}
diff --git a/backend/tests/TestDataFactory.php b/backend/tests/TestDataFactory.php
index 310620f3..071d1fe7 100644
--- a/backend/tests/TestDataFactory.php
+++ b/backend/tests/TestDataFactory.php
@@ -2,6 +2,7 @@
 
 namespace Tests;
 
+use App\Entities\Error;
 use App\Entities\User;
 use App\Entities\Visit;
 use App\Entities\Website;
@@ -31,6 +32,12 @@ class TestDataFactory
         ]
     ];
 
+    const PAGES = [
+        '/home',
+        '/contacts',
+        '/about'
+    ];
+
     public static function createUser(): User
     {
         return factory(User::class)->create();
@@ -140,4 +147,63 @@ public static function systemsData(): array
             ]
         ];
     }
+
+    public static function createErrorsBetweenDates(User $user, String $from, String $to): void
+    {
+        $website = factory(Website::class)->create(['user_id' => $user->id]);
+        foreach (self::PAGES as $page_url) {
+            $pages[] = factory(Page::class)->create(
+                [
+                    'website_id' => $website->id,
+                    'url' => $page_url
+                ]
+            );
+        }
+        factory(Visitor::class, 15)->create();
+
+        foreach (self::GEO_POSITIONS as $country_name => $cities) {
+            foreach ($cities as $city_name) {
+                $geo_positions[] = factory(GeoPosition::class)->create(
+                    [
+                        'country' => $country_name,
+                        'city' => $city_name
+                    ]
+                );
+            }
+        }
+        foreach (self::systemsData() as $systemsDatum) {
+            $systems[] = factory(System::class)->create(
+                $systemsDatum
+            );
+        }
+
+
+        foreach ($systems as $system) {
+            $sessions[] = factory(Session::class)->create(
+                [
+                    'system_id' => $system->id,
+                    'start_session' => new \DateTime('@' . rand($from, $to))
+                ]
+            );
+        }
+        foreach ($geo_positions as $geo_position) {
+            foreach ($sessions as $session) {
+                factory(Visit::class)->create(
+                    [
+                        'geo_position_id' => $geo_position->id,
+                        'session_id' => $session->id,
+                        'visit_time' => new \DateTime('@' . rand($from, $to))
+                    ]
+                );
+            }
+        }
+        for ($i = 0; $i < 5; $i++) {
+            $visit = $user->website->visits->random();
+            factory(Error::class, 5)->create([
+                'visitor_id' => $visit->visitor->id,
+                'page_id' => $visit->page->id
+            ]);
+        }
+
+    }
 }
\ No newline at end of file

From 716cdb40925a7117619253a600599952b12f66b6 Mon Sep 17 00:00:00 2001
From: LymarMaryna <marina.web.php@gmail.com>
Date: Sun, 8 Sep 2019 21:29:05 +0000
Subject: [PATCH 072/183] Apply fixes from StyleCI

---
 backend/app/Http/Controllers/Api/ErrorReportController.php | 1 -
 backend/app/Http/Resources/ErrorTableResource.php          | 1 -
 backend/tests/Feature/TableErrorTest.php                   | 1 -
 backend/tests/TestDataFactory.php                          | 1 -
 4 files changed, 4 deletions(-)

diff --git a/backend/app/Http/Controllers/Api/ErrorReportController.php b/backend/app/Http/Controllers/Api/ErrorReportController.php
index 7e8bcd64..a4e429b3 100644
--- a/backend/app/Http/Controllers/Api/ErrorReportController.php
+++ b/backend/app/Http/Controllers/Api/ErrorReportController.php
@@ -9,7 +9,6 @@
 use App\Http\Response\ApiResponse;
 use App\Actions\ErrorReport\GetErrorTableItemsRequest;
 
-
 final class ErrorReportController extends Controller
 {
     private $getErrorTableItemsAction;
diff --git a/backend/app/Http/Resources/ErrorTableResource.php b/backend/app/Http/Resources/ErrorTableResource.php
index c74ac559..0f50be22 100644
--- a/backend/app/Http/Resources/ErrorTableResource.php
+++ b/backend/app/Http/Resources/ErrorTableResource.php
@@ -9,7 +9,6 @@
 use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Collection;
 
-
 final class ErrorTableResource extends ResourceCollection implements ApiResponse
 {
     public function toArray($request): array
diff --git a/backend/tests/Feature/TableErrorTest.php b/backend/tests/Feature/TableErrorTest.php
index 1c6de193..81f57e7b 100644
--- a/backend/tests/Feature/TableErrorTest.php
+++ b/backend/tests/Feature/TableErrorTest.php
@@ -8,7 +8,6 @@
 use Tests\TestDataFactory;
 use Carbon\Carbon;
 
-
 class TableErrorTest extends TestCase
 {
     use RefreshDatabase;
diff --git a/backend/tests/TestDataFactory.php b/backend/tests/TestDataFactory.php
index 071d1fe7..dc2de3fc 100644
--- a/backend/tests/TestDataFactory.php
+++ b/backend/tests/TestDataFactory.php
@@ -204,6 +204,5 @@ public static function createErrorsBetweenDates(User $user, String $from, String
                 'page_id' => $visit->page->id
             ]);
         }
-
     }
 }
\ No newline at end of file

From 206569befa3e9e0ef82039d0e461df6c660c6289 Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Mon, 9 Sep 2019 01:07:28 +0300
Subject: [PATCH 073/183] fix some mistakes in test

---
 backend/tests/Feature/TableErrorTest.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/backend/tests/Feature/TableErrorTest.php b/backend/tests/Feature/TableErrorTest.php
index 1c6de193..51ccd11e 100644
--- a/backend/tests/Feature/TableErrorTest.php
+++ b/backend/tests/Feature/TableErrorTest.php
@@ -42,15 +42,15 @@ public function setUp(): void
         $this->user = TestDataFactory::createUser();
         $this->fromTimeStamp = (new Carbon(self::DATE_FROM))->timestamp;
         $this->toTimeStamp = (new Carbon(self::DATE_TO))->timestamp;
-        TestDataFactory::createErrorsBetweenDates($this->user, self::DATE_FROM, self::DATE_TO);
+        TestDataFactory::createErrorsBetweenDates($this->user, (string) $this->fromTimeStamp, (string) $this->toTimeStamp);
     }
     public function testGetErrorsByParameterAction()
     {
         foreach (self::PARAMETERS as $parameter) {
             $query = [
                 'filter' => [
-                    'startDate' => self::DATE_FROM,
-                    'endDate' => self::DATE_TO,
+                    'startDate' => (string) $this->fromTimeStamp,
+                    'endDate' => (string) $this->toTimeStamp,
                     'parameter' => $parameter
                 ]
             ];
@@ -59,7 +59,6 @@ public function testGetErrorsByParameterAction()
                 ->json('GET', self::ENDPOINT, $query)
                 ->assertStatus(200)
                 ->assertJsonStructure(self::RESPONSE_STRUCTURE)
-                ->assertJsonCount($this->getAssertedCount($parameter), 'data')
                 ->json();
 
             $this->assertNotEmpty($result);
@@ -70,8 +69,8 @@ public function testFailedGetErrorsByParameterAction()
     {
         $query = [
             'filter' => [
-                'startDate' => self::DATE_FROM,
-                'endDate' => self::DATE_TO,
+                'startDate' => (string) $this->fromTimeStamp,
+                'endDate' => (string) $this->toTimeStamp,
                 'parameter' => 'wrong_parameter'
             ],
         ];

From 0321124ac41d6bf75a1ca9a7aeda043234b60a3d Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Mon, 9 Sep 2019 01:25:02 +0300
Subject: [PATCH 074/183] fix codasy review

---
 backend/tests/TestDataFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/tests/TestDataFactory.php b/backend/tests/TestDataFactory.php
index dc2de3fc..5df20e7f 100644
--- a/backend/tests/TestDataFactory.php
+++ b/backend/tests/TestDataFactory.php
@@ -152,7 +152,7 @@ public static function createErrorsBetweenDates(User $user, String $from, String
     {
         $website = factory(Website::class)->create(['user_id' => $user->id]);
         foreach (self::PAGES as $page_url) {
-            $pages[] = factory(Page::class)->create(
+            factory(Page::class)->create(
                 [
                     'website_id' => $website->id,
                     'url' => $page_url

From cd8863cb358eb1decb9752bcb6de83c5766546fb Mon Sep 17 00:00:00 2001
From: Volodymyr <tumko.volodymyr@gmail.com>
Date: Mon, 9 Sep 2019 01:34:55 +0300
Subject: [PATCH 075/183] fix avg time on site for page views

---
 frontend/src/api/page_views/averageTimeService.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/api/page_views/averageTimeService.js b/frontend/src/api/page_views/averageTimeService.js
index ab9baeda..0a44064a 100644
--- a/frontend/src/api/page_views/averageTimeService.js
+++ b/frontend/src/api/page_views/averageTimeService.js
@@ -1,6 +1,6 @@
 import config from "@/config";
 import requestService from "../../services/requestService";
-import {buttonTransformerToTime,chartTransformer} from "../transformers";
+import {buttonTransformerToTime, chartTransformerToInt} from "../transformers";
 import _ from "lodash";
 
 const resourceUrl = config.getApiUrl();
@@ -26,7 +26,7 @@ const fetchChartValues = (startDate, endDate, interval) => {
         'filter[startDate]': startDate,
         'filter[endDate]': endDate,
         'filter[period]': interval
-    }).then(response => response.data.map(chartTransformer))
+    }).then(response => response.data.map(chartTransformerToInt))
         .catch(error => Promise.reject(
             new Error(
                 _.get(

From 0e22ca4c284dc3ba0ee1bbfe43b6f6ed86d78280 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Mon, 9 Sep 2019 02:21:18 +0300
Subject: [PATCH 076/183] add integer type to create_screen_visitors_flow_index

---
 .../VisitorsFlow/GetVisitorsFlowAction.php    |  7 ++
 .../Contracts/VisitorFlowScreenRepository.php |  6 ++
 ...asticsearchVisitorFlowDeviceRepository.php |  3 +-
 ...asticsearchVisitorFlowScreenRepository.php | 66 +++++++++++++++++++
 ...3634_create_screen_visitors_flow_index.php |  7 +-
 5 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
index 45e4e88d..77beeb91 100644
--- a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
+++ b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
@@ -61,6 +61,13 @@ public function execute(GetVisitorsFlowRequest $request): GetVisitorFlowResponse
                 return new GetVisitorFlowResponse($devicesFlow->getCollection(), $devicesViews->getCollection());
                 break;
             case 'screen':
+                if ($request->getLevel() > 2) {
+                    $screensFlow = $this->visitorsFlowScreenRepository->getFlow($websiteId, $request->getLevel());
+                    return new GetVisitorFlowResponse($screensFlow->getCollection());
+                }
+                $screensViews = $this->visitorsFlowScreenRepository->getViewsByEachDevice($request->getParameter(), $websiteId);
+                $screensFlow = $this->visitorsFlowDeviceRepository->getFlow($websiteId, $request->getLevel());
+                return new GetVisitorFlowResponse($screensFlow->getCollection(), $screensViews->getCollection());
                 break;
         }
     }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php
index f0ea29da..15036525 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php
@@ -5,6 +5,8 @@
 
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\ScreenAggregate;
+use App\DataTransformer\VisitorsFlow\ParameterFlowCollection;
+use App\DataTransformer\VisitorsFlow\ParametersCollection;
 
 interface VisitorFlowScreenRepository extends VisitorFlowRepository
 {
@@ -13,4 +15,8 @@ public function save(Aggregate $browserAggregate): Aggregate;
     public function update(Aggregate $browserAggregate): Aggregate;
 
     public function getByCriteria(Criteria $criteria): ?ScreenAggregate;
+
+    public function getFlow(int $websiteId, int $level): ParameterFlowCollection;
+
+    public function getViewsByEachScreen(string $type, int $websiteId): ParametersCollection;
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
index 45fc1cd9..f49a3d03 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
@@ -1,9 +1,8 @@
 <?php
-
+declare(strict_types=1);
 
 namespace App\Repositories\Elasticsearch\VisitorsFlow;
 
-
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\DeviceAggregate;
 use App\DataTransformer\VisitorsFlow\ParameterFlowCollection;
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
index 3e9a1072..3e92e659 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
@@ -6,6 +6,8 @@
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\BrowserAggregate;
 use App\Aggregates\VisitorsFlow\ScreenAggregate;
+use App\DataTransformer\VisitorsFlow\ParameterFlowCollection;
+use App\DataTransformer\VisitorsFlow\ParametersCollection;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowScreenRepository;
 use Cviebrock\LaravelElasticsearch\Manager as ElasticsearchManager;
@@ -76,4 +78,68 @@ public function getByCriteria(Criteria $criteria): ?ScreenAggregate
         }
         return ScreenAggregate::fromResult($result['hits']['hits'][0]['_source']);
     }
+    public function getViewsByEachScreen(string $type, int $websiteId): ParametersCollection
+    {
+        $params = [
+            'index' => self::INDEX_NAME,
+            'body' => [
+                'query' => [
+                    'bool' => [
+                        'must' => [
+                            ['match' => ['website_id' => $websiteId]],
+                        ]
+                    ]
+                ],
+                'aggregations' => [
+                    'devices' => [
+                        'terms' => [
+                            'field' => $type
+                        ],
+                        'aggregations' => [
+                            'views' => [
+                                'sum' => [
+                                    'field' => 'views'
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+
+        ];
+        $result = $this->client->search($params);
+        return new ParametersCollection($result['aggregations']['devices']['buckets']);
+    }
+
+    public function getFlow(int $websiteId, int $level): ParameterFlowCollection
+    {
+        $params = [
+            'index' => self::INDEX_NAME,
+            'body' => [
+                'query' => [
+                    'bool' => [
+                        'must' => [
+                            ['match' => ['website_id' => $websiteId]],
+                        ],
+                        'filter' => [
+                            $level > 2 ? ['term' => ['level' => $level]] : [
+                                'range' => [
+                                    "level" => [
+                                        'gte' => 1,
+                                        'lte' => 2
+                                    ]
+                                ]
+                            ],
+                        ]
+                    ]
+                ],
+                'sort' => [
+                    'level' => 'asc',
+                    'views' => 'desc'
+                ]
+            ]
+        ];
+        $result = $this->client->search($params);
+        return new ParameterFlowCollection($result['hits']['hits']);
+    }
 }
diff --git a/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php
index a5d736e3..b7736db9 100644
--- a/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php
@@ -19,8 +19,11 @@ public function up()
             'body' => [
                 'mappings' => [
                     "properties" => [
-                        "screen" => [
-                            "type" => "keyword"
+                        "resolution_width" => [
+                            "type" => "integer"
+                        ],
+                        "resolution_height" => [
+                            "type" => "integer"
                         ]
                     ]
                 ]

From dfba7df378a58453b1d7b47d7b19f95e46e2a632 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Mon, 9 Sep 2019 02:32:28 +0300
Subject: [PATCH 077/183] implement getViewsByEachScreen method

---
 .../Actions/VisitorsFlow/GetVisitorsFlowAction.php   |  5 ++---
 .../Contracts/VisitorFlowScreenRepository.php        |  2 +-
 .../ElasticsearchVisitorFlowScreenRepository.php     | 12 ++++++------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
index 77beeb91..36b4fc9e 100644
--- a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
+++ b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
@@ -3,7 +3,6 @@
 
 namespace App\Actions\VisitorsFlow;
 
-
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowDeviceRepository;
@@ -65,8 +64,8 @@ public function execute(GetVisitorsFlowRequest $request): GetVisitorFlowResponse
                     $screensFlow = $this->visitorsFlowScreenRepository->getFlow($websiteId, $request->getLevel());
                     return new GetVisitorFlowResponse($screensFlow->getCollection());
                 }
-                $screensViews = $this->visitorsFlowScreenRepository->getViewsByEachDevice($request->getParameter(), $websiteId);
-                $screensFlow = $this->visitorsFlowDeviceRepository->getFlow($websiteId, $request->getLevel());
+                $screensViews = $this->visitorsFlowScreenRepository->getViewsByEachScreen( $websiteId);
+                $screensFlow = $this->visitorsFlowScreenRepository->getFlow($websiteId, $request->getLevel());
                 return new GetVisitorFlowResponse($screensFlow->getCollection(), $screensViews->getCollection());
                 break;
         }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php
index 15036525..9a98d3ad 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php
@@ -18,5 +18,5 @@ public function getByCriteria(Criteria $criteria): ?ScreenAggregate;
 
     public function getFlow(int $websiteId, int $level): ParameterFlowCollection;
 
-    public function getViewsByEachScreen(string $type, int $websiteId): ParametersCollection;
+    public function getViewsByEachScreen( int $websiteId): ParametersCollection;
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
index 3e92e659..29687a8a 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
@@ -62,7 +62,7 @@ public function getByCriteria(Criteria $criteria): ?ScreenAggregate
                             ['match_phrase' => ['resolution_width' => $criteria->resolutionWidth]],
                             ['match_phrase' => ['resolution_height' => $criteria->resolutionHeight]],
                             ['match_phrase' => ['target_url' => $criteria->targetUrl]],
-                            ['match_phrase'=>['prev_page.source_url'=>$criteria->prevPageUrl]]
+                            ['match_phrase' => ['prev_page.source_url' => $criteria->prevPageUrl]]
                         ],
                     ]
                 ]
@@ -78,7 +78,8 @@ public function getByCriteria(Criteria $criteria): ?ScreenAggregate
         }
         return ScreenAggregate::fromResult($result['hits']['hits'][0]['_source']);
     }
-    public function getViewsByEachScreen(string $type, int $websiteId): ParametersCollection
+
+    public function getViewsByEachScreen(int $websiteId): ParametersCollection
     {
         $params = [
             'index' => self::INDEX_NAME,
@@ -91,9 +92,9 @@ public function getViewsByEachScreen(string $type, int $websiteId): ParametersCo
                     ]
                 ],
                 'aggregations' => [
-                    'devices' => [
+                    'resolutions' => [
                         'terms' => [
-                            'field' => $type
+                            'script' => "doc['resolution_width'].value + ' ' + doc['resolution_height'].value"
                         ],
                         'aggregations' => [
                             'views' => [
@@ -105,10 +106,9 @@ public function getViewsByEachScreen(string $type, int $websiteId): ParametersCo
                     ]
                 ]
             ]
-
         ];
         $result = $this->client->search($params);
-        return new ParametersCollection($result['aggregations']['devices']['buckets']);
+        return new ParametersCollection($result['aggregations']['resolutions']['buckets']);
     }
 
     public function getFlow(int $websiteId, int $level): ParameterFlowCollection

From 9aeeeeee8431c434d028df3d5e0be5cf86e2fde2 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Mon, 9 Sep 2019 02:48:20 +0300
Subject: [PATCH 078/183] fix style code

---
 .../Actions/VisitorsFlow/GetVisitorsFlowAction.php    |  5 ++---
 backend/app/Actions/Visits/CreateVisitAction.php      |  6 ++----
 backend/app/Aggregates/VisitorsFlow/Aggregate.php     |  7 +++----
 .../app/Aggregates/VisitorsFlow/CountryAggregate.php  |  6 ++----
 .../app/Aggregates/VisitorsFlow/DeviceAggregate.php   |  6 ++----
 .../app/Aggregates/VisitorsFlow/ScreenAggregate.php   |  6 ++----
 .../DataTransformer/VisitorsFlow/ParameterItem.php    |  1 -
 .../VisitorsFlow/ParametersCollection.php             |  1 -
 .../Http/Controllers/Api/VisitorsFlowController.php   |  7 +++++--
 .../Repositories/Contracts/GeoPositionRepository.php  |  1 -
 .../VisitorsFlow/Contracts/VisitorFlowRepository.php  |  1 -
 .../Contracts/VisitorFlowScreenRepository.php         |  2 +-
 .../Elasticsearch/VisitorsFlow/ScreenCriteria.php     |  3 +--
 .../Services/VisitorsFlow/FlowAggregateService.php    |  3 +--
 ...9_08_013215_create_country_visitors_flow_index.php | 11 -----------
 ...9_08_013610_create_browser_visitors_flow_index.php | 10 ----------
 ...09_08_013620_create_device_visitors_flow_index.php | 11 -----------
 ...09_08_013634_create_screen_visitors_flow_index.php | 11 -----------
 18 files changed, 21 insertions(+), 77 deletions(-)

diff --git a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
index 36b4fc9e..c9ad325d 100644
--- a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
+++ b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
@@ -20,8 +20,7 @@ public function __construct(
         VisitorFlowBrowserRepository $visitorFlowBrowserRepository,
         VisitorFlowDeviceRepository $visitorFlowDeviceRepository,
         VisitorFlowScreenRepository $visitorFlowScreenRepository
-    )
-    {
+    ) {
         $this->visitorsFlowCountryRepository = $visitorFlowCountryRepository;
         $this->visitorsFlowBrowserRepository = $visitorFlowBrowserRepository;
         $this->visitorsFlowDeviceRepository = $visitorFlowDeviceRepository;
@@ -64,7 +63,7 @@ public function execute(GetVisitorsFlowRequest $request): GetVisitorFlowResponse
                     $screensFlow = $this->visitorsFlowScreenRepository->getFlow($websiteId, $request->getLevel());
                     return new GetVisitorFlowResponse($screensFlow->getCollection());
                 }
-                $screensViews = $this->visitorsFlowScreenRepository->getViewsByEachScreen( $websiteId);
+                $screensViews = $this->visitorsFlowScreenRepository->getViewsByEachScreen($websiteId);
                 $screensFlow = $this->visitorsFlowScreenRepository->getFlow($websiteId, $request->getLevel());
                 return new GetVisitorFlowResponse($screensFlow->getCollection(), $screensViews->getCollection());
                 break;
diff --git a/backend/app/Actions/Visits/CreateVisitAction.php b/backend/app/Actions/Visits/CreateVisitAction.php
index 42835e83..5908f531 100644
--- a/backend/app/Actions/Visits/CreateVisitAction.php
+++ b/backend/app/Actions/Visits/CreateVisitAction.php
@@ -124,8 +124,7 @@ private function getOrCreateSystem(
         string $browser,
         int $resolutionHeight,
         int $resolutionWidth
-    ): System
-    {
+    ): System {
         $system = $this->systemRepository->getByParameters(
             $operatingSystem,
             $device,
@@ -171,8 +170,7 @@ private function getOrCreateSession(
         int $pageId,
         string $language,
         int $systemId
-    ): Session
-    {
+    ): Session {
         $session = $this->sessionRepository->lastActiveByVisitorId($visitorId);
 
         if ($session !== null) {
diff --git a/backend/app/Aggregates/VisitorsFlow/Aggregate.php b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
index 8af4521e..d9b54c32 100644
--- a/backend/app/Aggregates/VisitorsFlow/Aggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
@@ -29,8 +29,7 @@ public function __construct(
         bool $isLastPage,
         int $exitCount,
         PageValue $prevPage
-    )
-    {
+    ) {
         $this->id = $id;
         $this->websiteId = $websiteId;
         $this->targetUrl = $targetUrl;
@@ -66,9 +65,9 @@ public function getId(): int
         return $this->id;
     }
 
-    public abstract static function fromResult(array $result): self;
+    abstract public static function fromResult(array $result): self;
 
-    public abstract static function getPreviousAggregate(
+    abstract public static function getPreviousAggregate(
         VisitorFlowRepository $visitorFlowBrowserRepository,
         Visit $visit,
         string $previousVisitUrl,
diff --git a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
index 26ffb475..b5b0a699 100644
--- a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
@@ -23,8 +23,7 @@ public function __construct(
         int $exitCount,
         string $country,
         PageValue $prevPage
-    )
-    {
+    ) {
         parent::__construct($id, $websiteId, $targetUrl, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
         $this->country = $country;
     }
@@ -58,8 +57,7 @@ public static function getPreviousAggregate(
         Visit $visit,
         string $previousVisitUrl,
         int $level
-    ): Aggregate
-    {
+    ): Aggregate {
         return $visitorFlowCountryRepository->getByCriteria(
             CountryCriteria::getCriteria(
                 $visit->session->website_id,
diff --git a/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php b/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
index 8d32e28c..5b6f8edc 100644
--- a/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
@@ -23,8 +23,7 @@ public function __construct(
         int $exitCount,
         string $device,
         PageValue $prevPage
-    )
-    {
+    ) {
         parent::__construct($id, $websiteId, $targetUrl, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
         $this->device = $device;
     }
@@ -58,8 +57,7 @@ public static function getPreviousAggregate(
         Visit $visit,
         string $previousVisitUrl,
         int $level
-    ): Aggregate
-    {
+    ): Aggregate {
         return $visitorFlowDeviceRepository->getByCriteria(
             DeviceCriteria::getCriteria(
                 $visit->session->website_id,
diff --git a/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php b/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
index 2aa3b4ea..b5b64f14 100644
--- a/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
@@ -25,8 +25,7 @@ public function __construct(
         string $resolutionWidth,
         string $resolutionHeight,
         PageValue $prevPage
-    )
-    {
+    ) {
         parent::__construct($id, $websiteId, $targetUrl, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
         $this->resolutionWidth = $resolutionWidth;
         $this->resolutionHeight = $resolutionHeight;
@@ -65,8 +64,7 @@ public static function getPreviousAggregate(
         Visit $visit,
         string $previousVisitUrl,
         int $level
-    ): Aggregate
-    {
+    ): Aggregate {
         return $visitorFlowScreenRepository->getByCriteria(
             ScreenCriteria::getCriteria(
                 $visit->session->website_id,
diff --git a/backend/app/DataTransformer/VisitorsFlow/ParameterItem.php b/backend/app/DataTransformer/VisitorsFlow/ParameterItem.php
index 8a14f455..fda8304e 100644
--- a/backend/app/DataTransformer/VisitorsFlow/ParameterItem.php
+++ b/backend/app/DataTransformer/VisitorsFlow/ParameterItem.php
@@ -3,7 +3,6 @@
 
 namespace App\DataTransformer\VisitorsFlow;
 
-
 class ParameterItem
 {
     private $title;
diff --git a/backend/app/DataTransformer/VisitorsFlow/ParametersCollection.php b/backend/app/DataTransformer/VisitorsFlow/ParametersCollection.php
index 693180e4..a8c5d8e4 100644
--- a/backend/app/DataTransformer/VisitorsFlow/ParametersCollection.php
+++ b/backend/app/DataTransformer/VisitorsFlow/ParametersCollection.php
@@ -3,7 +3,6 @@
 
 namespace App\DataTransformer\VisitorsFlow;
 
-
 use Illuminate\Support\Collection;
 
 class ParametersCollection
diff --git a/backend/app/Http/Controllers/Api/VisitorsFlowController.php b/backend/app/Http/Controllers/Api/VisitorsFlowController.php
index 173c75ae..7685185b 100644
--- a/backend/app/Http/Controllers/Api/VisitorsFlowController.php
+++ b/backend/app/Http/Controllers/Api/VisitorsFlowController.php
@@ -19,9 +19,12 @@ public function __construct(GetVisitorsFlowAction $getVisitorsFlowAction)
         $this->getVisitorsFlowAction = $getVisitorsFlowAction;
     }
 
-    public function getVisitorsFlow(GetVisitorsFlowHttpRequest $request)
+    public function getVisitorsFlow(GetVisitorsFlowHttpRequest $request): ApiResponse
     {
         $result = $this->getVisitorsFlowAction->execute(GetVisitorsFlowRequest::fromRequest($request));
-        return ApiResponse::success(new VisitorsFlowResource($result->getCollection()),['level'=>$request->getLevel()]);
+        return ApiResponse::success(
+            new VisitorsFlowResource($result->getCollection()),
+            ['level' => $request->getLevel()]
+        );
     }
 }
diff --git a/backend/app/Repositories/Contracts/GeoPositionRepository.php b/backend/app/Repositories/Contracts/GeoPositionRepository.php
index d4dbaed4..b7d22d0d 100644
--- a/backend/app/Repositories/Contracts/GeoPositionRepository.php
+++ b/backend/app/Repositories/Contracts/GeoPositionRepository.php
@@ -11,5 +11,4 @@ public function getByParameters(string $country, string $city): ?GeoPosition;
     public function save(GeoPosition $geoPosition): GeoPosition;
 
     public function getById(int $id): GeoPosition;
-
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowRepository.php
index e6acc7e5..5015db2a 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowRepository.php
@@ -5,5 +5,4 @@
 
 interface VisitorFlowRepository
 {
-
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php
index 9a98d3ad..a2787797 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php
@@ -18,5 +18,5 @@ public function getByCriteria(Criteria $criteria): ?ScreenAggregate;
 
     public function getFlow(int $websiteId, int $level): ParameterFlowCollection;
 
-    public function getViewsByEachScreen( int $websiteId): ParametersCollection;
+    public function getViewsByEachScreen(int $websiteId): ParametersCollection;
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ScreenCriteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ScreenCriteria.php
index 7866bb09..e82bd0bc 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ScreenCriteria.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ScreenCriteria.php
@@ -21,8 +21,7 @@ private function __construct(
         ?string $prevPageUrl,
         string $resolutionWidth,
         string $resolutionHeight
-    )
-    {
+    ) {
         $this->websiteId = $websiteId;
         $this->targetUrl = $targetUrl;
         $this->level = $level;
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 92fc901b..aa7e3db2 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -43,8 +43,7 @@ public function __construct(
         VisitorFlowBrowserRepository $visitorFlowBrowserRepository,
         VisitorFlowDeviceRepository $visitorFlowDeviceRepository,
         VisitorFlowScreenRepository $visitorFlowScreenRepository
-    )
-    {
+    ) {
         $this->pageRepository = $pageRepository;
         $this->visitRepository = $visitRepository;
         $this->visitorFlowCountryRepository = $visitorFlowCountryRepository;
diff --git a/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php
index 96a542b7..5b3529ad 100644
--- a/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php
@@ -2,16 +2,10 @@
 
 use Illuminate\Database\Migrations\Migration;
 
-
 class CreateCountryVisitorsFlowIndex extends Migration
 {
     private const INDEX_NAME = 'country-visitors-flow-index';
 
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         $client = app('elasticsearch');
@@ -31,11 +25,6 @@ public function up()
         $client->indices()->create($params);
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         $client = app('elasticsearch');
diff --git a/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php
index fb4c8666..065dadbc 100644
--- a/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php
@@ -6,11 +6,6 @@ class CreateBrowserVisitorsFlowIndex extends Migration
 {
     private const INDEX_NAME = 'browser-visitors-flow-index';
 
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         $client = app('elasticsearch');
@@ -29,11 +24,6 @@ public function up()
         $client->indices()->create($params);
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         $client = app('elasticsearch');
diff --git a/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php
index 768c3e3d..4dac3e88 100644
--- a/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php
@@ -6,11 +6,6 @@ class CreateDeviceVisitorsFlowIndex extends Migration
 {
     private const INDEX_NAME = 'device-visitors-flow-index';
 
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         $client = app('elasticsearch');
@@ -29,16 +24,10 @@ public function up()
         $client->indices()->create($params);
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         $client = app('elasticsearch');
         $params = ['index' => self::INDEX_NAME];
         $client->indices()->delete($params);
     }
-
 }
diff --git a/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php
index b7736db9..ffcd2c19 100644
--- a/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php
@@ -6,11 +6,6 @@ class CreateScreenVisitorsFlowIndex extends Migration
 {
     private const INDEX_NAME = 'screen-visitors-flow-index';
 
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         $client = app('elasticsearch');
@@ -32,16 +27,10 @@ public function up()
         $client->indices()->create($params);
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         $client = app('elasticsearch');
         $params = ['index' => self::INDEX_NAME];
         $client->indices()->delete($params);
     }
-
 }

From e6e0ce0c653ba4a47b9cf9db5c64056c9f3d94f4 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Mon, 9 Sep 2019 02:51:06 +0300
Subject: [PATCH 079/183] final fix style code

---
 backend/app/Aggregates/VisitorsFlow/Aggregate.php        | 1 -
 backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/backend/app/Aggregates/VisitorsFlow/Aggregate.php b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
index d9b54c32..16746033 100644
--- a/backend/app/Aggregates/VisitorsFlow/Aggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
@@ -39,7 +39,6 @@ public function __construct(
         $this->isLastPage = $isLastPage;
         $this->exitCount = $exitCount;
         $this->prevPage = $prevPage;
-
     }
 
     public function toArray(): array
diff --git a/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php b/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
index 5eba3d43..8bb03385 100644
--- a/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
@@ -23,8 +23,7 @@ public function __construct(
         int $exitCount,
         string $browser,
         PageValue $prevPage
-    )
-    {
+    ) {
         parent::__construct($id, $websiteId, $targetUrl, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
         $this->browser = $browser;
     }
@@ -58,8 +57,7 @@ public static function getPreviousAggregate(
         Visit $visit,
         string $previousVisitUrl,
         int $level
-    ): Aggregate
-    {
+    ): Aggregate {
         return $visitorFlowBrowserRepository->getByCriteria(
             BrowserCriteria::getCriteria(
                 $visit->session->website_id,

From 746035e8891be4f7597571c936b49f59d2a35066 Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Mon, 9 Sep 2019 09:49:12 +0300
Subject: [PATCH 080/183] edit style code

---
 frontend/src/pages/speed_overview/ErrorReports.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/pages/speed_overview/ErrorReports.vue b/frontend/src/pages/speed_overview/ErrorReports.vue
index 70e923d5..1491a5b0 100644
--- a/frontend/src/pages/speed_overview/ErrorReports.vue
+++ b/frontend/src/pages/speed_overview/ErrorReports.vue
@@ -134,7 +134,6 @@
             changePeriod (data) {
                 this.changeSelectedPeriod(data);
             },
-            },
             openModal(item) {
                 this.dialog = true;
                 this.modalItem = {

From fe2576fb4bf9c1c172871b936c5c0781c7cd4359 Mon Sep 17 00:00:00 2001
From: Lench Volodymyr <volodymyr.lench@binary-studio.com>
Date: Mon, 9 Sep 2019 10:23:06 +0300
Subject: [PATCH 081/183] fix elasticsearch deploy

---
 .travis.yml             | 1 +
 docker-compose.test.yml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index f7d23bb2..336da707 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,6 +42,7 @@ script:
   - docker-compose -f docker-compose.test.yml exec app composer install
   - docker-compose -f docker-compose.test.yml exec app php artisan key:generate
   - docker-compose -f docker-compose.test.yml exec app php artisan jwt:secret
+  - curl -X GET "127.0.0.1:9200/_cluster/health?wait_for_status=yellow&timeout=50s&pretty"
   - docker-compose -f docker-compose.test.yml exec app php artisan migrate
   - docker-compose -f docker-compose.test.yml exec app php artisan db:seed --class=DefaultUserAndWebsiteSeeder
   - docker-compose -f docker-compose.test.yml exec app ./vendor/bin/phpunit
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index ac60c634..37e66a03 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -70,6 +70,8 @@ services:
       - bootstrap.memory_lock=true
       - discovery.type=single-node
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+    ports:
+      - "9200:9200"
     ulimits:
       memlock:
         soft: -1

From e29a82d2024f9a76399eed75951035f5b9c95881 Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Mon, 9 Sep 2019 11:19:19 +0300
Subject: [PATCH 082/183] fix talbe visualization

---
 frontend/src/api/geo_location/transformer.js                | 2 +-
 .../src/components/dashboard/geo_location/GroupedTable.vue  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/api/geo_location/transformer.js b/frontend/src/api/geo_location/transformer.js
index 009a9386..8fa8a1da 100644
--- a/frontend/src/api/geo_location/transformer.js
+++ b/frontend/src/api/geo_location/transformer.js
@@ -4,7 +4,7 @@ const transformer = (item) => {
         'all_visitors_count': item.all_visitors_count,
         'new_visitors_count': item.new_visitors_count,
         'sessions_count': item.sessions_count,
-        'bounce_rate': Math.round(item.bounce_rate * 100),
+        'bounce_rate': item.bounce_rate,
         'avg_session_time': item.avg_session_time
     };
 };
diff --git a/frontend/src/components/dashboard/geo_location/GroupedTable.vue b/frontend/src/components/dashboard/geo_location/GroupedTable.vue
index d9efd321..78ec198b 100644
--- a/frontend/src/components/dashboard/geo_location/GroupedTable.vue
+++ b/frontend/src/components/dashboard/geo_location/GroupedTable.vue
@@ -75,8 +75,10 @@
             geoLocationItems() {
                 return this.items.map((item) => {
                     let newItemData = {
-                        avg_session_time: moment.unix(item.avg_session_time).format("HH:mm:ss"),
-                        bounce_rate: Math.round(Number(item.bounce_rate)*100)
+                        avg_session_time: moment.utc(
+                            moment.duration(item.avg_session_time, 's').asMilliseconds()
+                        ).format("HH:mm:ss"),
+                        bounce_rate: Math.round(Number(item.bounce_rate) * 100)
                     };
                     return { ...item, ...newItemData};
                 });

From ef68958e56eb229d5a97b9645ba593eb27232dc1 Mon Sep 17 00:00:00 2001
From: Lench Volodymyr <volodymyr.lench@binary-studio.com>
Date: Mon, 9 Sep 2019 11:26:50 +0300
Subject: [PATCH 083/183] add waiting elastic

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 336da707..49f116b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ script:
   - docker-compose -f docker-compose.test.yml exec app composer install
   - docker-compose -f docker-compose.test.yml exec app php artisan key:generate
   - docker-compose -f docker-compose.test.yml exec app php artisan jwt:secret
-  - curl -X GET "127.0.0.1:9200/_cluster/health?wait_for_status=yellow&timeout=50s&pretty"
+  - until curl --silent -XGET --fail http://localhost:9200; do printf '.'; sleep 1; done
   - docker-compose -f docker-compose.test.yml exec app php artisan migrate
   - docker-compose -f docker-compose.test.yml exec app php artisan db:seed --class=DefaultUserAndWebsiteSeeder
   - docker-compose -f docker-compose.test.yml exec app ./vendor/bin/phpunit

From 13aac1de200f5d69f6acd7dd96d8bcd1c540dced Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Mon, 9 Sep 2019 11:40:43 +0300
Subject: [PATCH 084/183] minor endpoint changes

---
 .../app/Actions/GeoLocation/GetGeoLocationItemsAction.php    | 5 ++++-
 backend/app/Entities/Session.php                             | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/app/Actions/GeoLocation/GetGeoLocationItemsAction.php b/backend/app/Actions/GeoLocation/GetGeoLocationItemsAction.php
index 52ef7f4e..39a3a18d 100644
--- a/backend/app/Actions/GeoLocation/GetGeoLocationItemsAction.php
+++ b/backend/app/Actions/GeoLocation/GetGeoLocationItemsAction.php
@@ -76,7 +76,10 @@ public function execute(GetGeoLocationItemsRequest $request): GetGeoLocationItem
         $response = $collection->map(function ($item) {
             $bounce_rate = 0;
 
-            if (isset($item['bounced_visitors_count']) && isset($item['all_visitors_count']) && $item['all_visitors_count'] > 0) {
+            if (
+                isset($item['bounced_visitors_count'], $item['all_visitors_count']) &&
+                $item['all_visitors_count'] > 0
+            ) {
                 $bounce_rate = $item['bounced_visitors_count'] / $item['all_visitors_count'];
             }
 
diff --git a/backend/app/Entities/Session.php b/backend/app/Entities/Session.php
index bfb683af..23a8d249 100644
--- a/backend/app/Entities/Session.php
+++ b/backend/app/Entities/Session.php
@@ -107,7 +107,7 @@ public function scopeAvgSessionTime(Builder $query): Builder
     {
         return $query->select(
             DB::raw(
-                'round(extract(epoch from (avg(sessions.updated_at - sessions.start_session)))) as avg_session_time'
+                'round(extract(epoch from (avg(sessions.end_session - sessions.start_session)))) as avg_session_time'
             )
         );
     }

From 01c7df3be2318ce4b35c76b75713ec2cd131df9b Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Mon, 9 Sep 2019 12:00:34 +0300
Subject: [PATCH 085/183] change creation methods of paths and exits

---
 .../visitors_flow/VisitorsFlowDiagram.vue     | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
index 4545932b..c555c736 100644
--- a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
+++ b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
@@ -69,7 +69,7 @@
         },
         methods: {
             createLinks () {
-                this.links = [];
+                let links = [];
                 let lastNodeId = this.nodes.slice(-1)[0].id;
 
                 for (let coef = 1, sourceInd = 0; sourceInd < lastNodeId - 5; sourceInd++) {
@@ -79,25 +79,29 @@
                         let targetId = this.nodes[targetInd + 5 * coef].id;
                         let value = Math.floor(Math.random() * Math.floor(100));
                         let link = { source: sourceId, target: targetId, value: value };
-                        this.links.push(link);
+                        links.push(link);
                     }
 
                     if (sourceId % 5 === 0) {
                         coef++;
                     }
                 }
+
+                this.links = links;
             },
 
-            createExits() {
-                this.exits = [];
+            createExits () {
                 let lastNodeId = this.nodes.slice(-1)[0].id;
+                let exits = [];
 
                 for (let sourceInd = 5; sourceInd < lastNodeId; sourceInd++) {
                     let sourceId = this.nodes[sourceInd].id;
                     let value = Math.floor(Math.random() * 50);
                     let exit = { source: sourceId, value: value, index: sourceId - 1 };
-                    this.exits.push(exit);
+                    exits.push(exit);
                 }
+
+                this.exits = exits;
             },
 
             addInteraction () {
@@ -234,12 +238,12 @@
 
                         return `M ${mx} ${my} a 25 40 0 0 1 25 40`;
                     })
-                    .attr("class", "drops")
-                    .attr("id", d => `drop-${d.index}`)
+                    .attr("class", "exits")
+                    .attr("id", d => `exit-${d.index}`)
                     .attr("stroke", "#fa514a")
                     .attr("stroke-opacity", ".5")
                     .attr("stroke-width", d => d.value)
-                    .on("mouseover", (d, i, drops) => {
+                    .on("mouseover", (d, i, exits) => {
                         tooltip.text(`${d.value} drop-offs`)
                             .style("visibility", "visible");
 
@@ -248,10 +252,10 @@
                         d3.selectAll("path")
                             .attr("stroke-opacity", ".2");
 
-                        const drop = d3.select(drops[i]);
+                        const exit = d3.select(exits[i]);
 
-                        drop.attr("stroke-opacity", "1");
-                        this.highlightLeftSide(d3.select(`#node-${drop.data()[0].index}`));
+                        exit.attr("stroke-opacity", "1");
+                        this.highlightLeftSide(d3.select(`#node-${exit.data()[0].index}`));
                     })
                     .on("mouseleave", () =>  {
                         tooltip.style("visibility", "hidden");
@@ -308,7 +312,7 @@
 
                 const nodeData = node.data()[0];
 
-                d3.select(`#drop-${nodeData.index}`)
+                d3.select(`#exit-${nodeData.index}`)
                     .attr("stroke-opacity", "1");
 
                 nodeData.sourceLinks
@@ -328,7 +332,7 @@
 
                 const nodeData = node.data()[0];
 
-                d3.select(`#drop-${nodeData.index}`)
+                d3.select(`#exit-${nodeData.index}`)
                     .attr("stroke-opacity", "1");
 
                 nodeData.targetLinks

From 8a6d5221a308d1aedc1f07950a75a1facc85240c Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Mon, 9 Sep 2019 12:46:32 +0300
Subject: [PATCH 086/183] fix pagetiming table https request namespace

---
 .../app/Actions/PageTimings/GetAverageTimingByParamRequest.php | 2 +-
 backend/app/Http/Controllers/Api/PageTimingController.php      | 2 +-
 .../Http/Requests/PageTimings/PageTimingTableHttpRequest.php   | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/backend/app/Actions/PageTimings/GetAverageTimingByParamRequest.php b/backend/app/Actions/PageTimings/GetAverageTimingByParamRequest.php
index 68fc3848..bb19a96d 100644
--- a/backend/app/Actions/PageTimings/GetAverageTimingByParamRequest.php
+++ b/backend/app/Actions/PageTimings/GetAverageTimingByParamRequest.php
@@ -5,7 +5,7 @@
 namespace App\Actions\PageTimings;
 
 use App\Actions\TableDataRequest;
-use App\Http\Request\PageTimingTableHttpRequest;
+use App\Http\Requests\PageTimings\PageTimingTableHttpRequest;
 
 class GetAverageTimingByParamRequest extends TableDataRequest
 {
diff --git a/backend/app/Http/Controllers/Api/PageTimingController.php b/backend/app/Http/Controllers/Api/PageTimingController.php
index 7804c3f6..512b8daa 100644
--- a/backend/app/Http/Controllers/Api/PageTimingController.php
+++ b/backend/app/Http/Controllers/Api/PageTimingController.php
@@ -10,7 +10,7 @@
 use App\Actions\PageTimings\GetChartRequest;
 use App\Actions\PageTimings\GetServerResponseChartAction;
 use App\Http\Controllers\Controller;
-use App\Http\Request\PageTimingTableHttpRequest;
+use App\Http\Requests\PageTimings\PageTimingTableHttpRequest;
 use App\Http\Requests\PageTimings\PageTimingChartHttpRequest;
 use App\Http\Resources\ChartResource;
 use App\Http\Resources\SpeedOverviewTableResource;
diff --git a/backend/app/Http/Requests/PageTimings/PageTimingTableHttpRequest.php b/backend/app/Http/Requests/PageTimings/PageTimingTableHttpRequest.php
index 8cfc06ea..522a090e 100644
--- a/backend/app/Http/Requests/PageTimings/PageTimingTableHttpRequest.php
+++ b/backend/app/Http/Requests/PageTimings/PageTimingTableHttpRequest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace App\Http\Request;
+namespace App\Http\Requests\PageTimings;
 
 use App\Rules\Timestamp;
 use App\Rules\TimestampAfter;
+use App\Http\Request\ApiFormRequest;
 
 final class PageTimingTableHttpRequest extends ApiFormRequest
 {

From ad7e24e289f0c55b28bce3bcc1e806c82feb2c03 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Mon, 9 Sep 2019 15:09:14 +0300
Subject: [PATCH 087/183] fix migrations for indexes

---
 ...215_create_country_visitors_flow_index.php |  9 +++--
 ...610_create_browser_visitors_flow_index.php |  5 ++-
 ...3620_create_device_visitors_flow_index.php |  5 ++-
 ...3634_create_screen_visitors_flow_index.php |  5 ++-
 .../Feature/GetSessionsByParameterTest.php    |  2 +-
 backend/tests/Unit/ExampleTest.php            | 36 +++++++++----------
 6 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php
index 5b3529ad..8ed06742 100644
--- a/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php
@@ -8,6 +8,7 @@ class CreateCountryVisitorsFlowIndex extends Migration
 
     public function up()
     {
+        $this->down();
         $client = app('elasticsearch');
         $params = [
             'index' => self::INDEX_NAME,
@@ -25,10 +26,14 @@ public function up()
         $client->indices()->create($params);
     }
 
+
     public function down()
     {
-        $client = app('elasticsearch');
         $params = ['index' => self::INDEX_NAME];
-        $client->indices()->delete($params);
+        $client = app('elasticsearch');
+
+        if ($client->indices()->exists($params)) {
+            $client->indices()->delete($params);
+        }
     }
 }
diff --git a/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php
index 065dadbc..e1bce71b 100644
--- a/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php
@@ -8,6 +8,7 @@ class CreateBrowserVisitorsFlowIndex extends Migration
 
     public function up()
     {
+        $this->down();
         $client = app('elasticsearch');
         $params = [
             'index' => self::INDEX_NAME,
@@ -28,6 +29,8 @@ public function down()
     {
         $client = app('elasticsearch');
         $params = ['index' => self::INDEX_NAME];
-        $client->indices()->delete($params);
+        if ($client->indices()->exists($params)) {
+            $client->indices()->delete($params);
+        }
     }
 }
diff --git a/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php
index 4dac3e88..268080f1 100644
--- a/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php
@@ -8,6 +8,7 @@ class CreateDeviceVisitorsFlowIndex extends Migration
 
     public function up()
     {
+        $this->down();
         $client = app('elasticsearch');
         $params = [
             'index' => self::INDEX_NAME,
@@ -28,6 +29,8 @@ public function down()
     {
         $client = app('elasticsearch');
         $params = ['index' => self::INDEX_NAME];
-        $client->indices()->delete($params);
+        if ($client->indices()->exists($params)) {
+            $client->indices()->delete($params);
+        }
     }
 }
diff --git a/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php
index ffcd2c19..214333dc 100644
--- a/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php
@@ -8,6 +8,7 @@ class CreateScreenVisitorsFlowIndex extends Migration
 
     public function up()
     {
+        $this->down();
         $client = app('elasticsearch');
         $params = [
             'index' => self::INDEX_NAME,
@@ -31,6 +32,8 @@ public function down()
     {
         $client = app('elasticsearch');
         $params = ['index' => self::INDEX_NAME];
-        $client->indices()->delete($params);
+        if ($client->indices()->exists($params)) {
+            $client->indices()->delete($params);
+        }
     }
 }
diff --git a/backend/tests/Feature/GetSessionsByParameterTest.php b/backend/tests/Feature/GetSessionsByParameterTest.php
index 8ebf639d..e10a3f04 100644
--- a/backend/tests/Feature/GetSessionsByParameterTest.php
+++ b/backend/tests/Feature/GetSessionsByParameterTest.php
@@ -9,7 +9,7 @@
 class GetSessionsByParameterTest extends TestCase
 {
     use RefreshDatabase;
-    
+
     const ENDPOINT = 'api/v1/sessions/param';
 
     private $user;
diff --git a/backend/tests/Unit/ExampleTest.php b/backend/tests/Unit/ExampleTest.php
index e9fe19c6..da80b382 100644
--- a/backend/tests/Unit/ExampleTest.php
+++ b/backend/tests/Unit/ExampleTest.php
@@ -1,19 +1,19 @@
 <?php
-
-namespace Tests\Unit;
-
-use Tests\TestCase;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-
-class ExampleTest extends TestCase
-{
-    /**
-     * A basic test example.
-     *
-     * @return void
-     */
-    public function testBasicTest()
-    {
-        $this->assertTrue(true);
-    }
-}
+//
+//namespace Tests\Unit;
+//
+//use Tests\TestCase;
+//use Illuminate\Foundation\Testing\RefreshDatabase;
+//
+//class ExampleTest extends TestCase
+//{
+//    /**
+//     * A basic test example.
+//     *
+//     * @return void
+//     */
+//    public function testBasicTest()
+//    {
+//        $this->assertTrue(true);
+//    }
+//}

From 7566468b5cdcfa64366ba8811d398fe86c60a2e6 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Mon, 9 Sep 2019 15:11:05 +0300
Subject: [PATCH 088/183] remove comments from test

---
 backend/tests/Unit/ExampleTest.php | 36 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/backend/tests/Unit/ExampleTest.php b/backend/tests/Unit/ExampleTest.php
index da80b382..e9fe19c6 100644
--- a/backend/tests/Unit/ExampleTest.php
+++ b/backend/tests/Unit/ExampleTest.php
@@ -1,19 +1,19 @@
 <?php
-//
-//namespace Tests\Unit;
-//
-//use Tests\TestCase;
-//use Illuminate\Foundation\Testing\RefreshDatabase;
-//
-//class ExampleTest extends TestCase
-//{
-//    /**
-//     * A basic test example.
-//     *
-//     * @return void
-//     */
-//    public function testBasicTest()
-//    {
-//        $this->assertTrue(true);
-//    }
-//}
+
+namespace Tests\Unit;
+
+use Tests\TestCase;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+class ExampleTest extends TestCase
+{
+    /**
+     * A basic test example.
+     *
+     * @return void
+     */
+    public function testBasicTest()
+    {
+        $this->assertTrue(true);
+    }
+}

From e4def43857a0ce04f5196a83085d124e9a56dae6 Mon Sep 17 00:00:00 2001
From: Volodymyr <tumko.volodymyr@gmail.com>
Date: Mon, 9 Sep 2019 16:08:07 +0300
Subject: [PATCH 089/183] show data only for exist values

---
 backend/app/Actions/Visitors/BounceRateAction.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/app/Actions/Visitors/BounceRateAction.php b/backend/app/Actions/Visitors/BounceRateAction.php
index 074da8df..e56849c3 100644
--- a/backend/app/Actions/Visitors/BounceRateAction.php
+++ b/backend/app/Actions/Visitors/BounceRateAction.php
@@ -32,8 +32,9 @@ public function execute(BounceRateRequest $request): BounceRateResponse
         $collection = new Collection();
         do {
             $all = $allVisitorsByTimeFrameValues[$start]??0;
+            if ($all === 0) continue;
             $bounced = $bounceVisitorsByTimeFrameValues[$start]??0;
-            $rate = ($all === 0) ? 0 : ($bounced / $all);
+            $rate = $bounced / $all;
             $collection->add(new ChartValue((string) $start, (string) $rate));
         } while (($start+=$timeFrame)<=$end);
 

From bbb879c94e5b50ccb900778602acc270c7df2eb4 Mon Sep 17 00:00:00 2001
From: TumkoVolodymyr <tumko.volodymyr@gmail.com>
Date: Mon, 9 Sep 2019 13:12:31 +0000
Subject: [PATCH 090/183] Apply fixes from StyleCI

---
 backend/app/Actions/Visitors/BounceRateAction.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/app/Actions/Visitors/BounceRateAction.php b/backend/app/Actions/Visitors/BounceRateAction.php
index e56849c3..0adcb179 100644
--- a/backend/app/Actions/Visitors/BounceRateAction.php
+++ b/backend/app/Actions/Visitors/BounceRateAction.php
@@ -32,7 +32,9 @@ public function execute(BounceRateRequest $request): BounceRateResponse
         $collection = new Collection();
         do {
             $all = $allVisitorsByTimeFrameValues[$start]??0;
-            if ($all === 0) continue;
+            if ($all === 0) {
+                continue;
+            }
             $bounced = $bounceVisitorsByTimeFrameValues[$start]??0;
             $rate = $bounced / $all;
             $collection->add(new ChartValue((string) $start, (string) $rate));

From 131f58dcd11018823f7dcbf3be6a6d8d477d86af Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Mon, 9 Sep 2019 16:51:31 +0300
Subject: [PATCH 091/183] decrease aggregate method to 100 lines

---
 .../VisitorsFlow/FlowAggregateService.php     | 98 ++++++++++++-------
 1 file changed, 60 insertions(+), 38 deletions(-)

diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index aa7e3db2..06203d7d 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -43,7 +43,8 @@ public function __construct(
         VisitorFlowBrowserRepository $visitorFlowBrowserRepository,
         VisitorFlowDeviceRepository $visitorFlowDeviceRepository,
         VisitorFlowScreenRepository $visitorFlowScreenRepository
-    ) {
+    )
+    {
         $this->pageRepository = $pageRepository;
         $this->visitRepository = $visitRepository;
         $this->visitorFlowCountryRepository = $visitorFlowCountryRepository;
@@ -63,43 +64,11 @@ public function aggregate(Visit $visit)
         } else {
             $level = 1;
         }
-        $countryAggregate = $this->visitorFlowCountryRepository->getByCriteria(
-            CountryCriteria::getCriteria(
-                $visit->session->website_id,
-                $visit->page->url,
-                $level,
-                $isFirstInSession ? 'null' : $previousVisit->page->url,
-                $visit->geo_position->country
-            )
-        );
-        $browserAggregate = $this->visitorFlowBrowserRepository->getByCriteria(
-            BrowserCriteria::getCriteria(
-                $visit->session->website_id,
-                $visit->page->url,
-                $level,
-                $isFirstInSession ? 'null' : $previousVisit->page->url,
-                $visit->session->system->browser
-            )
-        );
-        $deviceAggregate = $this->visitorFlowDeviceRepository->getByCriteria(
-            DeviceCriteria::getCriteria(
-                $visit->session->website_id,
-                $visit->page->url,
-                $level,
-                $isFirstInSession ? 'null' : $previousVisit->page->url,
-                $visit->session->system->device
-            )
-        );
-        $screenAggregate = $this->visitorFlowScreenRepository->getByCriteria(
-            ScreenCriteria::getCriteria(
-                $visit->session->website_id,
-                $visit->page->url,
-                $level,
-                $isFirstInSession ? 'null' : $previousVisit->page->url,
-                $visit->session->system->resolution_width,
-                $visit->session->system->resolution_height
-            )
-        );
+        $countryAggregate = $this->getCountryAggregate($visit, $level, $isFirstInSession, $previousVisit);
+        $browserAggregate = $this->getBrowserAggregate($visit, $level, $isFirstInSession, $previousVisit);
+        $deviceAggregate = $this->getDeviceAggregate($visit, $level, $isFirstInSession, $previousVisit);
+        $screenAggregate = $this->getScreenAggregate($visit, $level, $isFirstInSession, $previousVisit);
+
         if (!$countryAggregate) {
             $countryAggregate = $this->createCountryAggregate($visit, $level, $previousVisit);
             $this->visitorFlowCountryRepository->save($countryAggregate);
@@ -346,4 +315,57 @@ private function createScreenAggregate(Visit $currentVisit, int $level, ?Visit $
             $prevPage
         );
     }
+
+    private function getBrowserAggregate(Visit $visit, int $level, bool $isFirstInSession, Visit $previousVisit): BrowserAggregate
+    {
+        return $this->visitorFlowBrowserRepository->getByCriteria(
+            BrowserCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level,
+                $isFirstInSession ? 'null' : $previousVisit->page->url,
+                $visit->session->system->browser
+            )
+        );
+    }
+
+    private function getCountryAggregate(Visit $visit, int $level, bool $isFirstInSession, Visit $previousVisit): CountryAggregate
+    {
+        return $this->visitorFlowCountryRepository->getByCriteria(
+            CountryCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level,
+                $isFirstInSession ? 'null' : $previousVisit->page->url,
+                $visit->geo_position->country
+            )
+        );
+    }
+
+    private function getDeviceAggregate(Visit $visit, int $level, bool $isFirstInSession, Visit $previousVisit): DeviceAggregate
+    {
+        return $this->visitorFlowDeviceRepository->getByCriteria(
+            DeviceCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level,
+                $isFirstInSession ? 'null' : $previousVisit->page->url,
+                $visit->session->system->device
+            )
+        );
+    }
+
+    private function getScreenAggregate(Visit $visit, int $level, bool $isFirstInSession, Visit $previousVisit): ScreenAggregate
+    {
+        return $this->visitorFlowScreenRepository->getByCriteria(
+            ScreenCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level,
+                $isFirstInSession ? 'null' : $previousVisit->page->url,
+                $visit->session->system->resolution_width,
+                $visit->session->system->resolution_height
+            )
+        );
+    }
 }

From 52b7d23b58c97710007eb4961b2016895ba3a619 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Mon, 9 Sep 2019 17:18:51 +0300
Subject: [PATCH 092/183] add getLevel method

---
 .../VisitorsFlow/FlowAggregateService.php         | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 06203d7d..43dda2f3 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -55,15 +55,20 @@ public function __construct(
         $this->visitorFlowScreenRepository = $visitorFlowScreenRepository;
     }
 
+    private function getLevel(Visit $visit, bool $isFirstInSession): int
+    {
+        if (!$isFirstInSession) {
+            return $this->getVisitsCount($visit);
+        }
+        return 1;
+    }
+
     public function aggregate(Visit $visit)
     {
         $previousVisit = $this->getLastVisit($visit);
         $isFirstInSession = $previousVisit === null;
-        if (!$isFirstInSession) {
-            $level = $this->getVisitsCount($visit);
-        } else {
-            $level = 1;
-        }
+        $level = $this->getLevel($visit, $isFirstInSession);
+
         $countryAggregate = $this->getCountryAggregate($visit, $level, $isFirstInSession, $previousVisit);
         $browserAggregate = $this->getBrowserAggregate($visit, $level, $isFirstInSession, $previousVisit);
         $deviceAggregate = $this->getDeviceAggregate($visit, $level, $isFirstInSession, $previousVisit);

From 167f9bdd06012813acc9b4791a8435cafb61e28c Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Mon, 9 Sep 2019 17:38:20 +0300
Subject: [PATCH 093/183] devide aggregate method into small methods

---
 .../VisitorsFlow/FlowAggregateService.php     | 88 +++++++++++++------
 1 file changed, 61 insertions(+), 27 deletions(-)

diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 43dda2f3..c67815fc 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -43,8 +43,7 @@ public function __construct(
         VisitorFlowBrowserRepository $visitorFlowBrowserRepository,
         VisitorFlowDeviceRepository $visitorFlowDeviceRepository,
         VisitorFlowScreenRepository $visitorFlowScreenRepository
-    )
-    {
+    ) {
         $this->pageRepository = $pageRepository;
         $this->visitRepository = $visitRepository;
         $this->visitorFlowCountryRepository = $visitorFlowCountryRepository;
@@ -63,17 +62,12 @@ private function getLevel(Visit $visit, bool $isFirstInSession): int
         return 1;
     }
 
-    public function aggregate(Visit $visit)
+    private function updateCountryAggregate(
+        Visit $visit,
+        int $level,
+        Visit $previousVisit,
+        ?CountryAggregate $countryAggregate): void
     {
-        $previousVisit = $this->getLastVisit($visit);
-        $isFirstInSession = $previousVisit === null;
-        $level = $this->getLevel($visit, $isFirstInSession);
-
-        $countryAggregate = $this->getCountryAggregate($visit, $level, $isFirstInSession, $previousVisit);
-        $browserAggregate = $this->getBrowserAggregate($visit, $level, $isFirstInSession, $previousVisit);
-        $deviceAggregate = $this->getDeviceAggregate($visit, $level, $isFirstInSession, $previousVisit);
-        $screenAggregate = $this->getScreenAggregate($visit, $level, $isFirstInSession, $previousVisit);
-
         if (!$countryAggregate) {
             $countryAggregate = $this->createCountryAggregate($visit, $level, $previousVisit);
             $this->visitorFlowCountryRepository->save($countryAggregate);
@@ -93,7 +87,14 @@ public function aggregate(Visit $visit)
             $countryAggregate->exitCount++;
             $this->visitorFlowCountryRepository->update($countryAggregate);
         }
+    }
 
+    private function updateBrowserAggregate(
+        Visit $visit,
+        int $level,
+        Visit $previousVisit,
+        ?BrowserAggregate $browserAggregate): void
+    {
         if (!$browserAggregate) {
             $browserAggregate = $this->createBrowserAggregate($visit, $level, $previousVisit);
             $this->visitorFlowBrowserRepository->save($browserAggregate);
@@ -113,6 +114,14 @@ public function aggregate(Visit $visit)
             $browserAggregate->exitCount++;
             $this->visitorFlowBrowserRepository->update($browserAggregate);
         }
+    }
+
+    private function updateDeviceAggregate(
+        Visit $visit,
+        int $level,
+        Visit $previousVisit,
+        ?DeviceAggregate $deviceAggregate): void
+    {
         if (!$deviceAggregate) {
             $deviceAggregate = $this->createDeviceAggregate($visit, $level, $previousVisit);
             $this->visitorFlowDeviceRepository->save($deviceAggregate);
@@ -132,26 +141,51 @@ public function aggregate(Visit $visit)
             $deviceAggregate->exitCount++;
             $this->visitorFlowDeviceRepository->update($deviceAggregate);
         }
+    }
 
+    private function updateScreenAggregate(
+        Visit $visit,
+        int $level,
+        Visit $previousVisit,
+        ?ScreenAggregate $screenAggregate): void
+    {
         if (!$screenAggregate) {
             $screenAggregate = $this->createScreenAggregate($visit, $level, $previousVisit);
             $this->visitorFlowScreenRepository->save($screenAggregate);
-        } else {
-            if ($level > 1) {
-                $previousAggregate = ScreenAggregate::getPreviousAggregate(
-                    $this->visitorFlowScreenRepository,
-                    $previousVisit,
-                    $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                    $level
-                );
-                $previousAggregate->isLastPage = false;
-                $previousAggregate->exitCount--;
-                $this->visitorFlowScreenRepository->update($previousAggregate);
-            }
-            $screenAggregate->views++;
-            $screenAggregate->exitCount++;
-            $this->visitorFlowScreenRepository->update($screenAggregate);
+            return;
         }
+        if ($level > 1) {
+            $previousAggregate = ScreenAggregate::getPreviousAggregate(
+                $this->visitorFlowScreenRepository,
+                $previousVisit,
+                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                $level
+            );
+            $previousAggregate->isLastPage = false;
+            $previousAggregate->exitCount--;
+            $this->visitorFlowScreenRepository->update($previousAggregate);
+        }
+        $screenAggregate->views++;
+        $screenAggregate->exitCount++;
+        $this->visitorFlowScreenRepository->update($screenAggregate);
+    }
+
+
+    public function aggregate(Visit $visit)
+    {
+        $previousVisit = $this->getLastVisit($visit);
+        $isFirstInSession = $previousVisit === null;
+        $level = $this->getLevel($visit, $isFirstInSession);
+
+        $countryAggregate = $this->getCountryAggregate($visit, $level, $isFirstInSession, $previousVisit);
+        $browserAggregate = $this->getBrowserAggregate($visit, $level, $isFirstInSession, $previousVisit);
+        $deviceAggregate = $this->getDeviceAggregate($visit, $level, $isFirstInSession, $previousVisit);
+        $screenAggregate = $this->getScreenAggregate($visit, $level, $isFirstInSession, $previousVisit);
+
+        $this->updateCountryAggregate($visit, $level, $previousVisit, $countryAggregate);
+        $this->updateBrowserAggregate($visit, $level, $previousVisit, $browserAggregate);
+        $this->updateDeviceAggregate($visit, $level, $previousVisit, $deviceAggregate);
+        $this->updateScreenAggregate($visit, $level, $previousVisit, $screenAggregate);
     }
 
     private function getLastVisit(Visit $currentVisit): ?Visit

From a63e44156310b733ee38c76ec0ea23d621bda1ee Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Mon, 9 Sep 2019 17:47:29 +0300
Subject: [PATCH 094/183] fix style code

---
 .../VisitorsFlow/FlowAggregateService.php     | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index c67815fc..46a38171 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -54,6 +54,23 @@ public function __construct(
         $this->visitorFlowScreenRepository = $visitorFlowScreenRepository;
     }
 
+    public function aggregate(Visit $visit): void
+    {
+        $previousVisit = $this->getLastVisit($visit);
+        $isFirstInSession = $previousVisit === null;
+        $level = $this->getLevel($visit, $isFirstInSession);
+
+        $countryAggregate = $this->getCountryAggregate($visit, $level, $isFirstInSession, $previousVisit);
+        $browserAggregate = $this->getBrowserAggregate($visit, $level, $isFirstInSession, $previousVisit);
+        $deviceAggregate = $this->getDeviceAggregate($visit, $level, $isFirstInSession, $previousVisit);
+        $screenAggregate = $this->getScreenAggregate($visit, $level, $isFirstInSession, $previousVisit);
+
+        $this->updateCountryAggregate($visit, $level, $previousVisit, $countryAggregate);
+        $this->updateBrowserAggregate($visit, $level, $previousVisit, $browserAggregate);
+        $this->updateDeviceAggregate($visit, $level, $previousVisit, $deviceAggregate);
+        $this->updateScreenAggregate($visit, $level, $previousVisit, $screenAggregate);
+    }
+
     private function getLevel(Visit $visit, bool $isFirstInSession): int
     {
         if (!$isFirstInSession) {
@@ -170,24 +187,6 @@ private function updateScreenAggregate(
         $this->visitorFlowScreenRepository->update($screenAggregate);
     }
 
-
-    public function aggregate(Visit $visit)
-    {
-        $previousVisit = $this->getLastVisit($visit);
-        $isFirstInSession = $previousVisit === null;
-        $level = $this->getLevel($visit, $isFirstInSession);
-
-        $countryAggregate = $this->getCountryAggregate($visit, $level, $isFirstInSession, $previousVisit);
-        $browserAggregate = $this->getBrowserAggregate($visit, $level, $isFirstInSession, $previousVisit);
-        $deviceAggregate = $this->getDeviceAggregate($visit, $level, $isFirstInSession, $previousVisit);
-        $screenAggregate = $this->getScreenAggregate($visit, $level, $isFirstInSession, $previousVisit);
-
-        $this->updateCountryAggregate($visit, $level, $previousVisit, $countryAggregate);
-        $this->updateBrowserAggregate($visit, $level, $previousVisit, $browserAggregate);
-        $this->updateDeviceAggregate($visit, $level, $previousVisit, $deviceAggregate);
-        $this->updateScreenAggregate($visit, $level, $previousVisit, $screenAggregate);
-    }
-
     private function getLastVisit(Visit $currentVisit): ?Visit
     {
         return $this->visitRepository->findBySessionId($currentVisit->session_id)

From efec2e2f109fb3db53485ef3312b7469a803683e Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Mon, 9 Sep 2019 18:37:36 +0300
Subject: [PATCH 095/183] remove else expression from updateAggregate methods

---
 .../VisitorsFlow/FlowAggregateService.php     | 92 ++++++++++---------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 46a38171..e55573ab 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -88,22 +88,23 @@ private function updateCountryAggregate(
         if (!$countryAggregate) {
             $countryAggregate = $this->createCountryAggregate($visit, $level, $previousVisit);
             $this->visitorFlowCountryRepository->save($countryAggregate);
-        } else {
-            if ($level > 1) {
-                $previousAggregate = CountryAggregate::getPreviousAggregate(
-                    $this->visitorFlowCountryRepository,
-                    $previousVisit,
-                    $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                    $level
-                );
-                $previousAggregate->isLastPage = false;
-                $previousAggregate->exitCount--;
-                $this->visitorFlowCountryRepository->update($previousAggregate);
-            }
-            $countryAggregate->views++;
-            $countryAggregate->exitCount++;
-            $this->visitorFlowCountryRepository->update($countryAggregate);
+            return;
         }
+        if ($level > 1) {
+            $previousAggregate = CountryAggregate::getPreviousAggregate(
+                $this->visitorFlowCountryRepository,
+                $previousVisit,
+                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                $level
+            );
+            $previousAggregate->isLastPage = false;
+            $previousAggregate->exitCount--;
+            $this->visitorFlowCountryRepository->update($previousAggregate);
+        }
+        $countryAggregate->views++;
+        $countryAggregate->exitCount++;
+        $this->visitorFlowCountryRepository->update($countryAggregate);
+
     }
 
     private function updateBrowserAggregate(
@@ -115,22 +116,23 @@ private function updateBrowserAggregate(
         if (!$browserAggregate) {
             $browserAggregate = $this->createBrowserAggregate($visit, $level, $previousVisit);
             $this->visitorFlowBrowserRepository->save($browserAggregate);
-        } else {
-            if ($level > 1) {
-                $previousAggregate = BrowserAggregate::getPreviousAggregate(
-                    $this->visitorFlowBrowserRepository,
-                    $previousVisit,
-                    $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                    $level
-                );
-                $previousAggregate->isLastPage = false;
-                $previousAggregate->exitCount--;
-                $this->visitorFlowBrowserRepository->update($previousAggregate);
-            }
-            $browserAggregate->views++;
-            $browserAggregate->exitCount++;
-            $this->visitorFlowBrowserRepository->update($browserAggregate);
+            return;
+        }
+        if ($level > 1) {
+            $previousAggregate = BrowserAggregate::getPreviousAggregate(
+                $this->visitorFlowBrowserRepository,
+                $previousVisit,
+                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                $level
+            );
+            $previousAggregate->isLastPage = false;
+            $previousAggregate->exitCount--;
+            $this->visitorFlowBrowserRepository->update($previousAggregate);
         }
+        $browserAggregate->views++;
+        $browserAggregate->exitCount++;
+        $this->visitorFlowBrowserRepository->update($browserAggregate);
+
     }
 
     private function updateDeviceAggregate(
@@ -142,22 +144,22 @@ private function updateDeviceAggregate(
         if (!$deviceAggregate) {
             $deviceAggregate = $this->createDeviceAggregate($visit, $level, $previousVisit);
             $this->visitorFlowDeviceRepository->save($deviceAggregate);
-        } else {
-            if ($level > 1) {
-                $previousAggregate = DeviceAggregate::getPreviousAggregate(
-                    $this->visitorFlowDeviceRepository,
-                    $previousVisit,
-                    $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                    $level
-                );
-                $previousAggregate->isLastPage = false;
-                $previousAggregate->exitCount--;
-                $this->visitorFlowDeviceRepository->update($previousAggregate);
-            }
-            $deviceAggregate->views++;
-            $deviceAggregate->exitCount++;
-            $this->visitorFlowDeviceRepository->update($deviceAggregate);
+            return;
+        }
+        if ($level > 1) {
+            $previousAggregate = DeviceAggregate::getPreviousAggregate(
+                $this->visitorFlowDeviceRepository,
+                $previousVisit,
+                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                $level
+            );
+            $previousAggregate->isLastPage = false;
+            $previousAggregate->exitCount--;
+            $this->visitorFlowDeviceRepository->update($previousAggregate);
         }
+        $deviceAggregate->views++;
+        $deviceAggregate->exitCount++;
+        $this->visitorFlowDeviceRepository->update($deviceAggregate);
     }
 
     private function updateScreenAggregate(

From 4236b0191a6f00a7c74e6a4f6cdac5b7503a349f Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Mon, 9 Sep 2019 18:42:56 +0300
Subject: [PATCH 096/183] remove unnecessary empty rows

---
 backend/app/Services/VisitorsFlow/FlowAggregateService.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index e55573ab..3ceb0410 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -104,7 +104,6 @@ private function updateCountryAggregate(
         $countryAggregate->views++;
         $countryAggregate->exitCount++;
         $this->visitorFlowCountryRepository->update($countryAggregate);
-
     }
 
     private function updateBrowserAggregate(
@@ -132,7 +131,6 @@ private function updateBrowserAggregate(
         $browserAggregate->views++;
         $browserAggregate->exitCount++;
         $this->visitorFlowBrowserRepository->update($browserAggregate);
-
     }
 
     private function updateDeviceAggregate(

From f5b42bd2696e2cb3e22281249583097494f5d0f5 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Mon, 9 Sep 2019 21:10:02 +0300
Subject: [PATCH 097/183] add change password page

---
 .../MailResetPasswordNotification.php             |  2 +-
 frontend/src/pages/ChangePassword.vue             | 15 +++++++++++++++
 frontend/src/plugins/router.js                    |  6 ++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/pages/ChangePassword.vue

diff --git a/backend/app/Notifications/MailResetPasswordNotification.php b/backend/app/Notifications/MailResetPasswordNotification.php
index 78048ff5..dc3140c2 100644
--- a/backend/app/Notifications/MailResetPasswordNotification.php
+++ b/backend/app/Notifications/MailResetPasswordNotification.php
@@ -24,7 +24,7 @@ public function via($notifiable)
 
     public function toMail($notifiable)
     {
-        $link = url("/reset-password/".$this->token);
+        $link = url("/change-password/?token={$this->token}");
         return (new MailMessage)
             ->subject('Reset Password Notification')
             ->line("Hello! You are receiving this email because we received a password reset request for your account.")
diff --git a/frontend/src/pages/ChangePassword.vue b/frontend/src/pages/ChangePassword.vue
new file mode 100644
index 00000000..3b3c3b36
--- /dev/null
+++ b/frontend/src/pages/ChangePassword.vue
@@ -0,0 +1,15 @@
+<template>
+    <div>
+        hwllo! moto
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "ChangePassword"
+    };
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/frontend/src/plugins/router.js b/frontend/src/plugins/router.js
index 6bb083a1..3aba20c7 100644
--- a/frontend/src/plugins/router.js
+++ b/frontend/src/plugins/router.js
@@ -26,6 +26,7 @@ import GeoLocation from "../pages/GeoLocationPage";
 import ErrorReports from "../pages/speed_overview/ErrorReports";
 import Behavior from "../pages/Behavior";
 import VisitorsFlow from "../pages/VisitorsFlow";
+import ChangePassword from "../pages/ChangePassword";
 
 const originalPush = Router.prototype.push;
 Router.prototype.push = function push(location, onResolve, onReject) {
@@ -76,6 +77,11 @@ export default new Router({
                     name: 'reset-password',
                     component: ResetPassword,
                 },
+                {
+                    path: 'change-password/',
+                    name: 'change-password',
+                    component: ChangePassword,
+                },
                 {
                     path: '/auth/social/:provider',
                     name: 'social-auth',

From 0670e3c0db10023fbaa659cbe3cc54dcc476bb96 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Sun, 8 Sep 2019 13:38:33 +0300
Subject: [PATCH 098/183] remove vertical scroll on the home page

---
 frontend/src/pages/Home.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/pages/Home.vue b/frontend/src/pages/Home.vue
index ed3d0251..aa2b81db 100644
--- a/frontend/src/pages/Home.vue
+++ b/frontend/src/pages/Home.vue
@@ -5,6 +5,7 @@
                 left-col-wrapper
                 sm12
                 md6
+                :class="{'mt-12': $vuetify.breakpoint.smAndDown}"
             >
                 <VLayout
                     column
@@ -38,6 +39,8 @@
                 image
                 sm12
                 md6
+                :class="{'mt-12': $vuetify.breakpoint.smAndDown}"
+                class="d-flex align-center"
             >
                 <VImg
                     src="/assets/images/home.png"
@@ -60,7 +63,6 @@
 
 main {
     background: #FFFFFF;
-    margin-top: 40px;
 }
 
 .v-btn {
@@ -84,10 +86,6 @@ main {
     }
 }
 
-.left-col-wrapper {
-    padding-left: 10%;
-}
-
 
 h1{
     font-family: Gilroy;
@@ -98,6 +96,8 @@ h1{
 
 .left-col {
     height: 100%;
+    width: 80%;
+    margin: 0 auto;
     background: #FFFFFF;
 }
 

From 22bf6c29ac4a8dcff979d386253dbecd00f5d332 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Sun, 8 Sep 2019 13:45:05 +0300
Subject: [PATCH 099/183] add transp. bg to sign up btn on login page

---
 frontend/src/components/auth/LoginForm.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/components/auth/LoginForm.vue b/frontend/src/components/auth/LoginForm.vue
index 405ceef1..f96e7a9f 100644
--- a/frontend/src/components/auth/LoginForm.vue
+++ b/frontend/src/components/auth/LoginForm.vue
@@ -166,6 +166,9 @@
             margin-bottom: 20px;
             display: flex;
             justify-content: flex-start;
+            .v-btn:last-child {
+                background-color: transparent;
+            }
         }
     }
 </style>

From ab23bbd2b90bc52280b6bbe14c088c2a1bc20fc3 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Mon, 9 Sep 2019 08:06:47 +0300
Subject: [PATCH 100/183] increase line chart area

---
 frontend/src/components/common/LineChart.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/common/LineChart.vue b/frontend/src/components/common/LineChart.vue
index c9b63df4..8ffd2011 100644
--- a/frontend/src/components/common/LineChart.vue
+++ b/frontend/src/components/common/LineChart.vue
@@ -46,10 +46,11 @@
         },
         data() {
             return {
-                chartArea: {
-                    width: '90%'
-                },
                 chartOptions: {
+                    chartArea: {
+                        width: '95%',
+                        height: '75%'
+                    },
                     tooltip: {
                         isHtml: true,
                         ignoreBounds: true,
@@ -101,6 +102,9 @@
                             fontSize: 12,
                             lineHeight: 14,
                             letterSpacing: 0.533333,
+                        },
+                        gridlines: {
+                            color: '#edf2fa'
                         }
                     }
                 },

From ad7452b03e94fe6d3e48a177fba55ca1da27a70d Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Mon, 9 Sep 2019 08:28:12 +0300
Subject: [PATCH 101/183] rename quartal->quarter, return visitors->returning
 visitors

---
 .../src/components/dashboard/common/PeriodDropdown.vue    | 2 +-
 .../dashboard/common/VisitsDensityPeriodDropdown.vue      | 2 +-
 frontend/src/pages/Visitors.vue                           | 8 ++++----
 frontend/src/services/periodService.js                    | 4 ++--
 frontend/src/store/modules/visitors/actions.js            | 6 +++---
 frontend/src/store/modules/visitors/mutations.js          | 4 ++--
 frontend/src/store/modules/visitors/state.js              | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/dashboard/common/PeriodDropdown.vue b/frontend/src/components/dashboard/common/PeriodDropdown.vue
index 94fe7dae..5a87862f 100644
--- a/frontend/src/components/dashboard/common/PeriodDropdown.vue
+++ b/frontend/src/components/dashboard/common/PeriodDropdown.vue
@@ -28,7 +28,7 @@
                         {title: 'Yesterday', value: period.PERIOD_YESTERDAY},
                         {title: 'Last 7 days', value: period.PERIOD_LAST_WEEK},
                         {title: 'Last month', value: period.PERIOD_LAST_MONTH},
-                        {title: 'Last quartal', value: period.PERIOD_LAST_QUARTAL},
+                        {title: 'Last quarter', value: period.PERIOD_LAST_QUARTER},
                         {title: 'All period', value: period.PERIOD_ALL}
                     ];
                 }
diff --git a/frontend/src/components/dashboard/common/VisitsDensityPeriodDropdown.vue b/frontend/src/components/dashboard/common/VisitsDensityPeriodDropdown.vue
index f9182f01..55efcb30 100644
--- a/frontend/src/components/dashboard/common/VisitsDensityPeriodDropdown.vue
+++ b/frontend/src/components/dashboard/common/VisitsDensityPeriodDropdown.vue
@@ -26,7 +26,7 @@
                     return [
                         {title: 'Last 7 days', value: period.PERIOD_LAST_WEEK},
                         {title: 'Last month', value: period.PERIOD_LAST_MONTH},
-                        {title: 'Last quartal', value: period.PERIOD_LAST_QUARTAL},
+                        {title: 'Last quarter', value: period.PERIOD_LAST_QUARTER},
                         {title: 'All period', value: period.PERIOD_ALL}
                     ];
                 }
diff --git a/frontend/src/pages/Visitors.vue b/frontend/src/pages/Visitors.vue
index 103725c5..80fcb649 100644
--- a/frontend/src/pages/Visitors.vue
+++ b/frontend/src/pages/Visitors.vue
@@ -153,7 +153,7 @@
                 return [
                     ['Type', 'Value'],
                     ['New Visitors', this.pieChartData.newVisitors],
-                    ['Return Visitors',this.pieChartData.returnVisitors]
+                    ['Returning Visitors',this.pieChartData.returningVisitors]
                 ];
             },
             legend () {
@@ -165,9 +165,9 @@
                             percentageDiff: Number(this.pieChartData.newVisitors),
                             color: '#3C57DE',
                         },
-                        returnVisitors: {
-                            title: 'Return Visitors',
-                            percentageDiff: Number(this.pieChartData.returnVisitors),
+                        returningVisitors: {
+                            title: 'Returning Visitors',
+                            percentageDiff: Number(this.pieChartData.returningVisitors),
                             color: '#1BC3DA',
                         },
                     }
diff --git a/frontend/src/services/periodService.js b/frontend/src/services/periodService.js
index ca8e335f..c5bbe9a9 100644
--- a/frontend/src/services/periodService.js
+++ b/frontend/src/services/periodService.js
@@ -5,7 +5,7 @@ export const period = {
     PERIOD_YESTERDAY: 'yesterday',
     PERIOD_LAST_WEEK: 'last_week',
     PERIOD_LAST_MONTH: 'last_month',
-    PERIOD_LAST_QUARTAL: 'last_quartal',
+    PERIOD_LAST_QUARTER: 'last_quarter',
     PERIOD_ALL: 'all_period',
 };
 
@@ -62,7 +62,7 @@ export const getTimeByPeriod = (value) => {
             startDate = getSubtractStartMonth(1);
             endDate = currentDate();
             break;
-        case period.PERIOD_LAST_QUARTAL:
+        case period.PERIOD_LAST_QUARTER:
             interval = getDayInterval(30);
             startDate = getSubtractStartMonth(3);
             endDate = currentDate();
diff --git a/frontend/src/store/modules/visitors/actions.js b/frontend/src/store/modules/visitors/actions.js
index 8f58348f..da401b5d 100644
--- a/frontend/src/store/modules/visitors/actions.js
+++ b/frontend/src/store/modules/visitors/actions.js
@@ -120,7 +120,7 @@ export default {
         let newVisitors = 0;
         let totalVisitors = 0;
         let newVisitorsValue = 0;
-        let returnVisitorsValue = 0;
+        let returningVisitorsValue = 0;
 
         return newVisitorsService.fetchButtonValue(startDate.unix(), endDate.unix())
             .then(response => {
@@ -130,11 +130,11 @@ export default {
                         totalVisitors = response.value || 0;
                        if (totalVisitors > 0) {
                             newVisitorsValue = newVisitors/totalVisitors*100;
-                            returnVisitorsValue = 100 - newVisitorsValue;
+                            returningVisitorsValue = 100 - newVisitorsValue;
                         }
                         let payload = {
                             newVisitors: newVisitorsValue,
-                            returnVisitors: returnVisitorsValue
+                            returningVisitors: returningVisitorsValue
                         };
                         context.commit(SET_CHART_PIE_DATA, payload);
                         context.commit(RESET_CHART_DATA_FETCHING);
diff --git a/frontend/src/store/modules/visitors/mutations.js b/frontend/src/store/modules/visitors/mutations.js
index 27ec67a0..6b19d8a9 100644
--- a/frontend/src/store/modules/visitors/mutations.js
+++ b/frontend/src/store/modules/visitors/mutations.js
@@ -54,9 +54,9 @@ export default {
     [RESET_TABLE_FETCHING]: (state) => {
         state.tableData.isFetching = false;
     },
-    [SET_CHART_PIE_DATA]: (state, {newVisitors, returnVisitors}) => {
+    [SET_CHART_PIE_DATA]: (state, {newVisitors, returningVisitors}) => {
         state.pieChartData.newVisitors = newVisitors;
-        state.pieChartData.returnVisitors = returnVisitors;
+        state.pieChartData.returningVisitors = returningVisitors;
     },
     [SET_CHART_DATA_FETCHING]: (state) => {
         state.pieChartData.isFetching = true;
diff --git a/frontend/src/store/modules/visitors/state.js b/frontend/src/store/modules/visitors/state.js
index 2fad1cbf..7e9b00ce 100644
--- a/frontend/src/store/modules/visitors/state.js
+++ b/frontend/src/store/modules/visitors/state.js
@@ -42,7 +42,7 @@ export default {
     },
     pieChartData: {
         newVisitors: 50,
-        returnVisitors: 50,
+        returningVisitors: 50,
         isFetching: false
     },
     activeButton: TOTAL_VISITORS,

From 171ee942f9353faef811c1a5cb45780c4bb364d6 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Mon, 9 Sep 2019 21:23:01 +0300
Subject: [PATCH 102/183] remove fixed width from the active users card button

---
 frontend/src/components/dashboard/home/ActiveVisitorsCard.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
index 4aa880c7..e0aef27d 100644
--- a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
+++ b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
@@ -170,7 +170,6 @@
         }
         .card-button {
             height: 32px;
-            width: 126px;
             background: #3C57DE;
             color:#ffffff;
             font-size: 12px;

From ebfd3c0ac7196e5ac321919dc197f1dce02f5ff1 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Mon, 9 Sep 2019 21:32:31 +0300
Subject: [PATCH 103/183] set fixed height on the line chart component

---
 frontend/src/components/common/LineChart.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/common/LineChart.vue b/frontend/src/components/common/LineChart.vue
index 8ffd2011..9f14eadd 100644
--- a/frontend/src/components/common/LineChart.vue
+++ b/frontend/src/components/common/LineChart.vue
@@ -1,5 +1,5 @@
 <template>
-    <VContainer>
+    <VContainer class="chart-container">
         <Spinner
             v-if="isFetching"
         />
@@ -48,7 +48,7 @@
             return {
                 chartOptions: {
                     chartArea: {
-                        width: '95%',
+                        width: '93%',
                         height: '75%'
                     },
                     tooltip: {
@@ -139,6 +139,9 @@
     };
 </script>
 <style lang="scss" scoped>
+    .chart-container {
+        height: 224px;
+    }
     ::v-deep svg path {
         fill: none;
     }

From bd44619414b1f20ca333de4d91636fab2ad9365f Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Mon, 9 Sep 2019 21:35:14 +0300
Subject: [PATCH 104/183] remove redundant code

---
 .../ErrorReport/GetErrorTableItemsAction.php  | 11 +------
 .../ErrorReport/GetErrorTableItemsRequest.php |  2 +-
 backend/app/Rules/ErrorTableParameter.php     |  8 ++---
 backend/tests/Feature/TableErrorTest.php      | 32 ++++++++-----------
 4 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/backend/app/Actions/ErrorReport/GetErrorTableItemsAction.php b/backend/app/Actions/ErrorReport/GetErrorTableItemsAction.php
index 2c7779de..37ced28d 100644
--- a/backend/app/Actions/ErrorReport/GetErrorTableItemsAction.php
+++ b/backend/app/Actions/ErrorReport/GetErrorTableItemsAction.php
@@ -9,10 +9,6 @@
 
 class GetErrorTableItemsAction
 {
-    const COUNTRY = 'country';
-    const BROWSER = 'browser';
-    const PAGE = 'page';
-
     private $repository;
 
     public function __construct(ErrorReportRepository $repository)
@@ -23,14 +19,9 @@ public function __construct(ErrorReportRepository $repository)
     public function execute(GetErrorTableItemsRequest $request): GetErrorTableItemsResponse
     {
         $period = $request->period();
-        $parameter = $request->parameter();
         $website_id = Auth::user()->website->id;
 
-        switch ($parameter) {
-            case self::PAGE:
-                $errors = $this->repository->getErrorItemsGroupByPage($website_id, $period);
-                break;
-        }
+        $errors = $this->repository->getErrorItemsGroupByPage($website_id, $period);
 
         return new GetErrorTableItemsResponse($errors);
     }
diff --git a/backend/app/Actions/ErrorReport/GetErrorTableItemsRequest.php b/backend/app/Actions/ErrorReport/GetErrorTableItemsRequest.php
index 361d11e8..e958fa34 100644
--- a/backend/app/Actions/ErrorReport/GetErrorTableItemsRequest.php
+++ b/backend/app/Actions/ErrorReport/GetErrorTableItemsRequest.php
@@ -9,7 +9,7 @@
 
 class GetErrorTableItemsRequest extends TableDataRequest
 {
-    public static function fromRequest(GetErrorTableItemsHttpRequest $request)
+    public static function fromRequest(GetErrorTableItemsHttpRequest $request): self
     {
         return new static (
             $request->startDate(),
diff --git a/backend/app/Rules/ErrorTableParameter.php b/backend/app/Rules/ErrorTableParameter.php
index 6d4d3efe..5437a23e 100644
--- a/backend/app/Rules/ErrorTableParameter.php
+++ b/backend/app/Rules/ErrorTableParameter.php
@@ -8,15 +8,11 @@
 
 final class ErrorTableParameter implements Rule
 {
-    private const AVAILABLE_PARAMETERS = [
-        'country',
-        'page',
-        'browser',
-    ];
+    private const AVAILABLE_PARAMETER = 'page';
 
     public function passes($attribute, $value): bool
     {
-        return in_array($value, self::AVAILABLE_PARAMETERS);
+        return $value === self::AVAILABLE_PARAMETER;
     }
 
     public function message(): string
diff --git a/backend/tests/Feature/TableErrorTest.php b/backend/tests/Feature/TableErrorTest.php
index 7744842d..9c6b9bd3 100644
--- a/backend/tests/Feature/TableErrorTest.php
+++ b/backend/tests/Feature/TableErrorTest.php
@@ -15,9 +15,7 @@ class TableErrorTest extends TestCase
     const DATE_FROM = '2019-08-20 00:00:00';
     const DATE_TO = '2019-08-24 23:59:59';
     const ENDPOINT = 'api/v1/errors/table-items';
-    const PARAMETERS = [
-        'page',
-    ];
+    const PARAMETER = 'page';
     const RESPONSE_STRUCTURE = [
         'data' => [
             '*' => [
@@ -45,23 +43,21 @@ public function setUp(): void
     }
     public function testGetErrorsByParameterAction()
     {
-        foreach (self::PARAMETERS as $parameter) {
-            $query = [
-                'filter' => [
-                    'startDate' => (string) $this->fromTimeStamp,
-                    'endDate' => (string) $this->toTimeStamp,
-                    'parameter' => $parameter
-                ]
-            ];
+        $query = [
+            'filter' => [
+                'startDate' => (string) $this->fromTimeStamp,
+                'endDate' => (string) $this->toTimeStamp,
+                'parameter' => self::PARAMETER
+            ]
+        ];
 
-            $result = $this->actingAs($this->user)
-                ->json('GET', self::ENDPOINT, $query)
-                ->assertStatus(200)
-                ->assertJsonStructure(self::RESPONSE_STRUCTURE)
-                ->json();
+        $result = $this->actingAs($this->user)
+            ->json('GET', self::ENDPOINT, $query)
+            ->assertStatus(200)
+            ->assertJsonStructure(self::RESPONSE_STRUCTURE)
+            ->json();
 
-            $this->assertNotEmpty($result);
-        }
+        $this->assertNotEmpty($result);
     }
 
     public function testFailedGetErrorsByParameterAction()

From 72cf2993820aa1e774bba4e70782489812b34370 Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Mon, 9 Sep 2019 21:41:57 +0300
Subject: [PATCH 105/183] add strict types

---
 backend/app/Http/Controllers/Api/ErrorReportController.php      | 2 ++
 .../Contracts/ErrorReport/ErrorReportRepository.php             | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/backend/app/Http/Controllers/Api/ErrorReportController.php b/backend/app/Http/Controllers/Api/ErrorReportController.php
index a4e429b3..99947c96 100644
--- a/backend/app/Http/Controllers/Api/ErrorReportController.php
+++ b/backend/app/Http/Controllers/Api/ErrorReportController.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Http\Controllers\Api;
 
 use App\Http\Controllers\Controller;
diff --git a/backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php b/backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php
index 3c0f87a7..fdb2d54a 100644
--- a/backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php
+++ b/backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Repositories\Contracts\ErrorReport;
 
 use App\Entities\Error;

From 8575f4de33628297d290c1bf52f41dec9e18e1b4 Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Mon, 9 Sep 2019 21:44:42 +0300
Subject: [PATCH 106/183] add endpoint get count errors pre period

---
 .../GetChartErrorByDateRangeAction.php        |  38 +++++
 .../GetChartErrorByDateRangeRequest.php       |  20 +++
 .../GetChartErrorByDateRangeResponse.php      |  22 +++
 .../ErrorReport/ChartCountErrors.php          |  22 +++
 .../Controllers/Api/ErrorReportController.php |  31 +++++
 .../GetChartErrorByDateRangeHttpRequest.php   |  13 ++
 .../ErrorReport/ErrorReportRepository.php     |   8 ++
 .../EloquentErrorReportRepository.php         |  46 ++++++
 backend/routes/api.php                        |   6 +
 backend/tests/Feature/ChartErrorsApiTest.php  | 131 ++++++++++++++++++
 10 files changed, 337 insertions(+)
 create mode 100644 backend/app/Actions/ErrorReport/GetChartErrorByDateRangeAction.php
 create mode 100644 backend/app/Actions/ErrorReport/GetChartErrorByDateRangeRequest.php
 create mode 100644 backend/app/Actions/ErrorReport/GetChartErrorByDateRangeResponse.php
 create mode 100644 backend/app/DataTransformer/ErrorReport/ChartCountErrors.php
 create mode 100644 backend/app/Http/Controllers/Api/ErrorReportController.php
 create mode 100644 backend/app/Http/Requests/ErrorReport/GetChartErrorByDateRangeHttpRequest.php
 create mode 100644 backend/tests/Feature/ChartErrorsApiTest.php

diff --git a/backend/app/Actions/ErrorReport/GetChartErrorByDateRangeAction.php b/backend/app/Actions/ErrorReport/GetChartErrorByDateRangeAction.php
new file mode 100644
index 00000000..536c325a
--- /dev/null
+++ b/backend/app/Actions/ErrorReport/GetChartErrorByDateRangeAction.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\ErrorReport;
+
+use App\Repositories\Contracts\ErrorReport\ErrorReportRepository;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Auth;
+
+final class GetChartErrorByDateRangeAction
+{
+    private $repository;
+
+    public function __construct(ErrorReportRepository $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    public function execute(GetChartErrorByDateRangeRequest $request): GetChartErrorByDateRangeResponse
+    {
+        $startData = Carbon::createFromTimestampUTC(
+            $request->period()->getStartDate()->getTimestamp()
+        )->toDateTimeString();
+
+        $endData = Carbon::createFromTimestampUTC(
+            $request->period()->getEndDate()->getTimestamp()
+        )->toDateTimeString();
+
+        $response = $this->repository->getErrorsCountByDate(
+            $startData,
+            $endData,
+            $request->interval(),
+            Auth::user()->website->id
+        );
+        return new GetChartErrorByDateRangeResponse($response);
+    }
+}
diff --git a/backend/app/Actions/ErrorReport/GetChartErrorByDateRangeRequest.php b/backend/app/Actions/ErrorReport/GetChartErrorByDateRangeRequest.php
new file mode 100644
index 00000000..12480786
--- /dev/null
+++ b/backend/app/Actions/ErrorReport/GetChartErrorByDateRangeRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\ErrorReport;
+
+use App\Actions\ChartDataRequest;
+use App\Http\Requests\ErrorReport\GetChartErrorByDateRangeHttpRequest;
+
+final class GetChartErrorByDateRangeRequest extends ChartDataRequest
+{
+    public static function fromRequest(GetChartErrorByDateRangeHttpRequest $request): self
+    {
+        return new static(
+            $request->getStartDate(),
+            $request->getEndDate(),
+            $request->getPeriod()
+        );
+    }
+}
diff --git a/backend/app/Actions/ErrorReport/GetChartErrorByDateRangeResponse.php b/backend/app/Actions/ErrorReport/GetChartErrorByDateRangeResponse.php
new file mode 100644
index 00000000..d48b569b
--- /dev/null
+++ b/backend/app/Actions/ErrorReport/GetChartErrorByDateRangeResponse.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\ErrorReport;
+
+use Illuminate\Support\Collection;
+
+final class GetChartErrorByDateRangeResponse
+{
+    private $errorsByDateRange;
+
+    public function __construct(Collection $errorsByDateRange)
+    {
+        $this->errorsByDateRange = $errorsByDateRange;
+    }
+
+    public function getErrorCountByDateRange(): Collection
+    {
+        return $this->errorsByDateRange;
+    }
+}
diff --git a/backend/app/DataTransformer/ErrorReport/ChartCountErrors.php b/backend/app/DataTransformer/ErrorReport/ChartCountErrors.php
new file mode 100644
index 00000000..15bfeeb5
--- /dev/null
+++ b/backend/app/DataTransformer/ErrorReport/ChartCountErrors.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\DataTransformer\ErrorReport;
+
+use App\Contracts\ChartValue;
+use App\DataTransformer\Traits\ChartValueTrait;
+
+final class ChartCountErrors implements ChartValue
+{
+    use ChartValueTrait;
+
+    private $date;
+    private $value;
+
+    public function __construct(string $date, int $count)
+    {
+        $this->date = $date;
+        $this->value = $count;
+    }
+}
diff --git a/backend/app/Http/Controllers/Api/ErrorReportController.php b/backend/app/Http/Controllers/Api/ErrorReportController.php
new file mode 100644
index 00000000..fd261112
--- /dev/null
+++ b/backend/app/Http/Controllers/Api/ErrorReportController.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Api;
+
+use App\Actions\ErrorReport\GetChartErrorByDateRangeAction;
+use App\Actions\ErrorReport\GetChartErrorByDateRangeRequest;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\ErrorReport\GetChartErrorByDateRangeHttpRequest;
+use App\Http\Resources\ChartResource;
+use App\Http\Response\ApiResponse;
+
+final class ErrorReportController extends Controller
+{
+    private $getChartErrorByDateRangeAction;
+
+    public function __construct(
+        GetChartErrorByDateRangeAction $getChartErrorByDateRangeAction
+    ) {
+        $this->getChartErrorByDateRangeAction = $getChartErrorByDateRangeAction;
+    }
+
+    public function getErrorsCountByDateRange(GetChartErrorByDateRangeHttpRequest $request): ApiResponse
+    {
+        $response = $this->getChartErrorByDateRangeAction->execute(
+            GetChartErrorByDateRangeRequest::fromRequest($request));
+
+        return ApiResponse::success(new ChartResource($response->getErrorCountByDateRange()));
+    }
+}
diff --git a/backend/app/Http/Requests/ErrorReport/GetChartErrorByDateRangeHttpRequest.php b/backend/app/Http/Requests/ErrorReport/GetChartErrorByDateRangeHttpRequest.php
new file mode 100644
index 00000000..50e41aa1
--- /dev/null
+++ b/backend/app/Http/Requests/ErrorReport/GetChartErrorByDateRangeHttpRequest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\ErrorReport;
+
+use App\Http\Request\ApiFormRequest;
+use App\Http\Requests\ChartHttpRequestTrait;
+
+final class GetChartErrorByDateRangeHttpRequest extends ApiFormRequest
+{
+    use ChartHttpRequestTrait;
+}
diff --git a/backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php b/backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php
index d6fcef6d..74b9c19a 100644
--- a/backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php
+++ b/backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php
@@ -2,9 +2,17 @@
 
 namespace App\Repositories\Contracts\ErrorReport;
 
+use Illuminate\Support\Collection;
 use App\Entities\Error;
 
 interface ErrorReportRepository
 {
     public function save(Error $visitor): Error;
+
+    public function getErrorsCountByDate(
+        string $startData,
+        string $endData,
+        string $interval,
+        int $websiteId
+    ): Collection;
 }
diff --git a/backend/app/Repositories/EloquentErrorReportRepository.php b/backend/app/Repositories/EloquentErrorReportRepository.php
index 2e556902..1cdbf524 100644
--- a/backend/app/Repositories/EloquentErrorReportRepository.php
+++ b/backend/app/Repositories/EloquentErrorReportRepository.php
@@ -4,8 +4,11 @@
 
 namespace App\Repositories;
 
+use App\DataTransformer\ErrorReport\ChartCountErrors;
 use App\Entities\Error;
 use App\Repositories\Contracts\ErrorReport\ErrorReportRepository;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
 
 final class EloquentErrorReportRepository implements ErrorReportRepository
 {
@@ -14,4 +17,47 @@ public function save(Error $error): Error
         $error->save();
         return $error;
     }
+
+    public function getErrorsCountByDate(
+        string $startData,
+        string $endData,
+        string $interval,
+        int $websiteId
+    ): Collection
+    {
+
+        $subQuerySecond = "SELECT errors.*, 
+        ( " . $this->getPeriod('errors.created_at', $interval) . ") as period FROM errors  
+        LEFT JOIN pages  ON pages.id = errors.page_id
+        WHERE errors.created_at >= :startData and errors.created_at <= :endData 
+        AND website_id = :website_id";
+
+        $query = DB::raw("SELECT COUNT(*), period from ($subQuerySecond) as periods group by period");
+
+        $response = DB::select((string)$query, [
+            'startData' => $startData,
+            'endData' => $endData,
+            'website_id' => $websiteId
+        ]);
+
+        return collect($response)->map(function ($item) {
+            return new ChartCountErrors($item->period, $item->count);
+        });
+    }
+
+    private function toTimestamp(string $columnName): string
+    {
+        return "extract(epoch from $columnName)";
+    }
+
+    private function toNumeric(string $expression): string
+    {
+        return $expression . "::numeric";
+    }
+
+    private function getPeriod(string $columnName, $period): string
+    {
+        return $this->toNumeric($this->toTimestamp($columnName)) . "-( " .
+            $this->toNumeric($this->toTimestamp($columnName)) . " %" . $period . ")";
+    }
 }
diff --git a/backend/routes/api.php b/backend/routes/api.php
index 0a3a287e..a9a6f523 100644
--- a/backend/routes/api.php
+++ b/backend/routes/api.php
@@ -150,6 +150,12 @@
         Route::get('/geo-location-items', 'GeoLocationController');
 
         Route::get('/table-page-views', 'VisitController@getPageViewsItems');
+
+        Route::group([
+            'prefix' => 'errors'
+        ], function () {
+            Route::get('/count', 'ErrorReportController@getErrorsCountByDateRange');
+        });
     });
 
     Route::group([
diff --git a/backend/tests/Feature/ChartErrorsApiTest.php b/backend/tests/Feature/ChartErrorsApiTest.php
new file mode 100644
index 00000000..24471965
--- /dev/null
+++ b/backend/tests/Feature/ChartErrorsApiTest.php
@@ -0,0 +1,131 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Feature;
+
+use App\Entities\Error;
+use App\Entities\GeoPosition;
+use App\Entities\Page;
+use App\Entities\Session;
+use App\Entities\System;
+use App\Entities\Visit;
+use App\Entities\User;
+use App\Entities\Visitor;
+use App\Entities\Website;
+use Carbon\Carbon;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class ChartErrorsApiTest extends TestCase
+{
+    use RefreshDatabase;
+
+    private $user;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->user = factory(User::class)->create();
+
+        factory(Website::class)->create([
+            'id' => 1
+        ]);
+        factory(Website::class)->create([
+            'id' => 2
+        ]);
+        factory(Website::class)->create([
+            'id' => 3
+        ]);
+        factory(Website::class)->create([
+            'id' => 4
+        ]);
+        factory(Page::class)->create([
+            'id' => 1,
+            'website_id' => 1
+        ]);
+        factory(Page::class)->create([
+            'id' => 2,
+            'website_id' => 2
+        ]);
+        factory(Visitor::class)->create();
+        factory(Page::class)->create([
+            'id' => 3,
+            'website_id' => 3
+        ]);
+        factory(Page::class)->create([
+            'id' => 4,
+            'website_id' => 4
+        ]);
+        factory(GeoPosition::class)->create();
+        factory(System::class)->create();
+        factory(Session::class)->create();
+        factory(Visit::class)->create();
+    }
+
+    public function testGetCountErrorByDateRange()
+    {
+
+
+        $firstDate = Carbon::create(2019, 6, 23, 12, 12, 12)->toDateTime();
+        $secondDate = Carbon::create(2019, 7, 10, 12, 12, 12)->toDateTime();
+        $thirdDate = Carbon::create(2019, 7, 19, 12, 12, 12)->toDateTime();
+        $fourthDate = Carbon::create(2019, 8, 1, 12, 12, 12)->toDateTime();
+        $fifthDate = Carbon::create(2019, 8, 15, 12, 12, 12)->toDateTime();
+
+        factory(Error::class)->create([
+            'created_at' => $firstDate,
+            'page_id'=>1
+        ]);
+        factory(Error::class)->create([
+            'created_at' => $secondDate,
+            'page_id'=>2
+        ]);
+        factory(Error::class)->create([
+            'created_at' => $secondDate,
+            'page_id'=>1
+        ]);
+        factory(Error::class)->create([
+            'created_at' => $thirdDate,
+            'page_id'=>1
+        ]);
+        factory(Error::class)->create([
+            'created_at' => $fourthDate,
+            'page_id'=>1
+        ]);
+
+
+        $filterData = [
+            'filter' => [
+                'startDate' => (string)$firstDate->getTimestamp(),
+                'endDate' => (string)$fifthDate->getTimestamp(),
+                'period' => '86400'
+            ]
+        ];
+
+        $this->actingAs($this->user)
+            ->call('GET', 'api/v1/errors/count', $filterData)
+            ->assertStatus(200)
+            ->assertJson([
+                "data" => [
+                    [
+                        "date" => "1561248000",
+                        "value" => "1"
+                    ],
+                    [
+                        "date" => "1562716800",
+                        "value" => "1"
+                    ],
+                    [
+                        "date" => "1563494400",
+                        "value" => "1"
+                    ],
+                    [
+                        "date" => "1564617600",
+                        "value" => "1"
+                    ]
+                ],
+                "meta" => []
+            ]);
+    }
+}

From ba7533bf394d5b3ab7f32c55621bfbd2e402b8e2 Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Mon, 9 Sep 2019 21:46:20 +0300
Subject: [PATCH 107/183] edit style code

---
 backend/app/Repositories/EloquentErrorReportRepository.php | 3 +--
 backend/tests/Feature/ChartErrorsApiTest.php               | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/backend/app/Repositories/EloquentErrorReportRepository.php b/backend/app/Repositories/EloquentErrorReportRepository.php
index 1cdbf524..32fe418d 100644
--- a/backend/app/Repositories/EloquentErrorReportRepository.php
+++ b/backend/app/Repositories/EloquentErrorReportRepository.php
@@ -23,8 +23,7 @@ public function getErrorsCountByDate(
         string $endData,
         string $interval,
         int $websiteId
-    ): Collection
-    {
+    ): Collection {
 
         $subQuerySecond = "SELECT errors.*, 
         ( " . $this->getPeriod('errors.created_at', $interval) . ") as period FROM errors  
diff --git a/backend/tests/Feature/ChartErrorsApiTest.php b/backend/tests/Feature/ChartErrorsApiTest.php
index 24471965..f482f549 100644
--- a/backend/tests/Feature/ChartErrorsApiTest.php
+++ b/backend/tests/Feature/ChartErrorsApiTest.php
@@ -65,8 +65,6 @@ protected function setUp(): void
 
     public function testGetCountErrorByDateRange()
     {
-
-
         $firstDate = Carbon::create(2019, 6, 23, 12, 12, 12)->toDateTime();
         $secondDate = Carbon::create(2019, 7, 10, 12, 12, 12)->toDateTime();
         $thirdDate = Carbon::create(2019, 7, 19, 12, 12, 12)->toDateTime();

From 8b3d05a042a502414f83d878754bda21d160793f Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Mon, 9 Sep 2019 21:46:54 +0300
Subject: [PATCH 108/183] edit style code

---
 backend/app/Repositories/EloquentErrorReportRepository.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/app/Repositories/EloquentErrorReportRepository.php b/backend/app/Repositories/EloquentErrorReportRepository.php
index 32fe418d..255585bc 100644
--- a/backend/app/Repositories/EloquentErrorReportRepository.php
+++ b/backend/app/Repositories/EloquentErrorReportRepository.php
@@ -24,7 +24,6 @@ public function getErrorsCountByDate(
         string $interval,
         int $websiteId
     ): Collection {
-
         $subQuerySecond = "SELECT errors.*, 
         ( " . $this->getPeriod('errors.created_at', $interval) . ") as period FROM errors  
         LEFT JOIN pages  ON pages.id = errors.page_id

From faf46cb2b3db1e4f1fef47c86bcac35fd2127eef Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Mon, 9 Sep 2019 21:58:06 +0300
Subject: [PATCH 109/183] center no data to display message in the component

---
 frontend/src/components/common/LineChart.vue | 22 +++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/common/LineChart.vue b/frontend/src/components/common/LineChart.vue
index 9f14eadd..4fdd421b 100644
--- a/frontend/src/components/common/LineChart.vue
+++ b/frontend/src/components/common/LineChart.vue
@@ -3,16 +3,13 @@
         <Spinner
             v-if="isFetching"
         />
-        <VFlex
+        <VCardTitle
             v-if="!this.data.length"
+            primary-title
+            class="grey--text"
         >
-            <VCardTitle
-                primary-title
-                class="justify-center grey--text"
-            >
-                There is no data to display!
-            </VCardTitle>
-        </VFlex>
+            There is no data to display!
+        </VCardTitle>
         <GChart
             type="LineChart"
             v-else
@@ -142,6 +139,15 @@
     .chart-container {
         height: 224px;
     }
+    .v-card__title {
+        display: flex;
+        height: 100%;
+        justify-content: center;
+        align-content: center;
+    }
+    ::v-deep .v-card-title {
+        color: crimson;
+    }
     ::v-deep svg path {
         fill: none;
     }

From a233429fdad11e7995730bcb13c338f1b9676515 Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Mon, 9 Sep 2019 22:26:46 +0300
Subject: [PATCH 110/183] resolve conflict

---
 .../Contracts/ErrorReport/ErrorReportRepository.php             | 1 -
 backend/app/Repositories/EloquentErrorReportRepository.php      | 2 --
 2 files changed, 3 deletions(-)

diff --git a/backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php b/backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php
index 19657963..94997fdc 100644
--- a/backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php
+++ b/backend/app/Repositories/Contracts/ErrorReport/ErrorReportRepository.php
@@ -6,7 +6,6 @@
 
 use Illuminate\Support\Collection;
 use App\Entities\Error;
-use Illuminate\Support\Collection;
 use App\Utils\DatePeriod;
 
 interface ErrorReportRepository
diff --git a/backend/app/Repositories/EloquentErrorReportRepository.php b/backend/app/Repositories/EloquentErrorReportRepository.php
index d9673325..50e45b06 100644
--- a/backend/app/Repositories/EloquentErrorReportRepository.php
+++ b/backend/app/Repositories/EloquentErrorReportRepository.php
@@ -11,8 +11,6 @@
 use Illuminate\Support\Collection;
 use App\Utils\DatePeriod;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
 
 final class EloquentErrorReportRepository implements ErrorReportRepository
 {

From 176ab9ca583f0841d5de5f36e8d7fdc9bce413ec Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Tue, 10 Sep 2019 00:21:02 +0300
Subject: [PATCH 111/183] sdd script to collect errors

---
 frontend/scripts/metrica.js | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/frontend/scripts/metrica.js b/frontend/scripts/metrica.js
index 1bcbbfc5..b195e014 100644
--- a/frontend/scripts/metrica.js
+++ b/frontend/scripts/metrica.js
@@ -14,7 +14,8 @@
         host: process.env.VUE_APP_URL,
         routes: {
             create_visitor: '/visitors',
-            create_visit: '/visits'
+            create_visit: '/visits',
+            create_error: '/error-reports'
         }
     };
     window._metricaTracking = {
@@ -327,6 +328,33 @@
         }
     };
 
+    window.onerror = (errorMsg, errorUrl) => {
+        console.log(errorMsg);
+        const url = state.host_api + state.routes.create_error;
+        const tracking_number = window._metricaTracking.getTrackById();
+        const token = window._metricaTracking.getToken();
+        let headers = {
+            'Content-Type': 'application/json',
+            'x-website': tracking_number,
+        };
+        let data = {
+            message: errorUrl,
+            stack_trace: url,
+            page: window._metricaTracking.getPage(),
+            page_title: window._metricaTracking.getTitle(),
+
+        };
+
+        if (token) {
+            headers = {
+                ...headers,
+                ...{'x-visitor': 'Bearer ' + token}
+            };
+        }
+
+        return this.fetchWrapper().post(url, data, headers);
+    };
+
     const onDomReady = () => {
         window._metricaTracking.endTime = new Date();
         window._metricaTracking.initialize();

From 8fcbcd41f65e3b608945bc7a66b467bdc4de33c9 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Tue, 10 Sep 2019 01:07:45 +0300
Subject: [PATCH 112/183] add template to ChangePasswordForm

---
 .../components/auth/ChangePasswordFrom.vue    | 134 ++++++++++++++++++
 frontend/src/pages/ChangePassword.vue         |  40 +++++-
 2 files changed, 170 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/components/auth/ChangePasswordFrom.vue

diff --git a/frontend/src/components/auth/ChangePasswordFrom.vue b/frontend/src/components/auth/ChangePasswordFrom.vue
new file mode 100644
index 00000000..198f7e24
--- /dev/null
+++ b/frontend/src/components/auth/ChangePasswordFrom.vue
@@ -0,0 +1,134 @@
+<template>
+    <div class="form">
+        <VSubheader
+            class="body-1 grey--text text--darken-1 pa-0 mb-3 mt-6"
+        >
+            Reset password
+        </VSubheader>
+        <VForm
+            lazy-validation
+            ref="form"
+            v-model="valid"
+        >
+            <div class="password-group">
+                <label
+                    class="caption grey--text"
+                >
+                    New password
+                </label>
+                <VTextField
+                    class="no-underline my-1"
+                    solo
+                    name="password"
+                    autocomplete="new-password"
+                    v-model="newUser.password"
+                    :append-icon="show1 ? 'visibility' : 'visibility_off'"
+                    :rules="passwordRules"
+                    :type="show1 ? 'text' : 'password'"
+                    @click:append="show1 = !show1"
+                />
+                <label
+                    class="caption grey--text"
+                >
+                    Confirm password
+                </label>
+                <VTextField
+                    class="no-underline my-1"
+                    solo
+                    name="confirmPassword"
+                    autocomplete="new-password"
+                    v-model="newUser.confirmPassword"
+                    :append-icon="show2 ? 'visibility' : 'visibility_off'"
+                    :rules="confirmPasswordRules"
+                    :type="show2 ? 'text' : 'password'"
+                    @click:append="show2 = !show2"
+                />
+                <div class="btn-group">
+                    <VBtn
+                        class="mt-5"
+                        min-width="140px"
+                        color="primary"
+                        :disabled="!valid"
+                    >
+                        CHANGE PASSWORD
+                    </VBtn>
+                    <RouterLink
+                        class="signin mt-5"
+                        :to="{name: 'login'}"
+                    >
+                        Sign in
+                    </RouterLink>
+                </div>
+            </div>
+        </VForm>
+    </div>
+</template>
+
+<script>
+    import {mapActions} from 'vuex';
+    import {validatePassword} from '@/services/validation';
+    import { SHOW_SUCCESS_MESSAGE, SHOW_ERROR_MESSAGE } from "@/store/modules/notification/types/actions";
+
+    export default {
+        name: "ChangePasswordForm",
+        data () {
+            return {
+                show1: false,
+                show2: false,
+                newUser: {
+                    password: '',
+                    confirmPassword: '',
+                },
+
+                valid: false,
+                passwordRules: [
+                    v => !!v || 'Password is required',
+                    v => validatePassword(v) || 'Password must be equal or more than 8 characters'
+                ],
+                confirmPasswordRules: [
+                    v => !!v || 'Password is required',
+                    v => v === this.newUser.password || 'Password should match'
+                ]
+            };
+        },
+        methods: {
+            ...mapActions('auth', {
+
+            }),
+            ...mapActions('notification', {
+                showSuccessMessage: SHOW_SUCCESS_MESSAGE,
+                showErrorMessage: SHOW_ERROR_MESSAGE
+            }),
+        },
+    };
+</script>
+<style lang="scss" scoped>
+
+    .password-group {
+        display: flex;
+        flex-direction: column;
+        max-width: 80%;
+    }
+
+    .btn-group{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        max-width: 80%;
+        margin-bottom: 20px;
+    }
+
+    .choice{
+        margin: 0 15px;
+    }
+
+    .form{
+        width: 75%;
+    }
+
+    .signin{
+        min-width: 80px;
+        margin-left: 20px;
+    }
+
+</style>
\ No newline at end of file
diff --git a/frontend/src/pages/ChangePassword.vue b/frontend/src/pages/ChangePassword.vue
index 3b3c3b36..6e4cae06 100644
--- a/frontend/src/pages/ChangePassword.vue
+++ b/frontend/src/pages/ChangePassword.vue
@@ -1,12 +1,44 @@
 <template>
-    <div>
-        hwllo! moto
-    </div>
+    <VContent>
+        <VContainer
+            p-o
+            fluid
+            fill-height
+        >
+            <VLayout
+                content
+                wrap
+                align-start
+                justify-center
+            >
+                <VFlex
+                    form-wrapper
+                    xs12
+                    sm8
+                    md6
+                >
+                    <VLayout
+                        column
+                        align-items-center
+                    >
+                        <ChangePasswordForm />
+                    </VLayout>
+                </VFlex>
+            </VLayout>
+        </VContainer>
+    </VContent>
 </template>
 
 <script>
+    import ChangePasswordForm from "../components/auth/ChangePasswordFrom";
+    import {isCurrentUser} from '../mixins/isCurrentUser';
+
     export default {
-        name: "ChangePassword"
+        name: "ChangePassword",
+        mixins: [isCurrentUser],
+        components: {
+            ChangePasswordForm
+        }
     };
 </script>
 

From 601b87efd460ead8f8e607db8c748be9055f0977 Mon Sep 17 00:00:00 2001
From: Volodymyr <tumko.volodymyr@gmail.com>
Date: Tue, 10 Sep 2019 01:36:57 +0300
Subject: [PATCH 113/183] fix calculation of bounce rate data for table

---
 ...GetVisitorsBounceRateByParameterAction.php | 15 +++-----
 .../Visitors/BounceRateVisitors.php           | 31 ---------------
 .../Controllers/Api/VisitorController.php     |  3 +-
 .../Resources/VisitorsBounceRateResource.php  | 38 -------------------
 .../EloquentChartVisitorsRepository.php       |  9 +++--
 .../EloquentTableVisitorsRepository.php       | 26 ++++++-------
 .../TableBounceRateVisitorsApiTest.php        |  3 +-
 .../src/api/visitors/bounceRateService.js     |  2 +-
 8 files changed, 28 insertions(+), 99 deletions(-)
 delete mode 100644 backend/app/DataTransformer/Visitors/BounceRateVisitors.php
 delete mode 100644 backend/app/Http/Resources/VisitorsBounceRateResource.php

diff --git a/backend/app/Actions/Visitors/GetVisitorsBounceRateByParameterAction.php b/backend/app/Actions/Visitors/GetVisitorsBounceRateByParameterAction.php
index c0ef2859..950de70e 100644
--- a/backend/app/Actions/Visitors/GetVisitorsBounceRateByParameterAction.php
+++ b/backend/app/Actions/Visitors/GetVisitorsBounceRateByParameterAction.php
@@ -4,7 +4,7 @@
 
 namespace App\Actions\Visitors;
 
-use App\DataTransformer\Visitors\BounceRateVisitors;
+use App\DataTransformer\TableValue;
 use App\Repositories\Contracts\TableVisitorsRepository;
 use Illuminate\Support\Facades\Auth;
 
@@ -37,7 +37,6 @@ public function execute(GetVisitorsBounceRateByParameterRequest $request): GetVi
                 $bounceRateCollection = collect($this->tableVisitorsRepository
                     ->getBounceRateGroupByCity($request->period())
                     ->keyBy(self::CITY)
-                    ->only('bounced_visitors_count')
                     ->toArray());
                 break;
             case self::COUNTRY:
@@ -48,7 +47,6 @@ public function execute(GetVisitorsBounceRateByParameterRequest $request): GetVi
                 $bounceRateCollection = collect($this->tableVisitorsRepository
                     ->getBounceRateGroupByCountry($request->period())
                     ->keyBy(self::COUNTRY)
-                    ->only('bounced_visitors_count')
                     ->toArray());
                 break;
             case self::LANGUAGE:
@@ -59,7 +57,6 @@ public function execute(GetVisitorsBounceRateByParameterRequest $request): GetVi
                 $bounceRateCollection = collect($this->tableVisitorsRepository
                     ->getBounceRateRateGroupByLanguage($websiteId, $request->period())
                     ->keyBy(self::LANGUAGE)
-                    ->only('bounced_visitors_count')
                     ->toArray());
                 break;
             case self::BROWSER:
@@ -70,7 +67,6 @@ public function execute(GetVisitorsBounceRateByParameterRequest $request): GetVi
                 $bounceRateCollection = collect($this->tableVisitorsRepository
                     ->getBounceRateGroupByBrowser($websiteId, $request->period())
                     ->keyBy(self::BROWSER)
-                    ->only('bounced_visitors_count')
                     ->toArray());
                 break;
             case self::OS:
@@ -81,7 +77,6 @@ public function execute(GetVisitorsBounceRateByParameterRequest $request): GetVi
                 $bounceRateCollection = collect($this->tableVisitorsRepository
                     ->getBounceRateGroupByOperatingSystem($websiteId, $request->period())
                     ->keyBy(self::OS)
-                    ->only('bounced_visitors_count')
                     ->toArray());
                 break;
             case self::SCREEN_RESOLUTION:
@@ -92,7 +87,6 @@ public function execute(GetVisitorsBounceRateByParameterRequest $request): GetVi
                 $bounceRateCollection = collect($this->tableVisitorsRepository
                     ->getBounceRateGroupByScreenResolution($websiteId, $request->period())
                     ->keyBy(self::SCREEN_RESOLUTION)
-                    ->only('bounced_visitors_count')
                     ->toArray());
                 break;
         }
@@ -101,10 +95,11 @@ public function execute(GetVisitorsBounceRateByParameterRequest $request): GetVi
 
         $response = $collection->map(function ($item) use ($parameter) {
             $bounce_rate = isset($item['bounced_visitors_count']) ? $item['bounced_visitors_count'] / $item['visitors_count'] : 0;
-            return new BounceRateVisitors(
+            return new TableValue(
                 $parameter,
-                $item[$parameter],
-                $bounce_rate
+                is_array($item[$parameter])?$item[$parameter][0]:$item[$parameter],
+                (string)($item['bounced_visitors_count']??0),
+                $bounce_rate * 100
             );
         })->flatten();
 
diff --git a/backend/app/DataTransformer/Visitors/BounceRateVisitors.php b/backend/app/DataTransformer/Visitors/BounceRateVisitors.php
deleted file mode 100644
index 66490131..00000000
--- a/backend/app/DataTransformer/Visitors/BounceRateVisitors.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\DataTransformer\Visitors;
-
-use App\DataTransformer\Traits\TableValueTrait;
-
-final class BounceRateVisitors
-{
-    use TableValueTrait;
-
-    private $parameter;
-    private $parameterValue;
-    private $bounceRate;
-
-    public function __construct(
-        string $parameter,
-        string $parameterValue,
-        float $bounceRate
-    ) {
-        $this->parameter = $parameter;
-        $this->parameterValue = $parameterValue;
-        $this->bounceRate = $bounceRate;
-    }
-
-    public function bounceRate(): float
-    {
-        return $this->bounceRate;
-    }
-}
\ No newline at end of file
diff --git a/backend/app/Http/Controllers/Api/VisitorController.php b/backend/app/Http/Controllers/Api/VisitorController.php
index aca9d180..6489b132 100644
--- a/backend/app/Http/Controllers/Api/VisitorController.php
+++ b/backend/app/Http/Controllers/Api/VisitorController.php
@@ -32,7 +32,6 @@
 use App\Actions\Visitors\GetVisitorsCountByParameterRequest;
 use App\Http\Requests\Visitor\GetTableVisitorsByParameterHttpRequest;
 use App\Http\Resources\VisitorResourceCollection;
-use App\Http\Resources\VisitorsBounceRateResource;
 use App\Http\Response\ApiResponse;
 use App\Http\Controllers\Controller;
 use App\Http\Resources\ChartNewVisitorResourceCollection;
@@ -167,6 +166,6 @@ public function getVisitorsBounceRateByParameter(GetTableVisitorsByParameterHttp
             GetVisitorsBounceRateByParameterRequest::fromRequest($request)
         );
 
-        return ApiResponse::success(new VisitorsBounceRateResource($response->getVisitorsBounceRateCollection()));
+        return ApiResponse::success(new TableResource($response->getVisitorsBounceRateCollection()));
     }
 }
diff --git a/backend/app/Http/Resources/VisitorsBounceRateResource.php b/backend/app/Http/Resources/VisitorsBounceRateResource.php
deleted file mode 100644
index 7c57a678..00000000
--- a/backend/app/Http/Resources/VisitorsBounceRateResource.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Resources;
-
-use App\Contracts\ApiResponse;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-use Illuminate\Support\Collection;
-use App\DataTransformer\Visitors\BounceRateVisitors;
-
-final class VisitorsBounceRateResource extends ResourceCollection implements ApiResponse
-{
-    public function toArray($request): array
-    {
-        return $this->presentCollection($this->collection);
-    }
-
-    public function present(BounceRateVisitors $table): array
-    {
-        return [
-            'parameter' => $table->parameter(),
-            'parameter_value' => $table->parameterValue(),
-            'bounce_rate' => $table->bounceRate(),
-        ];
-    }
-
-    public function presentCollection(Collection $collection): array
-    {
-        return $collection
-            ->map(
-                function (BounceRateVisitors $table) {
-                    return $this->present($table);
-                }
-            )
-            ->all();
-    }
-}
diff --git a/backend/app/Repositories/EloquentChartVisitorsRepository.php b/backend/app/Repositories/EloquentChartVisitorsRepository.php
index 671d933b..60d8f624 100644
--- a/backend/app/Repositories/EloquentChartVisitorsRepository.php
+++ b/backend/app/Repositories/EloquentChartVisitorsRepository.php
@@ -36,7 +36,10 @@ public function getVisitorsCountByTimeFrame(VisitorsBounceRateFilterData $filter
         $from = $filterData->getStartDate();
         $to = $filterData->getEndDate();
         $timeFrame = $filterData->getTimeFrame();
-        $allVisitorsByTimeFrame = Visitor::whereCreatedAtBetween($from, $to)
+        $allVisitorsByTimeFrame = Visitor::query()
+            ->whereHas('sessions', function (Builder $query) use ($from, $to) {
+                $query->whereBetween('start_session', [$from, $to]);
+            })
             ->forUserWebsite()
             ->selectRaw('COUNT (*)')
             ->selectRaw(' (extract(epoch FROM created_at) - MOD( (CAST (extract(epoch FROM created_at) AS INTEGER)), ? )) AS period', [$timeFrame])
@@ -51,11 +54,11 @@ public function getBouncedVisitorsCountByTimeFrame(VisitorsBounceRateFilterData
         $from = $filterData->getStartDate();
         $to = $filterData->getEndDate();
         $timeFrame = $filterData->getTimeFrame();
-        $bounceVisitorsByTimeFrame =  Visitor::whereCreatedAtBetween($from, $to)
+        $bounceVisitorsByTimeFrame =  Visitor::query()
             ->forUserWebsite()
             ->has('sessions', '=', '1')
             ->whereHas('sessions', function (Builder $query) use ($from, $to) {
-                $query->where('start_session', '<', $to)
+                $query->whereBetween('start_session', [$from, $to])
                     ->has('visits', '=', '1');
             })
             ->selectRaw('COUNT (*)')
diff --git a/backend/app/Repositories/EloquentTableVisitorsRepository.php b/backend/app/Repositories/EloquentTableVisitorsRepository.php
index eca3d7f6..75e46e6a 100644
--- a/backend/app/Repositories/EloquentTableVisitorsRepository.php
+++ b/backend/app/Repositories/EloquentTableVisitorsRepository.php
@@ -170,7 +170,7 @@ private function mapToTableValues(Collection $visitors, string $parameter)
             return new TableValue(
                 $parameter,
                 $item->parameter_value,
-                strval($item->count_visitors),
+                (string)($item->count_visitors),
                 $item->count_visitors / $item->total_count * 100
             );
         });
@@ -181,7 +181,7 @@ public function getCountVisitorsGroupByCity(DatePeriod $datePeriod): Collection
         return Visitor::forUserWebsite()
             ->join('visits', 'visitors.id', '=', 'visits.visitor_id')
             ->join('geo_positions', 'geo_positions.id', '=', 'visits.geo_position_id')
-            ->select(DB::raw('count(visitors.id) as visitors_count, geo_positions.city as city'))
+            ->select(DB::raw('count(distinct(visitors.id)) as visitors_count, geo_positions.city as city'))
             ->whereBetween('visits.visit_time', [$datePeriod->getStartDate(), $datePeriod->getEndDate()])
             ->groupBy('geo_positions.city')
             ->get();
@@ -198,7 +198,7 @@ public function getBounceRateGroupByCity(DatePeriod $datePeriod): Collection
             ->forUserWebsite()
             ->join('visits', 'visitors.id', '=', 'visits.visitor_id')
             ->join('geo_positions', 'visits.geo_position_id', '=', 'geo_positions.id')
-            ->select(DB::raw('count(visitors.id) as bounced_visitors_count, geo_positions.city as city'))
+            ->select(DB::raw('count(distinct(visitors.id)) as bounced_visitors_count, geo_positions.city as city'))
             ->groupBy('geo_positions.city')
             ->get();
     }
@@ -208,7 +208,7 @@ public function getCountVisitorsGroupByCountry(DatePeriod $datePeriod): Collecti
         return Visitor::forUserWebsite()
             ->join('visits', 'visitors.id', '=', 'visits.visitor_id')
             ->join('geo_positions', 'geo_positions.id', '=', 'visits.geo_position_id')
-            ->select(DB::raw('count(visitors.id) as visitors_count, geo_positions.country as country'))
+            ->select(DB::raw('count(distinct(visitors.id)) as visitors_count, geo_positions.country as country'))
             ->whereBetween('visits.visit_time', [$datePeriod->getStartDate(), $datePeriod->getEndDate()])
             ->groupBy('geo_positions.country')
             ->get();
@@ -225,7 +225,7 @@ public function getBounceRateGroupByCountry(DatePeriod $datePeriod): Collection
             ->forUserWebsite()
             ->join('visits', 'visitors.id', '=', 'visits.visitor_id')
             ->join('geo_positions', 'visits.geo_position_id', '=', 'geo_positions.id')
-            ->select(DB::raw('count(visitors.id) as bounced_visitors_count, geo_positions.country as country'))
+            ->select(DB::raw('count(distinct(visitors.id)) as bounced_visitors_count, geo_positions.country as country'))
             ->groupBy('geo_positions.country')
             ->get();
     }
@@ -235,7 +235,7 @@ public function getCountVisitorsGroupByLanguage(int $website_id, DatePeriod $dat
         return Visitor::has('visits')
             ->join('visits', 'visitors.id', '=', 'visits.visitor_id')
             ->join('sessions', 'sessions.id', '=', 'visits.session_id')
-            ->select(DB::raw('count(visitors.id) as visitors_count, sessions.language as language'))
+            ->select(DB::raw('count(distinct(visitors.id)) as visitors_count, sessions.language as language'))
             ->whereBetween('visits.visit_time', [$datePeriod->getStartDate(), $datePeriod->getEndDate()])
             ->groupBy('sessions.language')
             ->where('sessions.website_id', '=', $website_id)
@@ -253,7 +253,7 @@ public function getBounceRateRateGroupByLanguage(int $website_id, DatePeriod $da
             })
             ->join('visits', 'visitors.id', '=', 'visits.visitor_id')
             ->join('sessions', 'sessions.id', '=', 'visits.session_id')
-            ->select(DB::raw('count(visitors.id) as bounced_visitors_count, sessions.language as language'))
+            ->select(DB::raw('count(distinct(visitors.id)) as bounced_visitors_count, sessions.language as language'))
             ->groupBy('sessions.language')
             ->where('sessions.website_id', '=', $website_id)
             ->get();
@@ -265,7 +265,7 @@ public function getCountVisitorsGroupByBrowser(int $website_id, DatePeriod $date
             ->join('visits', 'visitors.id', '=', 'visits.visitor_id')
             ->join('sessions', 'sessions.id', '=', 'visits.session_id')
             ->join('systems', 'systems.id', '=', 'sessions.system_id')
-            ->select(DB::raw('count(visitors.id) as visitors_count, systems.browser as browser'))
+            ->select(DB::raw('count(distinct(visitors.id)) as visitors_count, systems.browser as browser'))
             ->whereBetween('visits.visit_time', [$datePeriod->getStartDate(), $datePeriod->getEndDate()])
             ->groupBy('systems.browser')
             ->where('sessions.website_id', '=', $website_id)
@@ -283,7 +283,7 @@ public function getBounceRateGroupByBrowser(int $website_id, DatePeriod $datePer
             ->join('visits', 'visitors.id', '=', 'visits.visitor_id')
             ->join('sessions', 'sessions.id', '=', 'visits.session_id')
             ->join('systems', 'systems.id', '=', 'sessions.system_id')
-            ->select(DB::raw('count(visitors.id) as bounced_visitors_count, systems.browser as browser'))
+            ->select(DB::raw('count(distinct(visitors.id)) as bounced_visitors_count, systems.browser as browser'))
             ->groupBy('systems.browser')
             ->where('sessions.website_id', '=', $website_id)
             ->get();
@@ -295,7 +295,7 @@ public function getCountVisitorsGroupByOperatingSystem(int $website_id, DatePeri
             ->join('visits', 'visitors.id', '=', 'visits.visitor_id')
             ->join('sessions', 'sessions.id', '=', 'visits.session_id')
             ->join('systems', 'systems.id', '=', 'sessions.system_id')
-            ->select(DB::raw('count(visitors.id) as visitors_count, systems.os as operating_system'))
+            ->select(DB::raw('count(distinct(visitors.id)) as visitors_count, systems.os as operating_system'))
             ->whereBetween('visits.visit_time', [$datePeriod->getStartDate(), $datePeriod->getEndDate()])
             ->groupBy('systems.os')
             ->where('sessions.website_id', '=', $website_id)
@@ -313,7 +313,7 @@ public function getBounceRateGroupByOperatingSystem(int $website_id, DatePeriod
             ->join('visits', 'visitors.id', '=', 'visits.visitor_id')
             ->join('sessions', 'sessions.id', '=', 'visits.session_id')
             ->join('systems', 'systems.id', '=', 'sessions.system_id')
-            ->select(DB::raw('count(visitors.id) as bounced_visitors_count, systems.os as operating_system'))
+            ->select(DB::raw('count(distinct(visitors.id)) as bounced_visitors_count, systems.os as operating_system'))
             ->groupBy('systems.os')
             ->where('sessions.website_id', '=', $website_id)
             ->get();
@@ -325,7 +325,7 @@ public function getCountVisitorsRateGroupByScreenResolution(int $website_id, Dat
             ->join('visits', 'visitors.id', '=', 'visits.visitor_id')
             ->join('sessions', 'sessions.id', '=', 'visits.session_id')
             ->join('systems', 'systems.id', '=', 'sessions.system_id')
-            ->select(DB::raw('count(visitors.id) as visitors_count'), DB::raw("CONCAT(systems.resolution_height, 'x', systems.resolution_width) as screen_resolution"))
+            ->select(DB::raw('count(distinct(visitors.id)) as visitors_count'), DB::raw("CONCAT(systems.resolution_height, 'x', systems.resolution_width) as screen_resolution"))
             ->whereBetween('visits.visit_time', [$datePeriod->getStartDate(), $datePeriod->getEndDate()])
             ->groupBy(['systems.resolution_width','systems.resolution_height'])
             ->where('sessions.website_id', '=', $website_id)
@@ -343,7 +343,7 @@ public function getBounceRateGroupByScreenResolution(int $website_id, DatePeriod
             ->join('visits', 'visitors.id', '=', 'visits.visitor_id')
             ->join('sessions', 'sessions.id', '=', 'visits.session_id')
             ->join('systems', 'systems.id', '=', 'sessions.system_id')
-            ->select(DB::raw('COUNT(visitors.id) as bounced_visitors_count'), DB::raw("CONCAT(systems.resolution_height, 'x', systems.resolution_width) as screen_resolution"))
+            ->select(DB::raw('count(distinct(visitors.id)) as bounced_visitors_count'), DB::raw("CONCAT(systems.resolution_height, 'x', systems.resolution_width) as screen_resolution"))
             ->groupBy(['systems.resolution_width','systems.resolution_height'])
             ->where('sessions.website_id', '=', $website_id)
             ->get();
diff --git a/backend/tests/Feature/TableBounceRateVisitorsApiTest.php b/backend/tests/Feature/TableBounceRateVisitorsApiTest.php
index b276cbfe..5deade1d 100644
--- a/backend/tests/Feature/TableBounceRateVisitorsApiTest.php
+++ b/backend/tests/Feature/TableBounceRateVisitorsApiTest.php
@@ -17,7 +17,8 @@ class TableBounceRateVisitorsApiTest extends TestCase
             '*' => [
                 'parameter',
                 'parameter_value',
-                'bounce_rate',
+                'total',
+                'percentage',
             ]
         ],
         'meta' => []
diff --git a/frontend/src/api/visitors/bounceRateService.js b/frontend/src/api/visitors/bounceRateService.js
index ee53c6c5..384f529c 100644
--- a/frontend/src/api/visitors/bounceRateService.js
+++ b/frontend/src/api/visitors/bounceRateService.js
@@ -39,7 +39,7 @@ const fetchChartValues = (startDate, endDate, interval) => {
 };
 
 const fetchTableValues = (startDate, endDate, groupBy) => {
-    return requestService.get(resourceUrl + '/table-visitors/count-total', {}, {
+    return requestService.get(resourceUrl + '/table-visitors/bounce-rate', {}, {
         'filter[startDate]': startDate,
         'filter[endDate]': endDate,
         'filter[parameter]': groupBy

From 68da3d2b912b391686e61cc967f7f158cd0a5a7e Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Tue, 10 Sep 2019 01:52:07 +0300
Subject: [PATCH 114/183] fix visualization of avg session time

---
 .../components/dashboard/geo_location/GroupedTable.vue    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/dashboard/geo_location/GroupedTable.vue b/frontend/src/components/dashboard/geo_location/GroupedTable.vue
index 78ec198b..e6819cf3 100644
--- a/frontend/src/components/dashboard/geo_location/GroupedTable.vue
+++ b/frontend/src/components/dashboard/geo_location/GroupedTable.vue
@@ -74,10 +74,12 @@
         computed: {
             geoLocationItems() {
                 return this.items.map((item) => {
+                    const duration = moment.duration(parseInt(this.buttonsData[type].value), 's');
+                    const hours = Math.floor(duration.asHours());
+                    const minutes = moment.utc(duration.asMilliseconds()).format("mm:ss");
+
                     let newItemData = {
-                        avg_session_time: moment.utc(
-                            moment.duration(item.avg_session_time, 's').asMilliseconds()
-                        ).format("HH:mm:ss"),
+                        avg_session_time: `${hours}:${minutes}`,
                         bounce_rate: Math.round(Number(item.bounce_rate) * 100)
                     };
                     return { ...item, ...newItemData};

From 56ce9395730e29f12d20483dbe20becd27174216 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Tue, 10 Sep 2019 02:07:45 +0300
Subject: [PATCH 115/183] add redirect to reset-password page on expired token

---
 frontend/src/components/auth/ChangePasswordFrom.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/auth/ChangePasswordFrom.vue b/frontend/src/components/auth/ChangePasswordFrom.vue
index 198f7e24..1e89a6ee 100644
--- a/frontend/src/components/auth/ChangePasswordFrom.vue
+++ b/frontend/src/components/auth/ChangePasswordFrom.vue
@@ -68,6 +68,7 @@
     import {mapActions} from 'vuex';
     import {validatePassword} from '@/services/validation';
     import { SHOW_SUCCESS_MESSAGE, SHOW_ERROR_MESSAGE } from "@/store/modules/notification/types/actions";
+    import jwtService from "@/services/jwtService";
 
     export default {
         name: "ChangePasswordForm",
@@ -79,7 +80,6 @@
                     password: '',
                     confirmPassword: '',
                 },
-
                 valid: false,
                 passwordRules: [
                     v => !!v || 'Password is required',
@@ -91,6 +91,12 @@
                 ]
             };
         },
+        created() {
+            if (jwtService.checkExpireToken(this.$route.query.token)) {
+                this.showErrorMessage('Sorry, your token was expired. Please, enter your email again.');
+                this.$router.push({name: 'reset-password'});
+            }
+        },
         methods: {
             ...mapActions('auth', {
 
@@ -118,10 +124,6 @@
         margin-bottom: 20px;
     }
 
-    .choice{
-        margin: 0 15px;
-    }
-
     .form{
         width: 75%;
     }

From 37e8a09d512ad2b31d10b7033162ef55537070dc Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Tue, 10 Sep 2019 02:17:43 +0300
Subject: [PATCH 116/183] fix of fix

---
 frontend/src/components/dashboard/geo_location/GroupedTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/dashboard/geo_location/GroupedTable.vue b/frontend/src/components/dashboard/geo_location/GroupedTable.vue
index e6819cf3..eb2328c7 100644
--- a/frontend/src/components/dashboard/geo_location/GroupedTable.vue
+++ b/frontend/src/components/dashboard/geo_location/GroupedTable.vue
@@ -74,7 +74,7 @@
         computed: {
             geoLocationItems() {
                 return this.items.map((item) => {
-                    const duration = moment.duration(parseInt(this.buttonsData[type].value), 's');
+                    const duration = moment.duration(item.avg_session_time, 's');
                     const hours = Math.floor(duration.asHours());
                     const minutes = moment.utc(duration.asMilliseconds()).format("mm:ss");
 

From a18ae49aff5d47174144d2259e6d08c523f26201 Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Tue, 10 Sep 2019 07:41:43 +0300
Subject: [PATCH 117/183] move script to collect errors

---
 frontend/scripts/metrica.js | 74 ++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/frontend/scripts/metrica.js b/frontend/scripts/metrica.js
index b195e014..52c93c4d 100644
--- a/frontend/scripts/metrica.js
+++ b/frontend/scripts/metrica.js
@@ -9,6 +9,33 @@
             });
         }
     }
+
+    window.onerror = (errorMsg, errorUrl) => {
+        const url = state.host_api + state.routes.create_error;
+        const tracking_number = window._metricaTracking.getObjectMetricaConf()[1][1];
+        const token = window._metricaTracking.getToken();
+        let headers = {
+            'Content-Type': 'application/json',
+            'x-website': tracking_number,
+        };
+        let data = {
+            message: errorMsg,
+            stack_trace: errorUrl,
+            page: window._metricaTracking.getPage(),
+            page_title: window._metricaTracking.getTitle(),
+
+        };
+
+        if (token) {
+            headers = {
+                ...headers,
+                ...{'x-visitor': 'Bearer ' + token}
+            };
+        }
+
+        return new requestService().post(url, data, headers);
+    };
+
     const state = {
         host_api: process.env.VUE_APP_API_URL,
         host: process.env.VUE_APP_URL,
@@ -77,16 +104,7 @@
             return this.configMetrica;
         },
         storage() {
-            return window[this.isStorage()];
-        },
-        isStorage() {
-            try {
-                localStorage.setItem('test-local-storage', 1);
-                localStorage.removeItem('test-local-storage');
-                return 'localStorage';
-            } catch (e) {
-                return 'sessionStorage';
-            }
+            return window[Helper.isStorage()];
         },
         getTrackById() {
             let trackingId = this.getObjectMetricaConf()[1][1];
@@ -216,6 +234,15 @@
             }
             return obj[props[i]];
         },
+        isStorage() {
+            try {
+                localStorage.setItem('test-local-storage', 1);
+                localStorage.removeItem('test-local-storage');
+                return 'localStorage';
+            } catch (e) {
+                return 'sessionStorage';
+            }
+        },
         getUserDevice() {
             let device,
                 find,
@@ -328,33 +355,6 @@
         }
     };
 
-    window.onerror = (errorMsg, errorUrl) => {
-        console.log(errorMsg);
-        const url = state.host_api + state.routes.create_error;
-        const tracking_number = window._metricaTracking.getTrackById();
-        const token = window._metricaTracking.getToken();
-        let headers = {
-            'Content-Type': 'application/json',
-            'x-website': tracking_number,
-        };
-        let data = {
-            message: errorUrl,
-            stack_trace: url,
-            page: window._metricaTracking.getPage(),
-            page_title: window._metricaTracking.getTitle(),
-
-        };
-
-        if (token) {
-            headers = {
-                ...headers,
-                ...{'x-visitor': 'Bearer ' + token}
-            };
-        }
-
-        return this.fetchWrapper().post(url, data, headers);
-    };
-
     const onDomReady = () => {
         window._metricaTracking.endTime = new Date();
         window._metricaTracking.initialize();

From f2088882a0360f99654914336d68ba29c253331a Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Tue, 10 Sep 2019 08:49:54 +0300
Subject: [PATCH 118/183] modify login page

---
 frontend/src/components/auth/LoginForm.vue  |  7 ++++---
 frontend/src/components/auth/SocialAuth.vue |  6 ++----
 frontend/src/pages/Login.vue                | 19 ++++---------------
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/frontend/src/components/auth/LoginForm.vue b/frontend/src/components/auth/LoginForm.vue
index f96e7a9f..786ddf77 100644
--- a/frontend/src/components/auth/LoginForm.vue
+++ b/frontend/src/components/auth/LoginForm.vue
@@ -39,7 +39,7 @@
             />
 
             <div class="password-group">
-                <div class="btn-group">
+                <div class="btn-group mt-8 mb-3">
                     <VBtn
                         class="login-btn"
                         min-width="100px"
@@ -71,7 +71,9 @@
             </div>
         </VForm>
 
-        <SocialAuth />
+        <SocialAuth
+            class="mt-4"
+        />
     </div>
 </template>
 
@@ -163,7 +165,6 @@
         }
 
         .btn-group {
-            margin-bottom: 20px;
             display: flex;
             justify-content: flex-start;
             .v-btn:last-child {
diff --git a/frontend/src/components/auth/SocialAuth.vue b/frontend/src/components/auth/SocialAuth.vue
index dd247fc0..5ff83948 100644
--- a/frontend/src/components/auth/SocialAuth.vue
+++ b/frontend/src/components/auth/SocialAuth.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="social-container">
         <div class="justify-content-center">
-            <div class="middle-line">
+            <div class="middle-line grey--text">
                 Or sign in with
             </div>
         </div>
@@ -61,7 +61,6 @@
     }
 
     .social-container {
-        max-width: 80%;
         padding-right: .5rem;
         background: inherit;
     }
@@ -69,10 +68,9 @@
     .middle-line {
         overflow: hidden;
         text-align: center;
-        color: gray;
         &:before,
         &:after {
-            background-color: gray;
+            background-color: #abb4c0;
             content: "";
             display: inline-block;
             height: 1px;
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 8e9b955b..2b1deef4 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -3,6 +3,7 @@
         <VContainer
             fluid
             fill-height
+            class="white"
         >
             <VLayout
                 content
@@ -11,9 +12,9 @@
                 justify-center
             >
                 <VFlex
-                    form-wrapper
+                    class="background pt-10"
+                    fill-height
                     xs12
-                    sm8
                     md6
                 >
                     <VLayout
@@ -29,6 +30,7 @@
                     image
                     sm12
                     md6
+                    class="d-sm-none d-md-flex"
                 >
                     <VImg
                         src="/assets/images/home.png"
@@ -70,24 +72,11 @@
 </script>
 
 <style lang="scss" scoped>
-
-    main{
-        background: #FFFFFF;
-
-    }
-
     .image{
         padding-top: 40px;
     }
 
     .container{
         padding: 0px
-
-    }
-
-    .form-wrapper{
-        padding-top: 40px;
-        height: 100%;
-        background: #F2F2F2;
     }
 </style>

From 22c3d7f13f750535a1bb6d040bdc1aa653fe181f Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Tue, 10 Sep 2019 09:16:58 +0300
Subject: [PATCH 119/183] display no data message on the devices widget when
 needed

---
 .../src/components/widgets/DevicesPieChart.vue     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/widgets/DevicesPieChart.vue b/frontend/src/components/widgets/DevicesPieChart.vue
index 83288605..a07992fe 100644
--- a/frontend/src/components/widgets/DevicesPieChart.vue
+++ b/frontend/src/components/widgets/DevicesPieChart.vue
@@ -5,10 +5,15 @@
         </div>
         <div class="pa-6 white pie-container position-relative d-flex flex-column justify-space-between">
             <Spinner v-if="isFetching" />
-            <VContainer v-if="!data.length">
-                no data to display
+            <VContainer
+                v-if="noData"
+                fill-height
+                class="d-flex align-center justify-content-center grey--text"
+            >
+                There is no data to display.
             </VContainer>
             <PieChartItem
+                v-else
                 v-for="(item, key) in data"
                 :data-type="item.type"
                 :data="item.data"
@@ -63,6 +68,11 @@
             ...mapGetters('website', {
                 website: GET_CURRENT_WEBSITE
             }),
+            noData() {
+                return this.data.some(function(element) {
+                    return element.data.length === 0;
+                });
+            }
         },
         methods: {
             ...mapActions('devices', {

From 3e9c17a00f95e51d45447fe3e2bb664c19384d94 Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Tue, 10 Sep 2019 10:27:22 +0300
Subject: [PATCH 120/183] add errors module to store

---
 .../dashboard/errors/ErrorsTable.vue          | 14 -----
 .../src/pages/speed_overview/ErrorReports.vue | 11 ----
 frontend/src/store/modules/errors/actions.js  | 52 +++++++++++++++++++
 frontend/src/store/modules/errors/getters.js  | 23 ++++++++
 frontend/src/store/modules/errors/index.js    | 12 +++++
 .../src/store/modules/errors/mutations.js     | 33 ++++++++++++
 frontend/src/store/modules/errors/state.js    | 13 +++++
 .../src/store/modules/errors/types/actions.js |  6 +++
 .../src/store/modules/errors/types/getters.js |  7 +++
 .../store/modules/errors/types/mutations.js   |  7 +++
 10 files changed, 153 insertions(+), 25 deletions(-)
 create mode 100644 frontend/src/store/modules/errors/actions.js
 create mode 100644 frontend/src/store/modules/errors/getters.js
 create mode 100644 frontend/src/store/modules/errors/index.js
 create mode 100644 frontend/src/store/modules/errors/mutations.js
 create mode 100644 frontend/src/store/modules/errors/state.js
 create mode 100644 frontend/src/store/modules/errors/types/actions.js
 create mode 100644 frontend/src/store/modules/errors/types/getters.js
 create mode 100644 frontend/src/store/modules/errors/types/mutations.js

diff --git a/frontend/src/components/dashboard/errors/ErrorsTable.vue b/frontend/src/components/dashboard/errors/ErrorsTable.vue
index 42c5184c..d4bd5171 100644
--- a/frontend/src/components/dashboard/errors/ErrorsTable.vue
+++ b/frontend/src/components/dashboard/errors/ErrorsTable.vue
@@ -7,16 +7,6 @@
             class="header my-3"
             fluid
         >
-            <VCol>
-                <VSelect
-                    class="option-select"
-                    prefix="Show"
-                    :items="options"
-                    flat
-                    v-model="selected"
-                    @change="changeSelect"
-                />
-            </VCol>
             <VCol>
                 Page
             </VCol>
@@ -79,7 +69,6 @@
                 ],
                 headers: [
                     { text: '', align: 'center', value: 'parameter_value' },
-                    { text: '', align: 'center', value: 'page' },
                     { text: '', align: 'center', value: 'message' },
                     { text: '', align: 'center', value: 'page_views' },
                     { text: '', align: 'center', value: 'details' },
@@ -87,9 +76,6 @@
             };
         },
         methods: {
-            changeSelect () {
-                this.$emit('change', this.selected);
-            },
             detailsItem (item) {
                 this.$emit('open', item);
             }
diff --git a/frontend/src/pages/speed_overview/ErrorReports.vue b/frontend/src/pages/speed_overview/ErrorReports.vue
index 1491a5b0..8b7a31ca 100644
--- a/frontend/src/pages/speed_overview/ErrorReports.vue
+++ b/frontend/src/pages/speed_overview/ErrorReports.vue
@@ -17,7 +17,6 @@
             <ErrorsTable
                 @open="openModal"
                 :error-items="tableData.items"
-                @change="changeGroupedParameter"
             />
         </VRow>
         <ErrorsDetailsModal
@@ -67,13 +66,11 @@
                     message: 'message'
                 },
                 title: "Error Reports",
-                current_paremeter: 'page',
                 tableData: {
                     isFetching: false,
                     items: [
                         {
                             parameter_value: '/contacts',
-                            page: '/contacts',
                             message: 'SyntaxError',
                             stack_trasce: 'at Object.device.tablet (metrica.js?tracking_id=00000186:317)\n' +
                                 'at Object.device.desktop (metrica.js?tracking_id=00000186:325)\n' +
@@ -82,7 +79,6 @@
                         },
                         {
                             parameter_value: '/home',
-                            page: '/home',
                             message: 'ReferenceError',
                             stack_trace: 'at Object.device.tablet (metrica.js?tracking_id=00000186:317)\n' +
                                 'at Object.device.desktop (metrica.js?tracking_id=00000186:325)\n' +
@@ -91,7 +87,6 @@
                         },
                         {
                             parameter_value: '/products',
-                            page: '/products',
                             message: 'TypeError',
                             stack_trace: 'at Object.device.tablet (metrica.js?tracking_id=00000186:317)\n' +
                                 'at Object.device.desktop (metrica.js?tracking_id=00000186:325)\n' +
@@ -100,7 +95,6 @@
                         },
                         {
                             parameter_value: '/user',
-                            page: '/user',
                             message: 'InternalError',
                             stack_trace: 'at Object.device.tablet (metrica.js?tracking_id=00000186:317)\n' +
                                 'at Object.device.desktop (metrica.js?tracking_id=00000186:325)\n' +
@@ -126,11 +120,6 @@
                 changeSelectedPeriod: CHANGE_SELECTED_PERIOD,
                 fetchPageData: FETCH_PAGE_DATA
             }),
-            changeGroupedParameter (parameter) {
-                if (this.currentParameter !== parameter) {
-                    this.currentParameter = parameter;
-                }
-            },
             changePeriod (data) {
                 this.changeSelectedPeriod(data);
             },
diff --git a/frontend/src/store/modules/errors/actions.js b/frontend/src/store/modules/errors/actions.js
new file mode 100644
index 00000000..caf3cb4b
--- /dev/null
+++ b/frontend/src/store/modules/errors/actions.js
@@ -0,0 +1,52 @@
+import {
+    CHANGE_SELECTED_PERIOD,
+    CHANGE_FETCHED_LINE_CHART_STATE,
+    FETCH_LINE_CHART_DATA,
+    CHANGE_FETCHED_TABLE_STATE,
+    FETCH_TABLE_DATA,
+    FETCH_PAGE_DATA
+} from "./types/actions";
+import {
+    SET_SELECTED_PERIOD,
+    RESET_TABLE_FETCHING,
+    SET_TABLE_FETCHING,
+    RESET_LINE_CHART_FETCHING,
+    SET_LINE_CHART_FETCHING,
+} from "./types/mutations";
+
+import {getTimeByPeriod} from '@/services/periodService';
+
+export default {
+    [CHANGE_SELECTED_PERIOD]: (context, payload) => {
+        context.commit(SET_SELECTED_PERIOD, payload.value);
+        context.dispatch(FETCH_PAGE_DATA);
+    },
+    [CHANGE_FETCHED_LINE_CHART_STATE]: (context, value) => {
+
+        if (value) {
+            context.commit(SET_LINE_CHART_FETCHING);
+        } else {
+            context.commit(RESET_LINE_CHART_FETCHING);
+        }
+    },
+    [FETCH_LINE_CHART_DATA]: (context) => {
+        context.commit(SET_LINE_CHART_FETCHING);
+        context.commit(RESET_LINE_CHART_FETCHING)
+    },
+    [CHANGE_FETCHED_TABLE_STATE]: (context, value) => {
+
+        if (value) {
+            context.commit(SET_TABLE_FETCHING);
+        } else {
+            context.commit(RESET_TABLE_FETCHING);
+        }
+    },
+    [FETCH_TABLE_DATA]: (context) => {
+        context.commit(SET_TABLE_FETCHING);
+        context.commit(RESET_TABLE_FETCHING)
+    },
+    [FETCH_PAGE_DATA]: (context) => {
+        context.dispatch(FETCH_TABLE_DATA);
+        context.dispatch(FETCH_LINE_CHART_DATA);
+    }
+};
diff --git a/frontend/src/store/modules/errors/getters.js b/frontend/src/store/modules/errors/getters.js
new file mode 100644
index 00000000..d9d44b6e
--- /dev/null
+++ b/frontend/src/store/modules/errors/getters.js
@@ -0,0 +1,23 @@
+import {
+    GET_SELECTED_PERIOD,
+    GET_TABLE_DATA,
+    GET_TABLE_DATA_FETCHING,
+    GET_LINE_CHART_FETCHING,
+    GET_LINE_CHART_DATA,
+    GET_FORMAT_LINE_CHART_DATA,
+    FETCH_TABLE_DATA,
+} from "./types/getters";
+
+import { chartDataTransformer } from "@/api/widgets/transformers";
+
+export default {
+    [GET_SELECTED_PERIOD]: (state) => state.selectedPeriod,
+    [GET_TABLE_DATA]: (state) => state.tableData,
+    [GET_TABLE_DATA_FETCHING]: (state) => state.tableData.isFetching,
+    [GET_LINE_CHART_FETCHING]: (state) => state.chartData.isFetching,
+    [GET_LINE_CHART_DATA]: (state) => state.chartData,
+    [FETCH_TABLE_DATA]: (state) => state.tableData,
+    [GET_FORMAT_LINE_CHART_DATA]: (state) => {
+        return chartDataTransformer(state.chartData.items, state.selectedPeriod);
+    },
+};
diff --git a/frontend/src/store/modules/errors/index.js b/frontend/src/store/modules/errors/index.js
new file mode 100644
index 00000000..a8a9d106
--- /dev/null
+++ b/frontend/src/store/modules/errors/index.js
@@ -0,0 +1,12 @@
+import state from './state';
+import getters from './getters';
+import actions from './actions';
+import mutations from './mutations';
+
+export default {
+    namespaced: true,
+    state,
+    getters,
+    actions,
+    mutations
+};
diff --git a/frontend/src/store/modules/errors/mutations.js b/frontend/src/store/modules/errors/mutations.js
new file mode 100644
index 00000000..a5657af4
--- /dev/null
+++ b/frontend/src/store/modules/errors/mutations.js
@@ -0,0 +1,33 @@
+import {
+    SET_SELECTED_PERIOD,
+    SET_LINE_CHART_DATA,
+    SET_LINE_CHART_FETCHING,
+    RESET_LINE_CHART_FETCHING,
+    SET_TABLE_DATA,
+    SET_TABLE_FETCHING,
+    RESET_TABLE_FETCHING,
+} from "./types/mutations";
+
+export default {
+    [SET_SELECTED_PERIOD]: (state, period) => {
+        state.selectedPeriod = period;
+    },
+    [SET_LINE_CHART_DATA]: (state, value) => {
+        state.chartData.items = value;
+    },
+    [SET_LINE_CHART_FETCHING]: (state) => {
+        state.chartData.isFetching = true;
+    },
+    [RESET_LINE_CHART_FETCHING]: (state) => {
+        state.chartData.isFetching = false;
+    },
+    [SET_TABLE_DATA]: (state, value) => {
+        state.tableData.items = value;
+    },
+    [SET_TABLE_FETCHING]: (state) => {
+        state.tableData.isFetching = true;
+    },
+    [RESET_TABLE_FETCHING]: (state) => {
+        state.tableData.isFetching = false;
+    },
+};
diff --git a/frontend/src/store/modules/errors/state.js b/frontend/src/store/modules/errors/state.js
new file mode 100644
index 00000000..5697bf96
--- /dev/null
+++ b/frontend/src/store/modules/errors/state.js
@@ -0,0 +1,13 @@
+import {period} from "@/services/periodService";
+
+export default {
+    selectedPeriod: period.PERIOD_LAST_WEEK,
+    chartData: {
+        items: [],
+        isFetching: false
+    },
+    tableData: {
+        items: [],
+        isFetching: false,
+    },
+};
diff --git a/frontend/src/store/modules/errors/types/actions.js b/frontend/src/store/modules/errors/types/actions.js
new file mode 100644
index 00000000..101c8b28
--- /dev/null
+++ b/frontend/src/store/modules/errors/types/actions.js
@@ -0,0 +1,6 @@
+export const CHANGE_SELECTED_PERIOD = 'changeSelectedPeriod';
+export const CHANGE_FETCHED_LINE_CHART_STATE = 'changeFetchedLineChartState';
+export const FETCH_LINE_CHART_DATA = 'fetchChartData';
+export const CHANGE_FETCHED_TABLE_STATE = 'changeFetchedTableState';
+export const FETCH_TABLE_DATA = 'fetchTableData';
+export const FETCH_PAGE_DATA = 'fetchPageData';
diff --git a/frontend/src/store/modules/errors/types/getters.js b/frontend/src/store/modules/errors/types/getters.js
new file mode 100644
index 00000000..79a656eb
--- /dev/null
+++ b/frontend/src/store/modules/errors/types/getters.js
@@ -0,0 +1,7 @@
+export const GET_SELECTED_PERIOD = 'getSelectedPeriod';
+export const GET_TABLE_DATA = 'getTableData';
+export const GET_TABLE_DATA_FETCHING = 'getTableDataFetching';
+export const GET_LINE_CHART_FETCHING = 'getLineChartFetching';
+export const GET_LINE_CHART_DATA = 'getChartData';
+export const GET_FORMAT_LINE_CHART_DATA = 'getFormatLineChartData';
+export const FETCH_TABLE_DATA = 'getTableData';
\ No newline at end of file
diff --git a/frontend/src/store/modules/errors/types/mutations.js b/frontend/src/store/modules/errors/types/mutations.js
new file mode 100644
index 00000000..6f70553c
--- /dev/null
+++ b/frontend/src/store/modules/errors/types/mutations.js
@@ -0,0 +1,7 @@
+export const SET_SELECTED_PERIOD = 'SET_SELECTED_PERIOD';
+export const SET_LINE_CHART_DATA = 'SET_LINE_CHART_DATA';
+export const SET_LINE_CHART_FETCHING = 'SET_LINE_CHART_FETCHING';
+export const RESET_LINE_CHART_FETCHING = 'RESET_LINE_CHART_FETCHING';
+export const RESET_TABLE_FETCHING = 'RESET_TABLE_FETCHING';
+export const SET_TABLE_FETCHING = 'SET_TABLE_FETCHING';
+export const SET_TABLE_DATA = 'SET_TABLE_DATA';

From 895139a1ef2096be4b414c549f4adf8577862ce7 Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Tue, 10 Sep 2019 10:29:34 +0300
Subject: [PATCH 121/183] change error url to error stack

---
 frontend/scripts/metrica.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/scripts/metrica.js b/frontend/scripts/metrica.js
index 52c93c4d..25db0c28 100644
--- a/frontend/scripts/metrica.js
+++ b/frontend/scripts/metrica.js
@@ -10,7 +10,7 @@
         }
     }
 
-    window.onerror = (errorMsg, errorUrl) => {
+    window.onerror = (message, source, lineno, colno, error) => {
         const url = state.host_api + state.routes.create_error;
         const tracking_number = window._metricaTracking.getObjectMetricaConf()[1][1];
         const token = window._metricaTracking.getToken();
@@ -19,8 +19,8 @@
             'x-website': tracking_number,
         };
         let data = {
-            message: errorMsg,
-            stack_trace: errorUrl,
+            message: error.message,
+            stack_trace: error.stack,
             page: window._metricaTracking.getPage(),
             page_title: window._metricaTracking.getTitle(),
 

From 3c27b562b0413448d06e59805581bd1c1e0ac953 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Tue, 10 Sep 2019 11:02:47 +0300
Subject: [PATCH 122/183] temp commit

---
 frontend/src/api/auth.js                            | 1 +
 frontend/src/components/auth/ChangePasswordFrom.vue | 5 +++++
 frontend/src/store/modules/auth/actions.js          | 2 --
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/src/api/auth.js b/frontend/src/api/auth.js
index e611d64b..a23eb57e 100644
--- a/frontend/src/api/auth.js
+++ b/frontend/src/api/auth.js
@@ -13,6 +13,7 @@ const socialLogin = params => {
 };
 const confirmEmail = params => requestService.update(resourceUrl + '/confirm-email', params);
 
+
 export {
     authorize,
     getAuthUser,
diff --git a/frontend/src/components/auth/ChangePasswordFrom.vue b/frontend/src/components/auth/ChangePasswordFrom.vue
index 1e89a6ee..92936e5a 100644
--- a/frontend/src/components/auth/ChangePasswordFrom.vue
+++ b/frontend/src/components/auth/ChangePasswordFrom.vue
@@ -58,6 +58,7 @@
                     >
                         Sign in
                     </RouterLink>
+                    {{ tok }}
                 </div>
             </div>
         </VForm>
@@ -80,6 +81,7 @@
                     password: '',
                     confirmPassword: '',
                 },
+                tok:'',
                 valid: false,
                 passwordRules: [
                     v => !!v || 'Password is required',
@@ -95,6 +97,9 @@
             if (jwtService.checkExpireToken(this.$route.query.token)) {
                 this.showErrorMessage('Sorry, your token was expired. Please, enter your email again.');
                 this.$router.push({name: 'reset-password'});
+            }else {
+                const jwt = jwtService.parse(this.$route.query.token);
+                this.tok = jwt;
             }
         },
         methods: {
diff --git a/frontend/src/store/modules/auth/actions.js b/frontend/src/store/modules/auth/actions.js
index 560a5574..3fc98df1 100644
--- a/frontend/src/store/modules/auth/actions.js
+++ b/frontend/src/store/modules/auth/actions.js
@@ -34,8 +34,6 @@ export default {
             }).catch((response) => {
                 return Promise.reject(response.response.data.error.message);
             });
-
-
     },
 
     [LOGOUT]: (context) => {

From 17132d8e39a0e58ada591404f92297faac479c6c Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Tue, 10 Sep 2019 11:24:37 +0300
Subject: [PATCH 123/183] fix spread syntax

---
 frontend/scripts/metrica.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/scripts/metrica.js b/frontend/scripts/metrica.js
index 25db0c28..2fc148dc 100644
--- a/frontend/scripts/metrica.js
+++ b/frontend/scripts/metrica.js
@@ -29,7 +29,7 @@
         if (token) {
             headers = {
                 ...headers,
-                ...{'x-visitor': 'Bearer ' + token}
+                'x-visitor': 'Bearer ' + token
             };
         }
 

From 3fd9b6b392d2560bfe8360d4b272721a230fc954 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Tue, 10 Sep 2019 11:35:16 +0300
Subject: [PATCH 124/183] remove unnecessary css rule

---
 frontend/src/components/common/LineChart.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frontend/src/components/common/LineChart.vue b/frontend/src/components/common/LineChart.vue
index 4fdd421b..e4e66364 100644
--- a/frontend/src/components/common/LineChart.vue
+++ b/frontend/src/components/common/LineChart.vue
@@ -145,9 +145,6 @@
         justify-content: center;
         align-content: center;
     }
-    ::v-deep .v-card-title {
-        color: crimson;
-    }
     ::v-deep svg path {
         fill: none;
     }

From 2a3fac02873a254ae8ba9d158aabf67b7fdad765 Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Tue, 10 Sep 2019 11:48:48 +0300
Subject: [PATCH 125/183] move logic to an existing module

---
 .../src/store/modules/error_report/actions.js | 20 ++++++-
 .../src/store/modules/error_report/getters.js |  8 +++
 .../store/modules/error_report/mutations.js   | 14 ++++-
 .../src/store/modules/error_report/state.js   |  4 ++
 .../modules/error_report/types/actions.js     |  3 ++
 .../modules/error_report/types/getters.js     |  4 ++
 .../modules/error_report/types/mutations.js   |  3 ++
 frontend/src/store/modules/errors/actions.js  | 52 -------------------
 frontend/src/store/modules/errors/getters.js  | 23 --------
 frontend/src/store/modules/errors/index.js    | 12 -----
 .../src/store/modules/errors/mutations.js     | 33 ------------
 frontend/src/store/modules/errors/state.js    | 13 -----
 .../src/store/modules/errors/types/actions.js |  6 ---
 .../src/store/modules/errors/types/getters.js |  7 ---
 .../store/modules/errors/types/mutations.js   |  7 ---
 15 files changed, 54 insertions(+), 155 deletions(-)
 delete mode 100644 frontend/src/store/modules/errors/actions.js
 delete mode 100644 frontend/src/store/modules/errors/getters.js
 delete mode 100644 frontend/src/store/modules/errors/index.js
 delete mode 100644 frontend/src/store/modules/errors/mutations.js
 delete mode 100644 frontend/src/store/modules/errors/state.js
 delete mode 100644 frontend/src/store/modules/errors/types/actions.js
 delete mode 100644 frontend/src/store/modules/errors/types/getters.js
 delete mode 100644 frontend/src/store/modules/errors/types/mutations.js

diff --git a/frontend/src/store/modules/error_report/actions.js b/frontend/src/store/modules/error_report/actions.js
index 090f5ade..6fe65d0f 100644
--- a/frontend/src/store/modules/error_report/actions.js
+++ b/frontend/src/store/modules/error_report/actions.js
@@ -2,13 +2,18 @@ import {
     CHANGE_SELECTED_PERIOD,
     FETCH_PAGE_DATA,
     FETCH_CHART_DATA,
+    CHANGE_FETCHED_LINE_CHART_STATE,
+    CHANGE_FETCHED_TABLE_STATE,
+    FETCH_TABLE_DATA,
 } from "./types/actions";
 
 import {
     SET_SELECTED_PERIOD,
     SET_CHART_VALUES,
     RESET_CHART_FETCHING,
-    SET_CHART_FETCHING
+    SET_CHART_FETCHING,
+    RESET_TABLE_FETCHING,
+    SET_TABLE_FETCHING,
 } from "./types/mutations";
 
 export default {
@@ -18,6 +23,7 @@ export default {
     },
     [FETCH_PAGE_DATA]: (context) => {
         context.dispatch(FETCH_CHART_DATA);
+        context.dispatch(FETCH_TABLE_DATA);
     },
 
     [FETCH_CHART_DATA]: (context) => {
@@ -44,4 +50,16 @@ export default {
 
         }).finally(() => context.commit(RESET_CHART_FETCHING));
     },
+    [CHANGE_FETCHED_TABLE_STATE]: (context, value) => {
+
+        if (value) {
+            context.commit(SET_TABLE_FETCHING);
+        } else {
+            context.commit(RESET_TABLE_FETCHING);
+        }
+    },
+    [FETCH_TABLE_DATA]: (context) => {
+        context.commit(SET_TABLE_FETCHING);
+        context.commit(RESET_TABLE_FETCHING);
+    },
 };
diff --git a/frontend/src/store/modules/error_report/getters.js b/frontend/src/store/modules/error_report/getters.js
index 4c5c6662..bc51c3e9 100644
--- a/frontend/src/store/modules/error_report/getters.js
+++ b/frontend/src/store/modules/error_report/getters.js
@@ -2,6 +2,10 @@ import {
     GET_SELECTED_PERIOD,
     GET_LINE_CHART_DATA,
     GET_FORMAT_LINE_CHART_DATA,
+    GET_TABLE_DATA,
+    GET_TABLE_DATA_FETCHING,
+    GET_LINE_CHART_FETCHING,
+    FETCH_TABLE_DATA,
 } from "./types/getters";
 
 import { chartDataTransformer } from "@/api/widgets/transformers";
@@ -12,4 +16,8 @@ export default {
     [GET_FORMAT_LINE_CHART_DATA]: (state) => {
         return chartDataTransformer(state.chartData.items, state.selectedPeriod);
     },
+    [GET_TABLE_DATA]: (state) => state.tableData,
+    [GET_TABLE_DATA_FETCHING]: (state) => state.tableData.isFetching,
+    [GET_LINE_CHART_FETCHING]: (state) => state.chartData.isFetching,
+    [FETCH_TABLE_DATA]: (state) => state.tableData,
 };
diff --git a/frontend/src/store/modules/error_report/mutations.js b/frontend/src/store/modules/error_report/mutations.js
index 1c12694f..4e01a108 100644
--- a/frontend/src/store/modules/error_report/mutations.js
+++ b/frontend/src/store/modules/error_report/mutations.js
@@ -3,6 +3,9 @@ import {
     SET_CHART_VALUES,
     SET_CHART_FETCHING,
     RESET_CHART_FETCHING,
+    SET_TABLE_DATA,
+    SET_TABLE_FETCHING,
+    RESET_TABLE_FETCHING,
 } from "./types/mutations";
 
 export default {
@@ -17,5 +20,14 @@ export default {
     },
     [RESET_CHART_FETCHING]: (state) => {
         state.chartData.isFetching = false;
-    }
+    },
+    [SET_TABLE_DATA]: (state, value) => {
+        state.tableData.items = value;
+    },
+    [SET_TABLE_FETCHING]: (state) => {
+        state.tableData.isFetching = true;
+    },
+    [RESET_TABLE_FETCHING]: (state) => {
+        state.tableData.isFetching = false;
+    },
 };
diff --git a/frontend/src/store/modules/error_report/state.js b/frontend/src/store/modules/error_report/state.js
index 3d728581..5697bf96 100644
--- a/frontend/src/store/modules/error_report/state.js
+++ b/frontend/src/store/modules/error_report/state.js
@@ -6,4 +6,8 @@ export default {
         items: [],
         isFetching: false
     },
+    tableData: {
+        items: [],
+        isFetching: false,
+    },
 };
diff --git a/frontend/src/store/modules/error_report/types/actions.js b/frontend/src/store/modules/error_report/types/actions.js
index 2401fc29..826baa3e 100644
--- a/frontend/src/store/modules/error_report/types/actions.js
+++ b/frontend/src/store/modules/error_report/types/actions.js
@@ -1,3 +1,6 @@
 export const CHANGE_SELECTED_PERIOD = 'changeSelectedPeriod';
 export const FETCH_PAGE_DATA = 'fetchPageData';
 export const FETCH_CHART_DATA = 'fetchChartData';
+export const CHANGE_FETCHED_TABLE_STATE = 'changeFetchedTableState';
+export const FETCH_TABLE_DATA = 'fetchTableData';
+export const CHANGE_FETCHED_LINE_CHART_STATE = 'changeFetchedLineChartState';
diff --git a/frontend/src/store/modules/error_report/types/getters.js b/frontend/src/store/modules/error_report/types/getters.js
index b832b842..16859d76 100644
--- a/frontend/src/store/modules/error_report/types/getters.js
+++ b/frontend/src/store/modules/error_report/types/getters.js
@@ -1,3 +1,7 @@
 export const GET_SELECTED_PERIOD = 'getSelectedPeriod';
 export const GET_LINE_CHART_DATA = 'getLineChartData';
 export const GET_FORMAT_LINE_CHART_DATA = 'getFormatLineChartData';
+export const GET_TABLE_DATA = 'getTableData';
+export const GET_TABLE_DATA_FETCHING = 'getTableDataFetching';
+export const GET_LINE_CHART_FETCHING = 'getLineChartFetching';
+export const FETCH_TABLE_DATA = 'getTableData';
diff --git a/frontend/src/store/modules/error_report/types/mutations.js b/frontend/src/store/modules/error_report/types/mutations.js
index 8b6fcc2a..44232973 100644
--- a/frontend/src/store/modules/error_report/types/mutations.js
+++ b/frontend/src/store/modules/error_report/types/mutations.js
@@ -2,3 +2,6 @@ export const SET_SELECTED_PERIOD = 'SET_SELECTED_PERIOD';
 export const SET_CHART_VALUES = 'SET_CHART_VALUES';
 export const RESET_CHART_FETCHING = 'RESET_CHART_FETCHING';
 export const SET_CHART_FETCHING = 'SET_CHART_FETCHING';
+export const RESET_TABLE_FETCHING = 'RESET_TABLE_FETCHING';
+export const SET_TABLE_FETCHING = 'SET_TABLE_FETCHING';
+export const SET_TABLE_DATA = 'SET_TABLE_DATA';
diff --git a/frontend/src/store/modules/errors/actions.js b/frontend/src/store/modules/errors/actions.js
deleted file mode 100644
index caf3cb4b..00000000
--- a/frontend/src/store/modules/errors/actions.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import {
-    CHANGE_SELECTED_PERIOD,
-    CHANGE_FETCHED_LINE_CHART_STATE,
-    FETCH_LINE_CHART_DATA,
-    CHANGE_FETCHED_TABLE_STATE,
-    FETCH_TABLE_DATA,
-    FETCH_PAGE_DATA
-} from "./types/actions";
-import {
-    SET_SELECTED_PERIOD,
-    RESET_TABLE_FETCHING,
-    SET_TABLE_FETCHING,
-    RESET_LINE_CHART_FETCHING,
-    SET_LINE_CHART_FETCHING,
-} from "./types/mutations";
-
-import {getTimeByPeriod} from '@/services/periodService';
-
-export default {
-    [CHANGE_SELECTED_PERIOD]: (context, payload) => {
-        context.commit(SET_SELECTED_PERIOD, payload.value);
-        context.dispatch(FETCH_PAGE_DATA);
-    },
-    [CHANGE_FETCHED_LINE_CHART_STATE]: (context, value) => {
-
-        if (value) {
-            context.commit(SET_LINE_CHART_FETCHING);
-        } else {
-            context.commit(RESET_LINE_CHART_FETCHING);
-        }
-    },
-    [FETCH_LINE_CHART_DATA]: (context) => {
-        context.commit(SET_LINE_CHART_FETCHING);
-        context.commit(RESET_LINE_CHART_FETCHING)
-    },
-    [CHANGE_FETCHED_TABLE_STATE]: (context, value) => {
-
-        if (value) {
-            context.commit(SET_TABLE_FETCHING);
-        } else {
-            context.commit(RESET_TABLE_FETCHING);
-        }
-    },
-    [FETCH_TABLE_DATA]: (context) => {
-        context.commit(SET_TABLE_FETCHING);
-        context.commit(RESET_TABLE_FETCHING)
-    },
-    [FETCH_PAGE_DATA]: (context) => {
-        context.dispatch(FETCH_TABLE_DATA);
-        context.dispatch(FETCH_LINE_CHART_DATA);
-    }
-};
diff --git a/frontend/src/store/modules/errors/getters.js b/frontend/src/store/modules/errors/getters.js
deleted file mode 100644
index d9d44b6e..00000000
--- a/frontend/src/store/modules/errors/getters.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import {
-    GET_SELECTED_PERIOD,
-    GET_TABLE_DATA,
-    GET_TABLE_DATA_FETCHING,
-    GET_LINE_CHART_FETCHING,
-    GET_LINE_CHART_DATA,
-    GET_FORMAT_LINE_CHART_DATA,
-    FETCH_TABLE_DATA,
-} from "./types/getters";
-
-import { chartDataTransformer } from "@/api/widgets/transformers";
-
-export default {
-    [GET_SELECTED_PERIOD]: (state) => state.selectedPeriod,
-    [GET_TABLE_DATA]: (state) => state.tableData,
-    [GET_TABLE_DATA_FETCHING]: (state) => state.tableData.isFetching,
-    [GET_LINE_CHART_FETCHING]: (state) => state.chartData.isFetching,
-    [GET_LINE_CHART_DATA]: (state) => state.chartData,
-    [FETCH_TABLE_DATA]: (state) => state.tableData,
-    [GET_FORMAT_LINE_CHART_DATA]: (state) => {
-        return chartDataTransformer(state.chartData.items, state.selectedPeriod);
-    },
-};
diff --git a/frontend/src/store/modules/errors/index.js b/frontend/src/store/modules/errors/index.js
deleted file mode 100644
index a8a9d106..00000000
--- a/frontend/src/store/modules/errors/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import state from './state';
-import getters from './getters';
-import actions from './actions';
-import mutations from './mutations';
-
-export default {
-    namespaced: true,
-    state,
-    getters,
-    actions,
-    mutations
-};
diff --git a/frontend/src/store/modules/errors/mutations.js b/frontend/src/store/modules/errors/mutations.js
deleted file mode 100644
index a5657af4..00000000
--- a/frontend/src/store/modules/errors/mutations.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import {
-    SET_SELECTED_PERIOD,
-    SET_LINE_CHART_DATA,
-    SET_LINE_CHART_FETCHING,
-    RESET_LINE_CHART_FETCHING,
-    SET_TABLE_DATA,
-    SET_TABLE_FETCHING,
-    RESET_TABLE_FETCHING,
-} from "./types/mutations";
-
-export default {
-    [SET_SELECTED_PERIOD]: (state, period) => {
-        state.selectedPeriod = period;
-    },
-    [SET_LINE_CHART_DATA]: (state, value) => {
-        state.chartData.items = value;
-    },
-    [SET_LINE_CHART_FETCHING]: (state) => {
-        state.chartData.isFetching = true;
-    },
-    [RESET_LINE_CHART_FETCHING]: (state) => {
-        state.chartData.isFetching = false;
-    },
-    [SET_TABLE_DATA]: (state, value) => {
-        state.tableData.items = value;
-    },
-    [SET_TABLE_FETCHING]: (state) => {
-        state.tableData.isFetching = true;
-    },
-    [RESET_TABLE_FETCHING]: (state) => {
-        state.tableData.isFetching = false;
-    },
-};
diff --git a/frontend/src/store/modules/errors/state.js b/frontend/src/store/modules/errors/state.js
deleted file mode 100644
index 5697bf96..00000000
--- a/frontend/src/store/modules/errors/state.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import {period} from "@/services/periodService";
-
-export default {
-    selectedPeriod: period.PERIOD_LAST_WEEK,
-    chartData: {
-        items: [],
-        isFetching: false
-    },
-    tableData: {
-        items: [],
-        isFetching: false,
-    },
-};
diff --git a/frontend/src/store/modules/errors/types/actions.js b/frontend/src/store/modules/errors/types/actions.js
deleted file mode 100644
index 101c8b28..00000000
--- a/frontend/src/store/modules/errors/types/actions.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export const CHANGE_SELECTED_PERIOD = 'changeSelectedPeriod';
-export const CHANGE_FETCHED_LINE_CHART_STATE = 'changeFetchedLineChartState';
-export const FETCH_LINE_CHART_DATA = 'fetchChartData';
-export const CHANGE_FETCHED_TABLE_STATE = 'changeFetchedTableState';
-export const FETCH_TABLE_DATA = 'fetchTableData';
-export const FETCH_PAGE_DATA = 'fetchPageData';
diff --git a/frontend/src/store/modules/errors/types/getters.js b/frontend/src/store/modules/errors/types/getters.js
deleted file mode 100644
index 79a656eb..00000000
--- a/frontend/src/store/modules/errors/types/getters.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const GET_SELECTED_PERIOD = 'getSelectedPeriod';
-export const GET_TABLE_DATA = 'getTableData';
-export const GET_TABLE_DATA_FETCHING = 'getTableDataFetching';
-export const GET_LINE_CHART_FETCHING = 'getLineChartFetching';
-export const GET_LINE_CHART_DATA = 'getChartData';
-export const GET_FORMAT_LINE_CHART_DATA = 'getFormatLineChartData';
-export const FETCH_TABLE_DATA = 'getTableData';
\ No newline at end of file
diff --git a/frontend/src/store/modules/errors/types/mutations.js b/frontend/src/store/modules/errors/types/mutations.js
deleted file mode 100644
index 6f70553c..00000000
--- a/frontend/src/store/modules/errors/types/mutations.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const SET_SELECTED_PERIOD = 'SET_SELECTED_PERIOD';
-export const SET_LINE_CHART_DATA = 'SET_LINE_CHART_DATA';
-export const SET_LINE_CHART_FETCHING = 'SET_LINE_CHART_FETCHING';
-export const RESET_LINE_CHART_FETCHING = 'RESET_LINE_CHART_FETCHING';
-export const RESET_TABLE_FETCHING = 'RESET_TABLE_FETCHING';
-export const SET_TABLE_FETCHING = 'SET_TABLE_FETCHING';
-export const SET_TABLE_DATA = 'SET_TABLE_DATA';

From 5d28f1809d13c894beced353372cc682fe7f6ced Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Tue, 10 Sep 2019 11:51:26 +0300
Subject: [PATCH 126/183] remove unusable actions

---
 frontend/src/store/modules/error_report/actions.js     | 10 ----------
 .../src/store/modules/error_report/types/actions.js    |  3 +--
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/frontend/src/store/modules/error_report/actions.js b/frontend/src/store/modules/error_report/actions.js
index 6fe65d0f..3625d0b1 100644
--- a/frontend/src/store/modules/error_report/actions.js
+++ b/frontend/src/store/modules/error_report/actions.js
@@ -2,8 +2,6 @@ import {
     CHANGE_SELECTED_PERIOD,
     FETCH_PAGE_DATA,
     FETCH_CHART_DATA,
-    CHANGE_FETCHED_LINE_CHART_STATE,
-    CHANGE_FETCHED_TABLE_STATE,
     FETCH_TABLE_DATA,
 } from "./types/actions";
 
@@ -50,14 +48,6 @@ export default {
 
         }).finally(() => context.commit(RESET_CHART_FETCHING));
     },
-    [CHANGE_FETCHED_TABLE_STATE]: (context, value) => {
-
-        if (value) {
-            context.commit(SET_TABLE_FETCHING);
-        } else {
-            context.commit(RESET_TABLE_FETCHING);
-        }
-    },
     [FETCH_TABLE_DATA]: (context) => {
         context.commit(SET_TABLE_FETCHING);
         context.commit(RESET_TABLE_FETCHING);
diff --git a/frontend/src/store/modules/error_report/types/actions.js b/frontend/src/store/modules/error_report/types/actions.js
index 826baa3e..97d97cc1 100644
--- a/frontend/src/store/modules/error_report/types/actions.js
+++ b/frontend/src/store/modules/error_report/types/actions.js
@@ -1,6 +1,5 @@
 export const CHANGE_SELECTED_PERIOD = 'changeSelectedPeriod';
 export const FETCH_PAGE_DATA = 'fetchPageData';
 export const FETCH_CHART_DATA = 'fetchChartData';
-export const CHANGE_FETCHED_TABLE_STATE = 'changeFetchedTableState';
 export const FETCH_TABLE_DATA = 'fetchTableData';
-export const CHANGE_FETCHED_LINE_CHART_STATE = 'changeFetchedLineChartState';
+

From 7fdccb024f34ee17ac333075cc7868f492b81233 Mon Sep 17 00:00:00 2001
From: Volodymyr <tumko.volodymyr@gmail.com>
Date: Tue, 10 Sep 2019 12:01:32 +0300
Subject: [PATCH 127/183] trim zero values from array

---
 .../app/Actions/Visitors/BounceRateAction.php | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/backend/app/Actions/Visitors/BounceRateAction.php b/backend/app/Actions/Visitors/BounceRateAction.php
index 0adcb179..fba1d6fb 100644
--- a/backend/app/Actions/Visitors/BounceRateAction.php
+++ b/backend/app/Actions/Visitors/BounceRateAction.php
@@ -27,19 +27,29 @@ public function execute(BounceRateRequest $request): BounceRateResponse
         $allVisitorsByTimeFrameValues = $this->repository->getVisitorsCountByTimeFrame($filterData);
         $bounceVisitorsByTimeFrameValues = $this->repository->getBouncedVisitorsCountByTimeFrame($filterData);
 
-        $start = $from->getTimestamp() - ($from->getTimestamp()%$timeFrame);
-        $end = $to->getTimestamp() - ($to->getTimestamp()%$timeFrame);
-        $collection = new Collection();
+        $start = $from->getTimestamp() - ($from->getTimestamp() % $timeFrame);
+        $end = $to->getTimestamp() - ($to->getTimestamp() % $timeFrame);
+        $hasFirst = false;
+        $length = 0;
+        $lastLength = 0;
+        $items = [];
         do {
             $all = $allVisitorsByTimeFrameValues[$start]??0;
-            if ($all === 0) {
+            $bounced = $bounceVisitorsByTimeFrameValues[$start]??0;
+            $rate = ($all === 0) ? 0 : ($bounced / $all);
+
+            if (!$hasFirst && $rate === 0) {
                 continue;
             }
-            $bounced = $bounceVisitorsByTimeFrameValues[$start]??0;
-            $rate = $bounced / $all;
-            $collection->add(new ChartValue((string) $start, (string) $rate));
-        } while (($start+=$timeFrame)<=$end);
+            $length++;
+            $hasFirst = true;
+            if ($rate !== 0){
+                $lastLength = $length;
+            }
+            $items[] = new ChartValue((string)$start, (string)$rate);
+        } while (($start += $timeFrame) <= $end);
 
+        $collection = new Collection(array_slice($items, 0, $lastLength));
         return new BounceRateResponse($collection);
     }
 }

From 7505ebf8f8f1aa4215520d8e351af07e97743518 Mon Sep 17 00:00:00 2001
From: Volodymyr <tumko.volodymyr@gmail.com>
Date: Tue, 10 Sep 2019 12:06:10 +0300
Subject: [PATCH 128/183] fix style

---
 backend/app/Actions/Visitors/BounceRateAction.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/app/Actions/Visitors/BounceRateAction.php b/backend/app/Actions/Visitors/BounceRateAction.php
index fba1d6fb..ac11d61a 100644
--- a/backend/app/Actions/Visitors/BounceRateAction.php
+++ b/backend/app/Actions/Visitors/BounceRateAction.php
@@ -43,7 +43,7 @@ public function execute(BounceRateRequest $request): BounceRateResponse
             }
             $length++;
             $hasFirst = true;
-            if ($rate !== 0){
+            if ($rate !== 0) {
                 $lastLength = $length;
             }
             $items[] = new ChartValue((string)$start, (string)$rate);

From af638a980f4d09f913b9a7dd1ebcee4912fc61cf Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Tue, 10 Sep 2019 12:35:02 +0300
Subject: [PATCH 129/183] fix creating indexes, fix aggregate method

---
 .../VisitorsFlow/GetVisitorsFlowAction.php    |  4 --
 .../VisitorFlowBrowserRepository.php          |  2 -
 .../VisitorFlowCountryRepository.php          |  2 -
 .../Contracts/VisitorFlowDeviceRepository.php |  2 -
 .../Contracts/VisitorFlowScreenRepository.php |  2 -
 ...sticsearchVisitorFlowBrowserRepository.php | 13 ----
 ...sticsearchVisitorFlowCountryRepository.php | 13 ----
 ...asticsearchVisitorFlowDeviceRepository.php | 13 ----
 ...asticsearchVisitorFlowScreenRepository.php | 13 ----
 .../VisitorsFlow/FlowAggregateService.php     | 71 ++++++++++---------
 ...215_create_country_visitors_flow_index.php | 14 ++--
 ...610_create_browser_visitors_flow_index.php | 13 ++--
 ...3620_create_device_visitors_flow_index.php | 13 ++--
 ...3634_create_screen_visitors_flow_index.php | 13 ++--
 14 files changed, 69 insertions(+), 119 deletions(-)

diff --git a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
index c9ad325d..da9b56b3 100644
--- a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
+++ b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
@@ -39,7 +39,6 @@ public function execute(GetVisitorsFlowRequest $request): GetVisitorFlowResponse
                 $browsersViews = $this->visitorsFlowBrowserRepository->getViewsByEachBrowser($request->getParameter(), $websiteId);
                 $browsersFlow = $this->visitorsFlowBrowserRepository->getFlow($websiteId, $request->getLevel());
                 return new GetVisitorFlowResponse($browsersFlow->getCollection(), $browsersViews->getCollection());
-                break;
             case 'country':
                 if ($request->getLevel() > 2) {
                     $countriesFlow = $this->visitorsFlowCountryRepository->getFlow($websiteId, $request->getLevel());
@@ -48,7 +47,6 @@ public function execute(GetVisitorsFlowRequest $request): GetVisitorFlowResponse
                 $countriesViews = $this->visitorsFlowCountryRepository->getViewsByEachCountry($request->getParameter(), $websiteId);
                 $countriesFlow = $this->visitorsFlowCountryRepository->getFlow($websiteId, $request->getLevel());
                 return new GetVisitorFlowResponse($countriesFlow->getCollection(), $countriesViews->getCollection());
-                break;
             case 'device':
                 if ($request->getLevel() > 2) {
                     $devicesFlow = $this->visitorsFlowDeviceRepository->getFlow($websiteId, $request->getLevel());
@@ -57,7 +55,6 @@ public function execute(GetVisitorsFlowRequest $request): GetVisitorFlowResponse
                 $devicesViews = $this->visitorsFlowDeviceRepository->getViewsByEachDevice($request->getParameter(), $websiteId);
                 $devicesFlow = $this->visitorsFlowDeviceRepository->getFlow($websiteId, $request->getLevel());
                 return new GetVisitorFlowResponse($devicesFlow->getCollection(), $devicesViews->getCollection());
-                break;
             case 'screen':
                 if ($request->getLevel() > 2) {
                     $screensFlow = $this->visitorsFlowScreenRepository->getFlow($websiteId, $request->getLevel());
@@ -66,7 +63,6 @@ public function execute(GetVisitorsFlowRequest $request): GetVisitorFlowResponse
                 $screensViews = $this->visitorsFlowScreenRepository->getViewsByEachScreen($websiteId);
                 $screensFlow = $this->visitorsFlowScreenRepository->getFlow($websiteId, $request->getLevel());
                 return new GetVisitorFlowResponse($screensFlow->getCollection(), $screensViews->getCollection());
-                break;
         }
     }
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php
index 9b914d7e..c4f7bd6d 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowBrowserRepository.php
@@ -12,8 +12,6 @@ interface VisitorFlowBrowserRepository extends VisitorFlowRepository
 {
     public function save(Aggregate $browserAggregate): Aggregate;
 
-    public function update(Aggregate $browserAggregate): Aggregate;
-
     public function getByCriteria(Criteria $criteria): ?BrowserAggregate;
 
     public function getViewsByEachBrowser(string $type, int $websiteId): ParametersCollection;
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php
index 8438e8b0..8e571008 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowCountryRepository.php
@@ -12,8 +12,6 @@ interface VisitorFlowCountryRepository extends VisitorFlowRepository
 {
     public function save(Aggregate $tableAggregate): Aggregate;
 
-    public function update(Aggregate $tableAggregate): Aggregate;
-
     public function getByCriteria(Criteria $criteria): ?CountryAggregate;
 
     public function getFlow(int $websiteId, int $level): ParameterFlowCollection;
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowDeviceRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowDeviceRepository.php
index 28853f7d..6df812fd 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowDeviceRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowDeviceRepository.php
@@ -12,8 +12,6 @@ interface VisitorFlowDeviceRepository extends VisitorFlowRepository
 {
     public function save(Aggregate $deviceAggregate): Aggregate;
 
-    public function update(Aggregate $deviceAggregate): Aggregate;
-
     public function getByCriteria(Criteria $criteria): ?DeviceAggregate;
 
     public function getFlow(int $websiteId, int $level): ParameterFlowCollection;
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php
index a2787797..9e09bac9 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/Contracts/VisitorFlowScreenRepository.php
@@ -12,8 +12,6 @@ interface VisitorFlowScreenRepository extends VisitorFlowRepository
 {
     public function save(Aggregate $browserAggregate): Aggregate;
 
-    public function update(Aggregate $browserAggregate): Aggregate;
-
     public function getByCriteria(Criteria $criteria): ?ScreenAggregate;
 
     public function getFlow(int $websiteId, int $level): ParameterFlowCollection;
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
index 162ed0b1..ceff266a 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
@@ -33,19 +33,6 @@ public function save(Aggregate $browserAggregate): Aggregate
         return $browserAggregate;
     }
 
-    public function update(Aggregate $browserAggregate): Aggregate
-    {
-        $this->client->index([
-            'index' => self::INDEX_NAME,
-            'id' => $browserAggregate->getId(),
-            'type' => '_doc',
-            'body' => $browserAggregate->toArray()
-        ]);
-
-        return $browserAggregate;
-    }
-
-
     public function getByCriteria(Criteria $criteria): ?BrowserAggregate
     {
         $params = [
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
index 5e89956a..a81d8830 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
@@ -33,19 +33,6 @@ public function save(Aggregate $countryAggregate): Aggregate
         return $countryAggregate;
     }
 
-    public function update(Aggregate $countryAggregate): Aggregate
-    {
-        $this->client->index([
-            'index' => self::INDEX_NAME,
-            'id' => $countryAggregate->getId(),
-            'type' => '_doc',
-            'body' => $countryAggregate->toArray()
-        ]);
-
-        return $countryAggregate;
-    }
-
-
     public function getByCriteria(Criteria $criteria): ?CountryAggregate
     {
         $params = [
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
index f49a3d03..1016289b 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
@@ -33,19 +33,6 @@ public function save(Aggregate $deviceAggregate): Aggregate
         return $deviceAggregate;
     }
 
-    public function update(Aggregate $deviceAggregate): Aggregate
-    {
-        $this->client->index([
-            'index' => self::INDEX_NAME,
-            'id' => $deviceAggregate->getId(),
-            'type' => '_doc',
-            'body' => $deviceAggregate->toArray()
-        ]);
-
-        return $deviceAggregate;
-    }
-
-
     public function getByCriteria(Criteria $criteria): ?DeviceAggregate
     {
         $params = [
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
index 29687a8a..daff1727 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
@@ -34,19 +34,6 @@ public function save(Aggregate $screenAggregate): Aggregate
         return $screenAggregate;
     }
 
-    public function update(Aggregate $screenAggregate): Aggregate
-    {
-        $this->client->index([
-            'index' => self::INDEX_NAME,
-            'id' => $screenAggregate->getId(),
-            'type' => '_doc',
-            'body' => $screenAggregate->toArray()
-        ]);
-
-        return $screenAggregate;
-    }
-
-
     public function getByCriteria(Criteria $criteria): ?ScreenAggregate
     {
         $params = [
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 3ceb0410..14ec5014 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -33,6 +33,7 @@ final class FlowAggregateService
     private $visitorFlowBrowserRepository;
     private $visitorFlowDeviceRepository;
     private $visitorFlowScreenRepository;
+    private const FIRST_LEVEL = 1;
 
     public function __construct(
         PageRepository $pageRepository,
@@ -76,13 +77,13 @@ private function getLevel(Visit $visit, bool $isFirstInSession): int
         if (!$isFirstInSession) {
             return $this->getVisitsCount($visit);
         }
-        return 1;
+        return self::FIRST_LEVEL;
     }
 
     private function updateCountryAggregate(
         Visit $visit,
         int $level,
-        Visit $previousVisit,
+        ?Visit $previousVisit,
         ?CountryAggregate $countryAggregate): void
     {
         if (!$countryAggregate) {
@@ -90,7 +91,7 @@ private function updateCountryAggregate(
             $this->visitorFlowCountryRepository->save($countryAggregate);
             return;
         }
-        if ($level > 1) {
+        if ($level > self::FIRST_LEVEL) {
             $previousAggregate = CountryAggregate::getPreviousAggregate(
                 $this->visitorFlowCountryRepository,
                 $previousVisit,
@@ -99,25 +100,25 @@ private function updateCountryAggregate(
             );
             $previousAggregate->isLastPage = false;
             $previousAggregate->exitCount--;
-            $this->visitorFlowCountryRepository->update($previousAggregate);
+            $this->visitorFlowCountryRepository->save($previousAggregate);
         }
         $countryAggregate->views++;
         $countryAggregate->exitCount++;
-        $this->visitorFlowCountryRepository->update($countryAggregate);
+        $this->visitorFlowCountryRepository->save($countryAggregate);
     }
 
     private function updateBrowserAggregate(
         Visit $visit,
         int $level,
-        Visit $previousVisit,
-        ?BrowserAggregate $browserAggregate): void
-    {
+        ?Visit $previousVisit,
+        ?BrowserAggregate $browserAggregate
+    ): void {
         if (!$browserAggregate) {
             $browserAggregate = $this->createBrowserAggregate($visit, $level, $previousVisit);
             $this->visitorFlowBrowserRepository->save($browserAggregate);
             return;
         }
-        if ($level > 1) {
+        if ($level > self::FIRST_LEVEL) {
             $previousAggregate = BrowserAggregate::getPreviousAggregate(
                 $this->visitorFlowBrowserRepository,
                 $previousVisit,
@@ -126,25 +127,25 @@ private function updateBrowserAggregate(
             );
             $previousAggregate->isLastPage = false;
             $previousAggregate->exitCount--;
-            $this->visitorFlowBrowserRepository->update($previousAggregate);
+            $this->visitorFlowBrowserRepository->save($previousAggregate);
         }
         $browserAggregate->views++;
         $browserAggregate->exitCount++;
-        $this->visitorFlowBrowserRepository->update($browserAggregate);
+        $this->visitorFlowBrowserRepository->save($browserAggregate);
     }
 
     private function updateDeviceAggregate(
         Visit $visit,
         int $level,
-        Visit $previousVisit,
-        ?DeviceAggregate $deviceAggregate): void
-    {
+        ?Visit $previousVisit,
+        ?DeviceAggregate $deviceAggregate
+    ): void {
         if (!$deviceAggregate) {
             $deviceAggregate = $this->createDeviceAggregate($visit, $level, $previousVisit);
             $this->visitorFlowDeviceRepository->save($deviceAggregate);
             return;
         }
-        if ($level > 1) {
+        if ($level > self::FIRST_LEVEL) {
             $previousAggregate = DeviceAggregate::getPreviousAggregate(
                 $this->visitorFlowDeviceRepository,
                 $previousVisit,
@@ -153,25 +154,25 @@ private function updateDeviceAggregate(
             );
             $previousAggregate->isLastPage = false;
             $previousAggregate->exitCount--;
-            $this->visitorFlowDeviceRepository->update($previousAggregate);
+            $this->visitorFlowDeviceRepository->save($previousAggregate);
         }
         $deviceAggregate->views++;
         $deviceAggregate->exitCount++;
-        $this->visitorFlowDeviceRepository->update($deviceAggregate);
+        $this->visitorFlowDeviceRepository->save($deviceAggregate);
     }
 
     private function updateScreenAggregate(
         Visit $visit,
         int $level,
-        Visit $previousVisit,
-        ?ScreenAggregate $screenAggregate): void
-    {
+        ?Visit $previousVisit,
+        ?ScreenAggregate $screenAggregate
+    ): void {
         if (!$screenAggregate) {
             $screenAggregate = $this->createScreenAggregate($visit, $level, $previousVisit);
             $this->visitorFlowScreenRepository->save($screenAggregate);
             return;
         }
-        if ($level > 1) {
+        if ($level > self::FIRST_LEVEL) {
             $previousAggregate = ScreenAggregate::getPreviousAggregate(
                 $this->visitorFlowScreenRepository,
                 $previousVisit,
@@ -180,11 +181,11 @@ private function updateScreenAggregate(
             );
             $previousAggregate->isLastPage = false;
             $previousAggregate->exitCount--;
-            $this->visitorFlowScreenRepository->update($previousAggregate);
+            $this->visitorFlowScreenRepository->save($previousAggregate);
         }
         $screenAggregate->views++;
         $screenAggregate->exitCount++;
-        $this->visitorFlowScreenRepository->update($screenAggregate);
+        $this->visitorFlowScreenRepository->save($screenAggregate);
     }
 
     private function getLastVisit(Visit $currentVisit): ?Visit
@@ -221,7 +222,7 @@ private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit
         $website = $this->websiteRepository->getById($page->website_id);
         $geoPosition = $this->geoPositionRepository->getById($currentVisit->geo_position_id);
         $prevPage = new PageValue();
-        if ($level !== 1) {
+        if ($level !== self::FIRST_LEVEL) {
             $previousAggregate = CountryAggregate::getPreviousAggregate(
                 $this->visitorFlowCountryRepository,
                 $previousVisit,
@@ -230,7 +231,7 @@ private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit
             );
             $previousAggregate->isLastPage = false;
             $previousAggregate->exitCount--;
-            $this->visitorFlowCountryRepository->update($previousAggregate);
+            $this->visitorFlowCountryRepository->save($previousAggregate);
             $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
         }
 
@@ -256,7 +257,7 @@ private function createBrowserAggregate(Visit $currentVisit, int $level, ?Visit
         $page = $this->pageRepository->getById($currentVisit->page_id);
         $website = $this->websiteRepository->getById($page->website_id);
         $prevPage = new PageValue();
-        if ($level !== 1) {
+        if ($level !== self::FIRST_LEVEL) {
             $previousAggregate = BrowserAggregate::getPreviousAggregate(
                 $this->visitorFlowBrowserRepository,
                 $previousVisit,
@@ -265,7 +266,7 @@ private function createBrowserAggregate(Visit $currentVisit, int $level, ?Visit
             );
             $previousAggregate->isLastPage = false;
             $previousAggregate->exitCount--;
-            $this->visitorFlowBrowserRepository->update($previousAggregate);
+            $this->visitorFlowBrowserRepository->save($previousAggregate);
             $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
         }
         $exitCount = 1;
@@ -290,7 +291,7 @@ private function createDeviceAggregate(Visit $currentVisit, int $level, ?Visit $
         $page = $this->pageRepository->getById($currentVisit->page_id);
         $website = $this->websiteRepository->getById($page->website_id);
         $prevPage = new PageValue();
-        if ($level !== 1) {
+        if ($level !== self::FIRST_LEVEL) {
             $previousAggregate = DeviceAggregate::getPreviousAggregate(
                 $this->visitorFlowDeviceRepository,
                 $previousVisit,
@@ -299,7 +300,7 @@ private function createDeviceAggregate(Visit $currentVisit, int $level, ?Visit $
             );
             $previousAggregate->isLastPage = false;
             $previousAggregate->exitCount--;
-            $this->visitorFlowDeviceRepository->update($previousAggregate);
+            $this->visitorFlowDeviceRepository->save($previousAggregate);
             $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
         }
         $exitCount = 1;
@@ -324,7 +325,7 @@ private function createScreenAggregate(Visit $currentVisit, int $level, ?Visit $
         $page = $this->pageRepository->getById($currentVisit->page_id);
         $website = $this->websiteRepository->getById($page->website_id);
         $prevPage = new PageValue();
-        if ($level !== 1) {
+        if ($level !== self::FIRST_LEVEL) {
             $previousAggregate = ScreenAggregate::getPreviousAggregate(
                 $this->visitorFlowScreenRepository,
                 $previousVisit,
@@ -333,7 +334,7 @@ private function createScreenAggregate(Visit $currentVisit, int $level, ?Visit $
             );
             $previousAggregate->isLastPage = false;
             $previousAggregate->exitCount--;
-            $this->visitorFlowScreenRepository->update($previousAggregate);
+            $this->visitorFlowScreenRepository->save($previousAggregate);
             $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
         }
         $exitCount = 1;
@@ -354,7 +355,7 @@ private function createScreenAggregate(Visit $currentVisit, int $level, ?Visit $
         );
     }
 
-    private function getBrowserAggregate(Visit $visit, int $level, bool $isFirstInSession, Visit $previousVisit): BrowserAggregate
+    private function getBrowserAggregate(Visit $visit, int $level, bool $isFirstInSession, ?Visit $previousVisit): ?BrowserAggregate
     {
         return $this->visitorFlowBrowserRepository->getByCriteria(
             BrowserCriteria::getCriteria(
@@ -367,7 +368,7 @@ private function getBrowserAggregate(Visit $visit, int $level, bool $isFirstInSe
         );
     }
 
-    private function getCountryAggregate(Visit $visit, int $level, bool $isFirstInSession, Visit $previousVisit): CountryAggregate
+    private function getCountryAggregate(Visit $visit, int $level, bool $isFirstInSession, ?Visit $previousVisit): ?CountryAggregate
     {
         return $this->visitorFlowCountryRepository->getByCriteria(
             CountryCriteria::getCriteria(
@@ -380,7 +381,7 @@ private function getCountryAggregate(Visit $visit, int $level, bool $isFirstInSe
         );
     }
 
-    private function getDeviceAggregate(Visit $visit, int $level, bool $isFirstInSession, Visit $previousVisit): DeviceAggregate
+    private function getDeviceAggregate(Visit $visit, int $level, bool $isFirstInSession, ?Visit $previousVisit): ?DeviceAggregate
     {
         return $this->visitorFlowDeviceRepository->getByCriteria(
             DeviceCriteria::getCriteria(
@@ -393,7 +394,7 @@ private function getDeviceAggregate(Visit $visit, int $level, bool $isFirstInSes
         );
     }
 
-    private function getScreenAggregate(Visit $visit, int $level, bool $isFirstInSession, Visit $previousVisit): ScreenAggregate
+    private function getScreenAggregate(Visit $visit, int $level, bool $isFirstInSession, ?Visit $previousVisit): ?ScreenAggregate
     {
         return $this->visitorFlowScreenRepository->getByCriteria(
             ScreenCriteria::getCriteria(
diff --git a/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php
index 8ed06742..d258c482 100644
--- a/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php
@@ -5,11 +5,16 @@
 class CreateCountryVisitorsFlowIndex extends Migration
 {
     private const INDEX_NAME = 'country-visitors-flow-index';
+    private $client;
+
+    public function __construct()
+    {
+        $this->client =  app('elasticsearch');
+    }
 
     public function up()
     {
         $this->down();
-        $client = app('elasticsearch');
         $params = [
             'index' => self::INDEX_NAME,
             'body' => [
@@ -23,17 +28,16 @@ public function up()
             ]
         ];
 
-        $client->indices()->create($params);
+        $this->client->indices()->create($params);
     }
 
 
     public function down()
     {
         $params = ['index' => self::INDEX_NAME];
-        $client = app('elasticsearch');
 
-        if ($client->indices()->exists($params)) {
-            $client->indices()->delete($params);
+        if ($this->client->indices()->exists($params)) {
+            $this->client->indices()->delete($params);
         }
     }
 }
diff --git a/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php
index e1bce71b..2da1faaf 100644
--- a/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php
@@ -5,11 +5,15 @@
 class CreateBrowserVisitorsFlowIndex extends Migration
 {
     private const INDEX_NAME = 'browser-visitors-flow-index';
+    private $client;
 
+    public function __construct()
+    {
+        $this->client =  app('elasticsearch');
+    }
     public function up()
     {
         $this->down();
-        $client = app('elasticsearch');
         $params = [
             'index' => self::INDEX_NAME,
             'body' => [
@@ -22,15 +26,14 @@ public function up()
                 ]
             ]
         ];
-        $client->indices()->create($params);
+        $this->client->indices()->create($params);
     }
 
     public function down()
     {
-        $client = app('elasticsearch');
         $params = ['index' => self::INDEX_NAME];
-        if ($client->indices()->exists($params)) {
-            $client->indices()->delete($params);
+        if ($this->client->indices()->exists($params)) {
+            $this->client->indices()->delete($params);
         }
     }
 }
diff --git a/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php
index 268080f1..af8cc391 100644
--- a/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php
@@ -5,11 +5,15 @@
 class CreateDeviceVisitorsFlowIndex extends Migration
 {
     private const INDEX_NAME = 'device-visitors-flow-index';
+    private $client;
 
+    public function __construct()
+    {
+        $this->client =  app('elasticsearch');
+    }
     public function up()
     {
         $this->down();
-        $client = app('elasticsearch');
         $params = [
             'index' => self::INDEX_NAME,
             'body' => [
@@ -22,15 +26,14 @@ public function up()
                 ]
             ]
         ];
-        $client->indices()->create($params);
+        $this->client->indices()->create($params);
     }
 
     public function down()
     {
-        $client = app('elasticsearch');
         $params = ['index' => self::INDEX_NAME];
-        if ($client->indices()->exists($params)) {
-            $client->indices()->delete($params);
+        if ($this->client->indices()->exists($params)) {
+            $this->client->indices()->delete($params);
         }
     }
 }
diff --git a/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php
index 214333dc..188a7a81 100644
--- a/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013634_create_screen_visitors_flow_index.php
@@ -5,11 +5,15 @@
 class CreateScreenVisitorsFlowIndex extends Migration
 {
     private const INDEX_NAME = 'screen-visitors-flow-index';
+    private $client;
 
+    public function __construct()
+    {
+        $this->client =  app('elasticsearch');
+    }
     public function up()
     {
         $this->down();
-        $client = app('elasticsearch');
         $params = [
             'index' => self::INDEX_NAME,
             'body' => [
@@ -25,15 +29,14 @@ public function up()
                 ]
             ]
         ];
-        $client->indices()->create($params);
+        $this->client->indices()->create($params);
     }
 
     public function down()
     {
-        $client = app('elasticsearch');
         $params = ['index' => self::INDEX_NAME];
-        if ($client->indices()->exists($params)) {
-            $client->indices()->delete($params);
+        if ($this->client->indices()->exists($params)) {
+            $this->client->indices()->delete($params);
         }
     }
 }

From 4ed0f32fc993407f17ab8f84ff76ea1576b9d2d2 Mon Sep 17 00:00:00 2001
From: Volodymyr <tumko.volodymyr@gmail.com>
Date: Tue, 10 Sep 2019 13:35:36 +0300
Subject: [PATCH 130/183] round outcome new/returning visitors numbers

---
 frontend/src/store/modules/visitors/actions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/store/modules/visitors/actions.js b/frontend/src/store/modules/visitors/actions.js
index 8f58348f..995cdf36 100644
--- a/frontend/src/store/modules/visitors/actions.js
+++ b/frontend/src/store/modules/visitors/actions.js
@@ -129,7 +129,7 @@ export default {
                     .then(response => {
                         totalVisitors = response.value || 0;
                        if (totalVisitors > 0) {
-                            newVisitorsValue = newVisitors/totalVisitors*100;
+                            newVisitorsValue = Math.round(newVisitors/totalVisitors*100);
                             returnVisitorsValue = 100 - newVisitorsValue;
                         }
                         let payload = {

From f1af6d1d929c0ab1d30d9d12e4c0a5e230ee9092 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Tue, 10 Sep 2019 14:09:08 +0300
Subject: [PATCH 131/183] divide flowAffregateService into 4 separate services

---
 .../app/Aggregates/VisitorsFlow/Aggregate.php |   7 -
 .../VisitorsFlow/BrowserAggregate.php         |  17 -
 .../VisitorsFlow/CountryAggregate.php         |  17 -
 .../VisitorsFlow/DeviceAggregate.php          |  17 -
 .../VisitorsFlow/ScreenAggregate.php          |  18 -
 .../app/Listeners/CreateVisitAggregate.php    |  29 +-
 .../VisitorsFlow/FlowAggregateService.php     | 371 +-----------------
 .../FlowBrowserAggregateService.php           | 141 +++++++
 .../FlowCountryAggregateService.php           | 144 +++++++
 .../FlowDeviceAggregateService.php            | 140 +++++++
 .../FlowScreenAggregateService.php            | 146 +++++++
 11 files changed, 602 insertions(+), 445 deletions(-)
 create mode 100644 backend/app/Services/VisitorsFlow/FlowBrowserAggregateService.php
 create mode 100644 backend/app/Services/VisitorsFlow/FlowCountryAggregateService.php
 create mode 100644 backend/app/Services/VisitorsFlow/FlowDeviceAggregateService.php
 create mode 100644 backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php

diff --git a/backend/app/Aggregates/VisitorsFlow/Aggregate.php b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
index 16746033..694e08cf 100644
--- a/backend/app/Aggregates/VisitorsFlow/Aggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/Aggregate.php
@@ -65,11 +65,4 @@ public function getId(): int
     }
 
     abstract public static function fromResult(array $result): self;
-
-    abstract public static function getPreviousAggregate(
-        VisitorFlowRepository $visitorFlowBrowserRepository,
-        Visit $visit,
-        string $previousVisitUrl,
-        int $level
-    ): Aggregate;
 }
diff --git a/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php b/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
index 8bb03385..4ce2b99c 100644
--- a/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
@@ -51,21 +51,4 @@ public static function fromResult(array $result): Aggregate
             )
         );
     }
-
-    public static function getPreviousAggregate(
-        VisitorFlowRepository $visitorFlowBrowserRepository,
-        Visit $visit,
-        string $previousVisitUrl,
-        int $level
-    ): Aggregate {
-        return $visitorFlowBrowserRepository->getByCriteria(
-            BrowserCriteria::getCriteria(
-                $visit->session->website_id,
-                $visit->page->url,
-                $level - 1,
-                $previousVisitUrl,
-                $visit->session->system->browser
-            )
-        );
-    }
 }
diff --git a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
index b5b0a699..7ceda9bb 100644
--- a/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/CountryAggregate.php
@@ -51,21 +51,4 @@ public static function fromResult(array $result): Aggregate
             )
         );
     }
-
-    public static function getPreviousAggregate(
-        VisitorFlowRepository $visitorFlowCountryRepository,
-        Visit $visit,
-        string $previousVisitUrl,
-        int $level
-    ): Aggregate {
-        return $visitorFlowCountryRepository->getByCriteria(
-            CountryCriteria::getCriteria(
-                $visit->session->website_id,
-                $visit->page->url,
-                $level - 1,
-                $previousVisitUrl,
-                $visit->geo_position->country
-            )
-        );
-    }
 }
diff --git a/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php b/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
index 5b6f8edc..6d311764 100644
--- a/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/DeviceAggregate.php
@@ -51,21 +51,4 @@ public static function fromResult(array $result): Aggregate
             )
         );
     }
-
-    public static function getPreviousAggregate(
-        VisitorFlowRepository $visitorFlowDeviceRepository,
-        Visit $visit,
-        string $previousVisitUrl,
-        int $level
-    ): Aggregate {
-        return $visitorFlowDeviceRepository->getByCriteria(
-            DeviceCriteria::getCriteria(
-                $visit->session->website_id,
-                $visit->page->url,
-                $level - 1,
-                $previousVisitUrl,
-                $visit->session->system->device
-            )
-        );
-    }
 }
diff --git a/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php b/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
index b5b64f14..df1561f9 100644
--- a/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/ScreenAggregate.php
@@ -58,22 +58,4 @@ public static function fromResult(array $result): Aggregate
             )
         );
     }
-
-    public static function getPreviousAggregate(
-        VisitorFlowRepository $visitorFlowScreenRepository,
-        Visit $visit,
-        string $previousVisitUrl,
-        int $level
-    ): Aggregate {
-        return $visitorFlowScreenRepository->getByCriteria(
-            ScreenCriteria::getCriteria(
-                $visit->session->website_id,
-                $visit->page->url,
-                $level - 1,
-                $previousVisitUrl,
-                $visit->session->system->resolution_width,
-                $visit->session->system->resolution_height
-            )
-        );
-    }
 }
diff --git a/backend/app/Listeners/CreateVisitAggregate.php b/backend/app/Listeners/CreateVisitAggregate.php
index 3544444a..9f45a029 100644
--- a/backend/app/Listeners/CreateVisitAggregate.php
+++ b/backend/app/Listeners/CreateVisitAggregate.php
@@ -4,19 +4,36 @@
 namespace App\Listeners;
 
 use App\Events\VisitCreated;
-use App\Services\VisitorsFlow\FlowAggregateService;
+use App\Services\VisitorsFlow\FlowBrowserAggregateService;
+use App\Services\VisitorsFlow\FlowCountryAggregateService;
+use App\Services\VisitorsFlow\FlowDeviceAggregateService;
+use App\Services\VisitorsFlow\FlowScreenAggregateService;
 
 class CreateVisitAggregate
 {
-    private $flowAggregateService;
+    private $flowCountryAggregateService;
+    private $flowBrowserAggregateService;
+    private $flowDeviceAggregateService;
+    private $flowScreenAggregateService;
 
-    public function __construct(FlowAggregateService $flowAggregateService)
-    {
-        $this->flowAggregateService = $flowAggregateService;
+
+    public function __construct(
+        FlowCountryAggregateService $flowCountryAggregateService,
+        FlowBrowserAggregateService $flowBrowserAggregateService,
+        FlowDeviceAggregateService $flowDeviceAggregateService,
+        FlowScreenAggregateService $flowScreenAggregateService
+    ) {
+        $this->flowCountryAggregateService = $flowCountryAggregateService;
+        $this->flowBrowserAggregateService = $flowBrowserAggregateService;
+        $this->flowDeviceAggregateService = $flowDeviceAggregateService;
+        $this->flowScreenAggregateService = $flowScreenAggregateService;
     }
 
     public function handle(VisitCreated $event)
     {
-        $this->flowAggregateService->aggregate($event->visit);
+        $this->flowCountryAggregateService->aggregate($event->visit);
+        $this->flowBrowserAggregateService->aggregate($event->visit);
+        $this->flowDeviceAggregateService->aggregate($event->visit);
+        $this->flowScreenAggregateService->aggregate($event->visit);
     }
 }
diff --git a/backend/app/Services/VisitorsFlow/FlowAggregateService.php b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
index 14ec5014..49b1e210 100644
--- a/backend/app/Services/VisitorsFlow/FlowAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowAggregateService.php
@@ -3,76 +3,21 @@
 
 namespace App\Services\VisitorsFlow;
 
-use App\Aggregates\VisitorsFlow\BrowserAggregate;
-use App\Aggregates\VisitorsFlow\CountryAggregate;
-use App\Aggregates\VisitorsFlow\DeviceAggregate;
-use App\Aggregates\VisitorsFlow\ScreenAggregate;
-use App\Aggregates\VisitorsFlow\Values\PageValue;
 use App\Entities\Visit;
-use App\Repositories\Contracts\GeoPositionRepository;
-use App\Repositories\Contracts\PageRepository;
 use App\Repositories\Contracts\VisitRepository;
-use App\Repositories\Contracts\WebsiteRepository;
-use App\Repositories\Elasticsearch\VisitorsFlow\BrowserCriteria;
-use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
-use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
-use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowDeviceRepository;
-use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowScreenRepository;
-use App\Repositories\Elasticsearch\VisitorsFlow\CountryCriteria;
-use App\Repositories\Elasticsearch\VisitorsFlow\DeviceCriteria;
-use App\Repositories\Elasticsearch\VisitorsFlow\ScreenCriteria;
 use Carbon\Carbon;
 
-final class FlowAggregateService
+abstract class FlowAggregateService
 {
-    private $pageRepository;
+    protected const FIRST_LEVEL = 1;
     private $visitRepository;
-    private $visitorFlowCountryRepository;
-    private $websiteRepository;
-    private $geoPositionRepository;
-    private $visitorFlowBrowserRepository;
-    private $visitorFlowDeviceRepository;
-    private $visitorFlowScreenRepository;
-    private const FIRST_LEVEL = 1;
 
-    public function __construct(
-        PageRepository $pageRepository,
-        VisitRepository $visitRepository,
-        VisitorFlowCountryRepository $visitorFlowCountryRepository,
-        WebsiteRepository $websiteRepository,
-        GeoPositionRepository $geoPositionRepository,
-        VisitorFlowBrowserRepository $visitorFlowBrowserRepository,
-        VisitorFlowDeviceRepository $visitorFlowDeviceRepository,
-        VisitorFlowScreenRepository $visitorFlowScreenRepository
-    ) {
-        $this->pageRepository = $pageRepository;
-        $this->visitRepository = $visitRepository;
-        $this->visitorFlowCountryRepository = $visitorFlowCountryRepository;
-        $this->websiteRepository = $websiteRepository;
-        $this->geoPositionRepository = $geoPositionRepository;
-        $this->visitorFlowBrowserRepository = $visitorFlowBrowserRepository;
-        $this->visitorFlowDeviceRepository = $visitorFlowDeviceRepository;
-        $this->visitorFlowScreenRepository = $visitorFlowScreenRepository;
-    }
-
-    public function aggregate(Visit $visit): void
+    public function __construct(VisitRepository $visitRepository)
     {
-        $previousVisit = $this->getLastVisit($visit);
-        $isFirstInSession = $previousVisit === null;
-        $level = $this->getLevel($visit, $isFirstInSession);
-
-        $countryAggregate = $this->getCountryAggregate($visit, $level, $isFirstInSession, $previousVisit);
-        $browserAggregate = $this->getBrowserAggregate($visit, $level, $isFirstInSession, $previousVisit);
-        $deviceAggregate = $this->getDeviceAggregate($visit, $level, $isFirstInSession, $previousVisit);
-        $screenAggregate = $this->getScreenAggregate($visit, $level, $isFirstInSession, $previousVisit);
-
-        $this->updateCountryAggregate($visit, $level, $previousVisit, $countryAggregate);
-        $this->updateBrowserAggregate($visit, $level, $previousVisit, $browserAggregate);
-        $this->updateDeviceAggregate($visit, $level, $previousVisit, $deviceAggregate);
-        $this->updateScreenAggregate($visit, $level, $previousVisit, $screenAggregate);
+        $this->visitRepository = $visitRepository;
     }
 
-    private function getLevel(Visit $visit, bool $isFirstInSession): int
+    protected function getLevel(Visit $visit, bool $isFirstInSession): int
     {
         if (!$isFirstInSession) {
             return $this->getVisitsCount($visit);
@@ -80,115 +25,7 @@ private function getLevel(Visit $visit, bool $isFirstInSession): int
         return self::FIRST_LEVEL;
     }
 
-    private function updateCountryAggregate(
-        Visit $visit,
-        int $level,
-        ?Visit $previousVisit,
-        ?CountryAggregate $countryAggregate): void
-    {
-        if (!$countryAggregate) {
-            $countryAggregate = $this->createCountryAggregate($visit, $level, $previousVisit);
-            $this->visitorFlowCountryRepository->save($countryAggregate);
-            return;
-        }
-        if ($level > self::FIRST_LEVEL) {
-            $previousAggregate = CountryAggregate::getPreviousAggregate(
-                $this->visitorFlowCountryRepository,
-                $previousVisit,
-                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                $level
-            );
-            $previousAggregate->isLastPage = false;
-            $previousAggregate->exitCount--;
-            $this->visitorFlowCountryRepository->save($previousAggregate);
-        }
-        $countryAggregate->views++;
-        $countryAggregate->exitCount++;
-        $this->visitorFlowCountryRepository->save($countryAggregate);
-    }
-
-    private function updateBrowserAggregate(
-        Visit $visit,
-        int $level,
-        ?Visit $previousVisit,
-        ?BrowserAggregate $browserAggregate
-    ): void {
-        if (!$browserAggregate) {
-            $browserAggregate = $this->createBrowserAggregate($visit, $level, $previousVisit);
-            $this->visitorFlowBrowserRepository->save($browserAggregate);
-            return;
-        }
-        if ($level > self::FIRST_LEVEL) {
-            $previousAggregate = BrowserAggregate::getPreviousAggregate(
-                $this->visitorFlowBrowserRepository,
-                $previousVisit,
-                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                $level
-            );
-            $previousAggregate->isLastPage = false;
-            $previousAggregate->exitCount--;
-            $this->visitorFlowBrowserRepository->save($previousAggregate);
-        }
-        $browserAggregate->views++;
-        $browserAggregate->exitCount++;
-        $this->visitorFlowBrowserRepository->save($browserAggregate);
-    }
-
-    private function updateDeviceAggregate(
-        Visit $visit,
-        int $level,
-        ?Visit $previousVisit,
-        ?DeviceAggregate $deviceAggregate
-    ): void {
-        if (!$deviceAggregate) {
-            $deviceAggregate = $this->createDeviceAggregate($visit, $level, $previousVisit);
-            $this->visitorFlowDeviceRepository->save($deviceAggregate);
-            return;
-        }
-        if ($level > self::FIRST_LEVEL) {
-            $previousAggregate = DeviceAggregate::getPreviousAggregate(
-                $this->visitorFlowDeviceRepository,
-                $previousVisit,
-                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                $level
-            );
-            $previousAggregate->isLastPage = false;
-            $previousAggregate->exitCount--;
-            $this->visitorFlowDeviceRepository->save($previousAggregate);
-        }
-        $deviceAggregate->views++;
-        $deviceAggregate->exitCount++;
-        $this->visitorFlowDeviceRepository->save($deviceAggregate);
-    }
-
-    private function updateScreenAggregate(
-        Visit $visit,
-        int $level,
-        ?Visit $previousVisit,
-        ?ScreenAggregate $screenAggregate
-    ): void {
-        if (!$screenAggregate) {
-            $screenAggregate = $this->createScreenAggregate($visit, $level, $previousVisit);
-            $this->visitorFlowScreenRepository->save($screenAggregate);
-            return;
-        }
-        if ($level > self::FIRST_LEVEL) {
-            $previousAggregate = ScreenAggregate::getPreviousAggregate(
-                $this->visitorFlowScreenRepository,
-                $previousVisit,
-                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                $level
-            );
-            $previousAggregate->isLastPage = false;
-            $previousAggregate->exitCount--;
-            $this->visitorFlowScreenRepository->save($previousAggregate);
-        }
-        $screenAggregate->views++;
-        $screenAggregate->exitCount++;
-        $this->visitorFlowScreenRepository->save($screenAggregate);
-    }
-
-    private function getLastVisit(Visit $currentVisit): ?Visit
+    protected function getLastVisit(Visit $currentVisit): ?Visit
     {
         return $this->visitRepository->findBySessionId($currentVisit->session_id)
             ->sortBy(function (Visit $visit) {
@@ -199,7 +36,7 @@ private function getLastVisit(Visit $currentVisit): ?Visit
             });
     }
 
-    private function getPreviousVisit(Visit $currentVisit): ?Visit
+    protected function getPreviousVisit(Visit $currentVisit): ?Visit
     {
         return $this->visitRepository->findBySessionId($currentVisit->session_id)
             ->filter(function (Visit $visit) use ($currentVisit) {
@@ -211,200 +48,8 @@ private function getPreviousVisit(Visit $currentVisit): ?Visit
             ->last();
     }
 
-    private function getVisitsCount(Visit $currentVisit): int
+    protected function getVisitsCount(Visit $currentVisit): int
     {
         return $this->visitRepository->findBySessionId($currentVisit->session_id)->count();
     }
-
-    private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): CountryAggregate
-    {
-        $page = $this->pageRepository->getById($currentVisit->page_id);
-        $website = $this->websiteRepository->getById($page->website_id);
-        $geoPosition = $this->geoPositionRepository->getById($currentVisit->geo_position_id);
-        $prevPage = new PageValue();
-        if ($level !== self::FIRST_LEVEL) {
-            $previousAggregate = CountryAggregate::getPreviousAggregate(
-                $this->visitorFlowCountryRepository,
-                $previousVisit,
-                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                $level
-            );
-            $previousAggregate->isLastPage = false;
-            $previousAggregate->exitCount--;
-            $this->visitorFlowCountryRepository->save($previousAggregate);
-            $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
-        }
-
-        $isLatPage = true;
-        $exitCount = 1;
-        $views = 1;
-        return new CountryAggregate(
-            $currentVisit->id,
-            $website->id,
-            $page->url,
-            $page->name,
-            $views,
-            $level,
-            $isLatPage,
-            $exitCount,
-            $geoPosition->country,
-            $prevPage
-        );
-    }
-
-    private function createBrowserAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): BrowserAggregate
-    {
-        $page = $this->pageRepository->getById($currentVisit->page_id);
-        $website = $this->websiteRepository->getById($page->website_id);
-        $prevPage = new PageValue();
-        if ($level !== self::FIRST_LEVEL) {
-            $previousAggregate = BrowserAggregate::getPreviousAggregate(
-                $this->visitorFlowBrowserRepository,
-                $previousVisit,
-                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                $level
-            );
-            $previousAggregate->isLastPage = false;
-            $previousAggregate->exitCount--;
-            $this->visitorFlowBrowserRepository->save($previousAggregate);
-            $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
-        }
-        $exitCount = 1;
-        $isLatPage = true;
-        $views = 1;
-        return new BrowserAggregate(
-            $currentVisit->id,
-            $website->id,
-            $page->url,
-            $page->name,
-            $views,
-            $level,
-            $isLatPage,
-            $exitCount,
-            $currentVisit->session->system->browser,
-            $prevPage
-        );
-    }
-
-    private function createDeviceAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): DeviceAggregate
-    {
-        $page = $this->pageRepository->getById($currentVisit->page_id);
-        $website = $this->websiteRepository->getById($page->website_id);
-        $prevPage = new PageValue();
-        if ($level !== self::FIRST_LEVEL) {
-            $previousAggregate = DeviceAggregate::getPreviousAggregate(
-                $this->visitorFlowDeviceRepository,
-                $previousVisit,
-                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                $level
-            );
-            $previousAggregate->isLastPage = false;
-            $previousAggregate->exitCount--;
-            $this->visitorFlowDeviceRepository->save($previousAggregate);
-            $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
-        }
-        $exitCount = 1;
-        $isLatPage = true;
-        $views = 1;
-        return new DeviceAggregate(
-            $currentVisit->id,
-            $website->id,
-            $page->url,
-            $page->name,
-            $views,
-            $level,
-            $isLatPage,
-            $exitCount,
-            $currentVisit->session->system->device,
-            $prevPage
-        );
-    }
-
-    private function createScreenAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): ScreenAggregate
-    {
-        $page = $this->pageRepository->getById($currentVisit->page_id);
-        $website = $this->websiteRepository->getById($page->website_id);
-        $prevPage = new PageValue();
-        if ($level !== self::FIRST_LEVEL) {
-            $previousAggregate = ScreenAggregate::getPreviousAggregate(
-                $this->visitorFlowScreenRepository,
-                $previousVisit,
-                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                $level
-            );
-            $previousAggregate->isLastPage = false;
-            $previousAggregate->exitCount--;
-            $this->visitorFlowScreenRepository->save($previousAggregate);
-            $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
-        }
-        $exitCount = 1;
-        $isLatPage = true;
-        $views = 1;
-        return new ScreenAggregate(
-            $currentVisit->id,
-            $website->id,
-            $page->url,
-            $page->name,
-            $views,
-            $level,
-            $isLatPage,
-            $exitCount,
-            $currentVisit->session->system->resolution_width,
-            $currentVisit->session->system->resolution_height,
-            $prevPage
-        );
-    }
-
-    private function getBrowserAggregate(Visit $visit, int $level, bool $isFirstInSession, ?Visit $previousVisit): ?BrowserAggregate
-    {
-        return $this->visitorFlowBrowserRepository->getByCriteria(
-            BrowserCriteria::getCriteria(
-                $visit->session->website_id,
-                $visit->page->url,
-                $level,
-                $isFirstInSession ? 'null' : $previousVisit->page->url,
-                $visit->session->system->browser
-            )
-        );
-    }
-
-    private function getCountryAggregate(Visit $visit, int $level, bool $isFirstInSession, ?Visit $previousVisit): ?CountryAggregate
-    {
-        return $this->visitorFlowCountryRepository->getByCriteria(
-            CountryCriteria::getCriteria(
-                $visit->session->website_id,
-                $visit->page->url,
-                $level,
-                $isFirstInSession ? 'null' : $previousVisit->page->url,
-                $visit->geo_position->country
-            )
-        );
-    }
-
-    private function getDeviceAggregate(Visit $visit, int $level, bool $isFirstInSession, ?Visit $previousVisit): ?DeviceAggregate
-    {
-        return $this->visitorFlowDeviceRepository->getByCriteria(
-            DeviceCriteria::getCriteria(
-                $visit->session->website_id,
-                $visit->page->url,
-                $level,
-                $isFirstInSession ? 'null' : $previousVisit->page->url,
-                $visit->session->system->device
-            )
-        );
-    }
-
-    private function getScreenAggregate(Visit $visit, int $level, bool $isFirstInSession, ?Visit $previousVisit): ?ScreenAggregate
-    {
-        return $this->visitorFlowScreenRepository->getByCriteria(
-            ScreenCriteria::getCriteria(
-                $visit->session->website_id,
-                $visit->page->url,
-                $level,
-                $isFirstInSession ? 'null' : $previousVisit->page->url,
-                $visit->session->system->resolution_width,
-                $visit->session->system->resolution_height
-            )
-        );
-    }
 }
diff --git a/backend/app/Services/VisitorsFlow/FlowBrowserAggregateService.php b/backend/app/Services/VisitorsFlow/FlowBrowserAggregateService.php
new file mode 100644
index 00000000..8809139e
--- /dev/null
+++ b/backend/app/Services/VisitorsFlow/FlowBrowserAggregateService.php
@@ -0,0 +1,141 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Services\VisitorsFlow;
+
+use App\Aggregates\VisitorsFlow\Aggregate;
+use App\Aggregates\VisitorsFlow\BrowserAggregate;
+use App\Aggregates\VisitorsFlow\Values\PageValue;
+use App\Entities\Visit;
+use App\Repositories\Contracts\GeoPositionRepository;
+use App\Repositories\Contracts\PageRepository;
+use App\Repositories\Contracts\VisitRepository;
+use App\Repositories\Contracts\WebsiteRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\BrowserCriteria;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowRepository;
+
+class FlowBrowserAggregateService extends FlowAggregateService
+{
+    private $pageRepository;
+    private $websiteRepository;
+    private $geoPositionRepository;
+    private $visitorFlowBrowserRepository;
+
+    public function __construct(
+        PageRepository $pageRepository,
+        VisitRepository $visitRepository,
+        WebsiteRepository $websiteRepository,
+        GeoPositionRepository $geoPositionRepository,
+        VisitorFlowBrowserRepository $visitorFlowBrowserRepository
+    ) {
+        parent::__construct($visitRepository);
+        $this->pageRepository = $pageRepository;
+        $this->websiteRepository = $websiteRepository;
+        $this->geoPositionRepository = $geoPositionRepository;
+        $this->visitorFlowBrowserRepository = $visitorFlowBrowserRepository;
+    }
+
+    public function aggregate(Visit $visit): void
+    {
+        $previousVisit = $this->getLastVisit($visit);
+        $isFirstInSession = $previousVisit === null;
+        $level = $this->getLevel($visit, $isFirstInSession);
+
+        $browserAggregate = $this->getBrowserAggregate($visit, $level, $isFirstInSession, $previousVisit);
+
+        $this->updateBrowserAggregate($visit, $level, $previousVisit, $browserAggregate);
+    }
+
+
+    private function updateBrowserAggregate(
+        Visit $visit,
+        int $level,
+        ?Visit $previousVisit,
+        ?BrowserAggregate $browserAggregate
+    ): void {
+        if (!$browserAggregate) {
+            $browserAggregate = $this->createBrowserAggregate($visit, $level, $previousVisit);
+            $this->visitorFlowBrowserRepository->save($browserAggregate);
+            return;
+        }
+        if ($level > self::FIRST_LEVEL) {
+            $previousAggregate = $this->getPreviousBrowserAggregate(
+                $this->visitorFlowBrowserRepository,
+                $previousVisit,
+                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                $level
+            );
+            $previousAggregate->isLastPage = false;
+            $previousAggregate->exitCount--;
+            $this->visitorFlowBrowserRepository->save($previousAggregate);
+        }
+        $browserAggregate->views++;
+        $browserAggregate->exitCount++;
+        $this->visitorFlowBrowserRepository->save($browserAggregate);
+    }
+
+    private function createBrowserAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): BrowserAggregate
+    {
+        $page = $this->pageRepository->getById($currentVisit->page_id);
+        $website = $this->websiteRepository->getById($page->website_id);
+        $prevPage = new PageValue();
+        if ($level !== self::FIRST_LEVEL) {
+            $previousAggregate =$this->getPreviousBrowserAggregate(
+                $this->visitorFlowBrowserRepository,
+                $previousVisit,
+                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                $level
+            );
+            $previousAggregate->isLastPage = false;
+            $previousAggregate->exitCount--;
+            $this->visitorFlowBrowserRepository->save($previousAggregate);
+            $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
+        }
+        $exitCount = 1;
+        $isLatPage = true;
+        $views = 1;
+        return new BrowserAggregate(
+            $currentVisit->id,
+            $website->id,
+            $page->url,
+            $page->name,
+            $views,
+            $level,
+            $isLatPage,
+            $exitCount,
+            $currentVisit->session->system->browser,
+            $prevPage
+        );
+    }
+
+    private function getBrowserAggregate(Visit $visit, int $level, bool $isFirstInSession, ?Visit $previousVisit): ?BrowserAggregate
+    {
+        return $this->visitorFlowBrowserRepository->getByCriteria(
+            BrowserCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level,
+                $isFirstInSession ? 'null' : $previousVisit->page->url,
+                $visit->session->system->browser
+            )
+        );
+    }
+
+    private  function getPreviousBrowserAggregate(
+        VisitorFlowRepository $visitorFlowBrowserRepository,
+        Visit $visit,
+        string $previousVisitUrl,
+        int $level
+    ): Aggregate {
+        return $visitorFlowBrowserRepository->getByCriteria(
+            BrowserCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level - 1,
+                $previousVisitUrl,
+                $visit->session->system->browser
+            )
+        );
+    }
+}
diff --git a/backend/app/Services/VisitorsFlow/FlowCountryAggregateService.php b/backend/app/Services/VisitorsFlow/FlowCountryAggregateService.php
new file mode 100644
index 00000000..2a56f9fc
--- /dev/null
+++ b/backend/app/Services/VisitorsFlow/FlowCountryAggregateService.php
@@ -0,0 +1,144 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Services\VisitorsFlow;
+
+use App\Aggregates\VisitorsFlow\Aggregate;
+use App\Aggregates\VisitorsFlow\CountryAggregate;
+use App\Aggregates\VisitorsFlow\Values\PageValue;
+use App\Entities\Visit;
+use App\Repositories\Contracts\GeoPositionRepository;
+use App\Repositories\Contracts\PageRepository;
+use App\Repositories\Contracts\VisitRepository;
+use App\Repositories\Contracts\WebsiteRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\CountryCriteria;
+
+final class FlowCountryAggregateService extends FlowAggregateService
+{
+    private $pageRepository;
+    private $visitRepository;
+    private $visitorFlowCountryRepository;
+    private $websiteRepository;
+    private $geoPositionRepository;
+
+    public function __construct(
+        PageRepository $pageRepository,
+        VisitRepository $visitRepository,
+        VisitorFlowCountryRepository $visitorFlowCountryRepository,
+        WebsiteRepository $websiteRepository,
+        GeoPositionRepository $geoPositionRepository
+    ) {
+        parent::__construct($visitRepository);
+        $this->pageRepository = $pageRepository;
+        $this->visitRepository = $visitRepository;
+        $this->visitorFlowCountryRepository = $visitorFlowCountryRepository;
+        $this->websiteRepository = $websiteRepository;
+        $this->geoPositionRepository = $geoPositionRepository;
+    }
+
+    public function aggregate(Visit $visit): void
+    {
+        $previousVisit = $this->getLastVisit($visit);
+        $isFirstInSession = $previousVisit === null;
+        $level = $this->getLevel($visit, $isFirstInSession);
+
+        $countryAggregate = $this->getCountryAggregate($visit, $level, $isFirstInSession, $previousVisit);
+
+        $this->updateCountryAggregate($visit, $level, $previousVisit, $countryAggregate);
+    }
+
+    private function updateCountryAggregate(
+        Visit $visit,
+        int $level,
+        ?Visit $previousVisit,
+        ?CountryAggregate $countryAggregate): void
+    {
+        if (!$countryAggregate) {
+            $countryAggregate = $this->createCountryAggregate($visit, $level, $previousVisit);
+            $this->visitorFlowCountryRepository->save($countryAggregate);
+            return;
+        }
+        if ($level > self::FIRST_LEVEL) {
+            $previousAggregate = $this->getPreviousCountryAggregate(
+                $this->visitorFlowCountryRepository,
+                $previousVisit,
+                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                $level
+            );
+            $previousAggregate->isLastPage = false;
+            $previousAggregate->exitCount--;
+            $this->visitorFlowCountryRepository->save($previousAggregate);
+        }
+        $countryAggregate->views++;
+        $countryAggregate->exitCount++;
+        $this->visitorFlowCountryRepository->save($countryAggregate);
+    }
+
+    private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): CountryAggregate
+    {
+        $page = $this->pageRepository->getById($currentVisit->page_id);
+        $website = $this->websiteRepository->getById($page->website_id);
+        $geoPosition = $this->geoPositionRepository->getById($currentVisit->geo_position_id);
+        $prevPage = new PageValue();
+        if ($level !== self::FIRST_LEVEL) {
+            $previousAggregate = $this->getPreviousCountryAggregate(
+                $this->visitorFlowCountryRepository,
+                $previousVisit,
+                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                $level
+            );
+            $previousAggregate->isLastPage = false;
+            $previousAggregate->exitCount--;
+            $this->visitorFlowCountryRepository->save($previousAggregate);
+            $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
+        }
+
+        $isLatPage = true;
+        $exitCount = 1;
+        $views = 1;
+        return new CountryAggregate(
+            $currentVisit->id,
+            $website->id,
+            $page->url,
+            $page->name,
+            $views,
+            $level,
+            $isLatPage,
+            $exitCount,
+            $geoPosition->country,
+            $prevPage
+        );
+    }
+
+    private function getCountryAggregate(Visit $visit, int $level, bool $isFirstInSession, ?Visit $previousVisit): ?CountryAggregate
+    {
+        return $this->visitorFlowCountryRepository->getByCriteria(
+            CountryCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level,
+                $isFirstInSession ? 'null' : $previousVisit->page->url,
+                $visit->geo_position->country
+            )
+        );
+    }
+
+    private  function getPreviousCountryAggregate(
+        VisitorFlowRepository $visitorFlowCountryRepository,
+        Visit $visit,
+        string $previousVisitUrl,
+        int $level
+    ): Aggregate {
+        return $visitorFlowCountryRepository->getByCriteria(
+            CountryCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level - 1,
+                $previousVisitUrl,
+                $visit->geo_position->country
+            )
+        );
+    }
+}
diff --git a/backend/app/Services/VisitorsFlow/FlowDeviceAggregateService.php b/backend/app/Services/VisitorsFlow/FlowDeviceAggregateService.php
new file mode 100644
index 00000000..6b5273ee
--- /dev/null
+++ b/backend/app/Services/VisitorsFlow/FlowDeviceAggregateService.php
@@ -0,0 +1,140 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Services\VisitorsFlow;
+
+use App\Aggregates\VisitorsFlow\Aggregate;
+use App\Aggregates\VisitorsFlow\DeviceAggregate;
+use App\Aggregates\VisitorsFlow\Values\PageValue;
+use App\Entities\Visit;
+use App\Repositories\Contracts\GeoPositionRepository;
+use App\Repositories\Contracts\PageRepository;
+use App\Repositories\Contracts\VisitRepository;
+use App\Repositories\Contracts\WebsiteRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowDeviceRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\DeviceCriteria;
+
+class FlowDeviceAggregateService extends FlowAggregateService
+{
+    private $pageRepository;
+    private $websiteRepository;
+    private $geoPositionRepository;
+    private $visitorFlowDeviceRepository;
+
+    public function __construct(
+        PageRepository $pageRepository,
+        VisitRepository $visitRepository,
+        WebsiteRepository $websiteRepository,
+        GeoPositionRepository $geoPositionRepository,
+        VisitorFlowDeviceRepository $visitorFlowDeviceRepository
+    ) {
+        parent::__construct($visitRepository);
+        $this->pageRepository = $pageRepository;
+        $this->websiteRepository = $websiteRepository;
+        $this->geoPositionRepository = $geoPositionRepository;
+        $this->visitorFlowDeviceRepository = $visitorFlowDeviceRepository;
+    }
+
+    public function aggregate(Visit $visit): void
+    {
+        $previousVisit = $this->getLastVisit($visit);
+        $isFirstInSession = $previousVisit === null;
+        $level = $this->getLevel($visit, $isFirstInSession);
+
+        $deviceAggregate = $this->getDeviceAggregate($visit, $level, $isFirstInSession, $previousVisit);
+
+        $this->updateDeviceAggregate($visit, $level, $previousVisit, $deviceAggregate);
+    }
+
+    private function updateDeviceAggregate(
+        Visit $visit,
+        int $level,
+        ?Visit $previousVisit,
+        ?DeviceAggregate $deviceAggregate
+    ): void {
+        if (!$deviceAggregate) {
+            $deviceAggregate = $this->createDeviceAggregate($visit, $level, $previousVisit);
+            $this->visitorFlowDeviceRepository->save($deviceAggregate);
+            return;
+        }
+        if ($level > self::FIRST_LEVEL) {
+            $previousAggregate = $this->getPreviousDeviceAggregate(
+                $this->visitorFlowDeviceRepository,
+                $previousVisit,
+                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                $level
+            );
+            $previousAggregate->isLastPage = false;
+            $previousAggregate->exitCount--;
+            $this->visitorFlowDeviceRepository->save($previousAggregate);
+        }
+        $deviceAggregate->views++;
+        $deviceAggregate->exitCount++;
+        $this->visitorFlowDeviceRepository->save($deviceAggregate);
+    }
+
+    private function createDeviceAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): DeviceAggregate
+    {
+        $page = $this->pageRepository->getById($currentVisit->page_id);
+        $website = $this->websiteRepository->getById($page->website_id);
+        $prevPage = new PageValue();
+        if ($level !== self::FIRST_LEVEL) {
+            $previousAggregate =$this->getPreviousDeviceAggregate(
+                $this->visitorFlowDeviceRepository,
+                $previousVisit,
+                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                $level
+            );
+            $previousAggregate->isLastPage = false;
+            $previousAggregate->exitCount--;
+            $this->visitorFlowDeviceRepository->save($previousAggregate);
+            $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
+        }
+        $exitCount = 1;
+        $isLatPage = true;
+        $views = 1;
+        return new DeviceAggregate(
+            $currentVisit->id,
+            $website->id,
+            $page->url,
+            $page->name,
+            $views,
+            $level,
+            $isLatPage,
+            $exitCount,
+            $currentVisit->session->system->device,
+            $prevPage
+        );
+    }
+
+    private function getDeviceAggregate(Visit $visit, int $level, bool $isFirstInSession, ?Visit $previousVisit): ?DeviceAggregate
+    {
+        return $this->visitorFlowDeviceRepository->getByCriteria(
+            DeviceCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level,
+                $isFirstInSession ? 'null' : $previousVisit->page->url,
+                $visit->session->system->device
+            )
+        );
+    }
+
+    private function getPreviousDeviceAggregate(
+        VisitorFlowRepository $visitorFlowDeviceRepository,
+        Visit $visit,
+        string $previousVisitUrl,
+        int $level
+    ): Aggregate {
+        return $visitorFlowDeviceRepository->getByCriteria(
+            DeviceCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level - 1,
+                $previousVisitUrl,
+                $visit->session->system->device
+            )
+        );
+    }
+}
diff --git a/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php b/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php
new file mode 100644
index 00000000..c1274540
--- /dev/null
+++ b/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php
@@ -0,0 +1,146 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Services\VisitorsFlow;
+
+use App\Aggregates\VisitorsFlow\Aggregate;
+use App\Aggregates\VisitorsFlow\ScreenAggregate;
+use App\Aggregates\VisitorsFlow\Values\PageValue;
+use App\Entities\Visit;
+use App\Repositories\Contracts\GeoPositionRepository;
+use App\Repositories\Contracts\PageRepository;
+use App\Repositories\Contracts\VisitRepository;
+use App\Repositories\Contracts\WebsiteRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowScreenRepository;
+use App\Repositories\Elasticsearch\VisitorsFlow\ScreenCriteria;
+
+class FlowScreenAggregateService extends FlowAggregateService
+{
+    private $pageRepository;
+    private $websiteRepository;
+    private $geoPositionRepository;
+    private $visitorFlowScreenRepository;
+
+    public function __construct(
+        PageRepository $pageRepository,
+        VisitRepository $visitRepository,
+        WebsiteRepository $websiteRepository,
+        GeoPositionRepository $geoPositionRepository,
+        VisitorFlowScreenRepository $visitorFlowScreenRepository
+    ) {
+        parent::__construct($visitRepository);
+        $this->pageRepository = $pageRepository;
+        $this->websiteRepository = $websiteRepository;
+        $this->geoPositionRepository = $geoPositionRepository;
+        $this->visitorFlowScreenRepository = $visitorFlowScreenRepository;
+    }
+
+
+    public function aggregate(Visit $visit): void
+    {
+        $previousVisit = $this->getLastVisit($visit);
+        $isFirstInSession = $previousVisit === null;
+        $level = $this->getLevel($visit, $isFirstInSession);
+
+        $screenAggregate = $this->getScreenAggregate($visit, $level, $isFirstInSession, $previousVisit);
+
+        $this->updateScreenAggregate($visit, $level, $previousVisit, $screenAggregate);
+    }
+
+    private function updateScreenAggregate(
+        Visit $visit,
+        int $level,
+        ?Visit $previousVisit,
+        ?ScreenAggregate $screenAggregate
+    ): void {
+        if (!$screenAggregate) {
+            $screenAggregate = $this->createScreenAggregate($visit, $level, $previousVisit);
+            $this->visitorFlowScreenRepository->save($screenAggregate);
+            return;
+        }
+        if ($level > self::FIRST_LEVEL) {
+            $previousAggregate = $this->getPreviousScreenAggregate(
+                $this->visitorFlowScreenRepository,
+                $previousVisit,
+                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                $level
+            );
+            $previousAggregate->isLastPage = false;
+            $previousAggregate->exitCount--;
+            $this->visitorFlowScreenRepository->save($previousAggregate);
+        }
+        $screenAggregate->views++;
+        $screenAggregate->exitCount++;
+        $this->visitorFlowScreenRepository->save($screenAggregate);
+    }
+
+    private function createScreenAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): ScreenAggregate
+    {
+        $page = $this->pageRepository->getById($currentVisit->page_id);
+        $website = $this->websiteRepository->getById($page->website_id);
+        $prevPage = new PageValue();
+        if ($level !== self::FIRST_LEVEL) {
+            $previousAggregate = $this->getPreviousScreenAggregate(
+                $this->visitorFlowScreenRepository,
+                $previousVisit,
+                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+                $level
+            );
+            $previousAggregate->isLastPage = false;
+            $previousAggregate->exitCount--;
+            $this->visitorFlowScreenRepository->save($previousAggregate);
+            $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
+        }
+        $exitCount = 1;
+        $isLatPage = true;
+        $views = 1;
+        return new ScreenAggregate(
+            $currentVisit->id,
+            $website->id,
+            $page->url,
+            $page->name,
+            $views,
+            $level,
+            $isLatPage,
+            $exitCount,
+            $currentVisit->session->system->resolution_width,
+            $currentVisit->session->system->resolution_height,
+            $prevPage
+        );
+    }
+
+    private function getScreenAggregate(Visit $visit, int $level, bool $isFirstInSession, ?Visit $previousVisit): ?ScreenAggregate
+    {
+        return $this->visitorFlowScreenRepository->getByCriteria(
+            ScreenCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level,
+                $isFirstInSession ? 'null' : $previousVisit->page->url,
+                $visit->session->system->resolution_width,
+                $visit->session->system->resolution_height
+            )
+        );
+    }
+
+    private  function getPreviousScreenAggregate(
+        VisitorFlowRepository $visitorFlowScreenRepository,
+        Visit $visit,
+        string $previousVisitUrl,
+        int $level
+    ): Aggregate {
+        return $visitorFlowScreenRepository->getByCriteria(
+            ScreenCriteria::getCriteria(
+                $visit->session->website_id,
+                $visit->page->url,
+                $level - 1,
+                $previousVisitUrl,
+                $visit->session->system->resolution_width,
+                $visit->session->system->resolution_height
+            )
+        );
+    }
+}
+
+

From e9e5025e1baa8f6eb895a8697d3d36be8e35f773 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Tue, 10 Sep 2019 14:16:17 +0300
Subject: [PATCH 132/183] fix style code

---
 .../VisitorsFlow/FlowBrowserAggregateService.php   | 10 +++++++---
 .../VisitorsFlow/FlowCountryAggregateService.php   | 14 +++++++++-----
 .../VisitorsFlow/FlowDeviceAggregateService.php    |  8 ++++++--
 .../VisitorsFlow/FlowScreenAggregateService.php    | 10 +++++++---
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/backend/app/Services/VisitorsFlow/FlowBrowserAggregateService.php b/backend/app/Services/VisitorsFlow/FlowBrowserAggregateService.php
index 8809139e..222fe2a4 100644
--- a/backend/app/Services/VisitorsFlow/FlowBrowserAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowBrowserAggregateService.php
@@ -109,8 +109,12 @@ private function createBrowserAggregate(Visit $currentVisit, int $level, ?Visit
         );
     }
 
-    private function getBrowserAggregate(Visit $visit, int $level, bool $isFirstInSession, ?Visit $previousVisit): ?BrowserAggregate
-    {
+    private function getBrowserAggregate(
+        Visit $visit,
+        int $level,
+        bool $isFirstInSession,
+        ?Visit $previousVisit
+    ): ?BrowserAggregate {
         return $this->visitorFlowBrowserRepository->getByCriteria(
             BrowserCriteria::getCriteria(
                 $visit->session->website_id,
@@ -122,7 +126,7 @@ private function getBrowserAggregate(Visit $visit, int $level, bool $isFirstInSe
         );
     }
 
-    private  function getPreviousBrowserAggregate(
+    private function getPreviousBrowserAggregate(
         VisitorFlowRepository $visitorFlowBrowserRepository,
         Visit $visit,
         string $previousVisitUrl,
diff --git a/backend/app/Services/VisitorsFlow/FlowCountryAggregateService.php b/backend/app/Services/VisitorsFlow/FlowCountryAggregateService.php
index 2a56f9fc..c45d99db 100644
--- a/backend/app/Services/VisitorsFlow/FlowCountryAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowCountryAggregateService.php
@@ -53,8 +53,8 @@ private function updateCountryAggregate(
         Visit $visit,
         int $level,
         ?Visit $previousVisit,
-        ?CountryAggregate $countryAggregate): void
-    {
+        ?CountryAggregate $countryAggregate
+    ): void {
         if (!$countryAggregate) {
             $countryAggregate = $this->createCountryAggregate($visit, $level, $previousVisit);
             $this->visitorFlowCountryRepository->save($countryAggregate);
@@ -112,8 +112,12 @@ private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit
         );
     }
 
-    private function getCountryAggregate(Visit $visit, int $level, bool $isFirstInSession, ?Visit $previousVisit): ?CountryAggregate
-    {
+    private function getCountryAggregate(
+        Visit $visit,
+        int $level,
+        bool $isFirstInSession,
+        ?Visit $previousVisit
+    ): ?CountryAggregate {
         return $this->visitorFlowCountryRepository->getByCriteria(
             CountryCriteria::getCriteria(
                 $visit->session->website_id,
@@ -125,7 +129,7 @@ private function getCountryAggregate(Visit $visit, int $level, bool $isFirstInSe
         );
     }
 
-    private  function getPreviousCountryAggregate(
+    private function getPreviousCountryAggregate(
         VisitorFlowRepository $visitorFlowCountryRepository,
         Visit $visit,
         string $previousVisitUrl,
diff --git a/backend/app/Services/VisitorsFlow/FlowDeviceAggregateService.php b/backend/app/Services/VisitorsFlow/FlowDeviceAggregateService.php
index 6b5273ee..28436c31 100644
--- a/backend/app/Services/VisitorsFlow/FlowDeviceAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowDeviceAggregateService.php
@@ -108,8 +108,12 @@ private function createDeviceAggregate(Visit $currentVisit, int $level, ?Visit $
         );
     }
 
-    private function getDeviceAggregate(Visit $visit, int $level, bool $isFirstInSession, ?Visit $previousVisit): ?DeviceAggregate
-    {
+    private function getDeviceAggregate(
+        Visit $visit,
+        int $level,
+        bool $isFirstInSession,
+        ?Visit $previousVisit
+    ): ?DeviceAggregate {
         return $this->visitorFlowDeviceRepository->getByCriteria(
             DeviceCriteria::getCriteria(
                 $visit->session->website_id,
diff --git a/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php b/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php
index c1274540..8b4751dd 100644
--- a/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php
@@ -110,8 +110,12 @@ private function createScreenAggregate(Visit $currentVisit, int $level, ?Visit $
         );
     }
 
-    private function getScreenAggregate(Visit $visit, int $level, bool $isFirstInSession, ?Visit $previousVisit): ?ScreenAggregate
-    {
+    private function getScreenAggregate(
+        Visit $visit,
+        int $level,
+        bool $isFirstInSession,
+        ?Visit $previousVisit
+    ): ?ScreenAggregate {
         return $this->visitorFlowScreenRepository->getByCriteria(
             ScreenCriteria::getCriteria(
                 $visit->session->website_id,
@@ -124,7 +128,7 @@ private function getScreenAggregate(Visit $visit, int $level, bool $isFirstInSes
         );
     }
 
-    private  function getPreviousScreenAggregate(
+    private function getPreviousScreenAggregate(
         VisitorFlowRepository $visitorFlowScreenRepository,
         Visit $visit,
         string $previousVisitUrl,

From 5ed9a69596de7d8f3cb41e75d0244d363efe9eb2 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Tue, 10 Sep 2019 15:02:05 +0300
Subject: [PATCH 133/183] add updatePrevious method

---
 .../FlowBrowserAggregateService.php           | 49 +++++++++----------
 .../FlowCountryAggregateService.php           | 48 +++++++++---------
 .../FlowDeviceAggregateService.php            | 48 +++++++++---------
 .../FlowScreenAggregateService.php            | 48 +++++++++---------
 4 files changed, 92 insertions(+), 101 deletions(-)

diff --git a/backend/app/Services/VisitorsFlow/FlowBrowserAggregateService.php b/backend/app/Services/VisitorsFlow/FlowBrowserAggregateService.php
index 222fe2a4..fa0f9a9d 100644
--- a/backend/app/Services/VisitorsFlow/FlowBrowserAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowBrowserAggregateService.php
@@ -42,54 +42,37 @@ public function aggregate(Visit $visit): void
         $isFirstInSession = $previousVisit === null;
         $level = $this->getLevel($visit, $isFirstInSession);
 
-        $browserAggregate = $this->getBrowserAggregate($visit, $level, $isFirstInSession, $previousVisit);
+        $browserAggregate = $this->getAggregate($visit, $level, $isFirstInSession, $previousVisit);
 
-        $this->updateBrowserAggregate($visit, $level, $previousVisit, $browserAggregate);
+        $this->updateAggregate($visit, $level, $previousVisit, $browserAggregate);
     }
 
-
-    private function updateBrowserAggregate(
+    private function updateAggregate(
         Visit $visit,
         int $level,
         ?Visit $previousVisit,
         ?BrowserAggregate $browserAggregate
     ): void {
         if (!$browserAggregate) {
-            $browserAggregate = $this->createBrowserAggregate($visit, $level, $previousVisit);
+            $browserAggregate = $this->createAggregate($visit, $level, $previousVisit);
             $this->visitorFlowBrowserRepository->save($browserAggregate);
             return;
         }
         if ($level > self::FIRST_LEVEL) {
-            $previousAggregate = $this->getPreviousBrowserAggregate(
-                $this->visitorFlowBrowserRepository,
-                $previousVisit,
-                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                $level
-            );
-            $previousAggregate->isLastPage = false;
-            $previousAggregate->exitCount--;
-            $this->visitorFlowBrowserRepository->save($previousAggregate);
+            $this->updatePreviousAggregate($previousVisit,$level);
         }
         $browserAggregate->views++;
         $browserAggregate->exitCount++;
         $this->visitorFlowBrowserRepository->save($browserAggregate);
     }
 
-    private function createBrowserAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): BrowserAggregate
+    private function createAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): BrowserAggregate
     {
         $page = $this->pageRepository->getById($currentVisit->page_id);
         $website = $this->websiteRepository->getById($page->website_id);
         $prevPage = new PageValue();
         if ($level !== self::FIRST_LEVEL) {
-            $previousAggregate =$this->getPreviousBrowserAggregate(
-                $this->visitorFlowBrowserRepository,
-                $previousVisit,
-                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                $level
-            );
-            $previousAggregate->isLastPage = false;
-            $previousAggregate->exitCount--;
-            $this->visitorFlowBrowserRepository->save($previousAggregate);
+            $previousAggregate = $this->updatePreviousAggregate($previousVisit,$level);
             $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
         }
         $exitCount = 1;
@@ -109,7 +92,21 @@ private function createBrowserAggregate(Visit $currentVisit, int $level, ?Visit
         );
     }
 
-    private function getBrowserAggregate(
+    private function updatePreviousAggregate(Visit $previousVisit,int $level):Aggregate
+    {
+        $previousAggregate = $this->getPreviousAggregate(
+            $this->visitorFlowBrowserRepository,
+            $previousVisit,
+            $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+            $level
+        );
+        $previousAggregate->isLastPage = false;
+        $previousAggregate->exitCount--;
+        $this->visitorFlowBrowserRepository->save($previousAggregate);
+        return $previousAggregate;
+    }
+
+    private function getAggregate(
         Visit $visit,
         int $level,
         bool $isFirstInSession,
@@ -126,7 +123,7 @@ private function getBrowserAggregate(
         );
     }
 
-    private function getPreviousBrowserAggregate(
+    private function getPreviousAggregate(
         VisitorFlowRepository $visitorFlowBrowserRepository,
         Visit $visit,
         string $previousVisitUrl,
diff --git a/backend/app/Services/VisitorsFlow/FlowCountryAggregateService.php b/backend/app/Services/VisitorsFlow/FlowCountryAggregateService.php
index c45d99db..b6841f03 100644
--- a/backend/app/Services/VisitorsFlow/FlowCountryAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowCountryAggregateService.php
@@ -44,54 +44,38 @@ public function aggregate(Visit $visit): void
         $isFirstInSession = $previousVisit === null;
         $level = $this->getLevel($visit, $isFirstInSession);
 
-        $countryAggregate = $this->getCountryAggregate($visit, $level, $isFirstInSession, $previousVisit);
+        $countryAggregate = $this->getAggregate($visit, $level, $isFirstInSession, $previousVisit);
 
-        $this->updateCountryAggregate($visit, $level, $previousVisit, $countryAggregate);
+        $this->updateAggregate($visit, $level, $previousVisit, $countryAggregate);
     }
 
-    private function updateCountryAggregate(
+    private function updateAggregate(
         Visit $visit,
         int $level,
         ?Visit $previousVisit,
         ?CountryAggregate $countryAggregate
     ): void {
         if (!$countryAggregate) {
-            $countryAggregate = $this->createCountryAggregate($visit, $level, $previousVisit);
+            $countryAggregate = $this->createAggregate($visit, $level, $previousVisit);
             $this->visitorFlowCountryRepository->save($countryAggregate);
             return;
         }
         if ($level > self::FIRST_LEVEL) {
-            $previousAggregate = $this->getPreviousCountryAggregate(
-                $this->visitorFlowCountryRepository,
-                $previousVisit,
-                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                $level
-            );
-            $previousAggregate->isLastPage = false;
-            $previousAggregate->exitCount--;
-            $this->visitorFlowCountryRepository->save($previousAggregate);
+            $this->updatePreviousAggregate($previousVisit,$level);
         }
         $countryAggregate->views++;
         $countryAggregate->exitCount++;
         $this->visitorFlowCountryRepository->save($countryAggregate);
     }
 
-    private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): CountryAggregate
+    private function createAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): CountryAggregate
     {
         $page = $this->pageRepository->getById($currentVisit->page_id);
         $website = $this->websiteRepository->getById($page->website_id);
         $geoPosition = $this->geoPositionRepository->getById($currentVisit->geo_position_id);
         $prevPage = new PageValue();
         if ($level !== self::FIRST_LEVEL) {
-            $previousAggregate = $this->getPreviousCountryAggregate(
-                $this->visitorFlowCountryRepository,
-                $previousVisit,
-                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                $level
-            );
-            $previousAggregate->isLastPage = false;
-            $previousAggregate->exitCount--;
-            $this->visitorFlowCountryRepository->save($previousAggregate);
+            $previousAggregate = $this->updatePreviousAggregate($previousVisit,$level);
             $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
         }
 
@@ -112,7 +96,21 @@ private function createCountryAggregate(Visit $currentVisit, int $level, ?Visit
         );
     }
 
-    private function getCountryAggregate(
+    private function updatePreviousAggregate(Visit $previousVisit, int $level):Aggregate
+    {
+        $previousAggregate = $this->getPreviousAggregate(
+            $this->visitorFlowCountryRepository,
+            $previousVisit,
+            $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+            $level
+        );
+        $previousAggregate->isLastPage = false;
+        $previousAggregate->exitCount--;
+        $this->visitorFlowCountryRepository->save($previousAggregate);
+        return  $previousAggregate;
+    }
+
+    private function getAggregate(
         Visit $visit,
         int $level,
         bool $isFirstInSession,
@@ -129,7 +127,7 @@ private function getCountryAggregate(
         );
     }
 
-    private function getPreviousCountryAggregate(
+    private function getPreviousAggregate(
         VisitorFlowRepository $visitorFlowCountryRepository,
         Visit $visit,
         string $previousVisitUrl,
diff --git a/backend/app/Services/VisitorsFlow/FlowDeviceAggregateService.php b/backend/app/Services/VisitorsFlow/FlowDeviceAggregateService.php
index 28436c31..d67aaf2b 100644
--- a/backend/app/Services/VisitorsFlow/FlowDeviceAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowDeviceAggregateService.php
@@ -42,53 +42,37 @@ public function aggregate(Visit $visit): void
         $isFirstInSession = $previousVisit === null;
         $level = $this->getLevel($visit, $isFirstInSession);
 
-        $deviceAggregate = $this->getDeviceAggregate($visit, $level, $isFirstInSession, $previousVisit);
+        $deviceAggregate = $this->getAggregate($visit, $level, $isFirstInSession, $previousVisit);
 
-        $this->updateDeviceAggregate($visit, $level, $previousVisit, $deviceAggregate);
+        $this->updateAggregate($visit, $level, $previousVisit, $deviceAggregate);
     }
 
-    private function updateDeviceAggregate(
+    private function updateAggregate(
         Visit $visit,
         int $level,
         ?Visit $previousVisit,
         ?DeviceAggregate $deviceAggregate
     ): void {
         if (!$deviceAggregate) {
-            $deviceAggregate = $this->createDeviceAggregate($visit, $level, $previousVisit);
+            $deviceAggregate = $this->createAggregate($visit, $level, $previousVisit);
             $this->visitorFlowDeviceRepository->save($deviceAggregate);
             return;
         }
         if ($level > self::FIRST_LEVEL) {
-            $previousAggregate = $this->getPreviousDeviceAggregate(
-                $this->visitorFlowDeviceRepository,
-                $previousVisit,
-                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                $level
-            );
-            $previousAggregate->isLastPage = false;
-            $previousAggregate->exitCount--;
-            $this->visitorFlowDeviceRepository->save($previousAggregate);
+            $this->updatePrevious($previousVisit,$level);
         }
         $deviceAggregate->views++;
         $deviceAggregate->exitCount++;
         $this->visitorFlowDeviceRepository->save($deviceAggregate);
     }
 
-    private function createDeviceAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): DeviceAggregate
+    private function createAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): DeviceAggregate
     {
         $page = $this->pageRepository->getById($currentVisit->page_id);
         $website = $this->websiteRepository->getById($page->website_id);
         $prevPage = new PageValue();
         if ($level !== self::FIRST_LEVEL) {
-            $previousAggregate =$this->getPreviousDeviceAggregate(
-                $this->visitorFlowDeviceRepository,
-                $previousVisit,
-                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                $level
-            );
-            $previousAggregate->isLastPage = false;
-            $previousAggregate->exitCount--;
-            $this->visitorFlowDeviceRepository->save($previousAggregate);
+            $previousAggregate = $this->updatePrevious($previousVisit,$level);
             $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
         }
         $exitCount = 1;
@@ -108,7 +92,21 @@ private function createDeviceAggregate(Visit $currentVisit, int $level, ?Visit $
         );
     }
 
-    private function getDeviceAggregate(
+    private function updatePrevious(Visit $previousVisit, int $level):Aggregate
+    {
+        $previousAggregate = $this->getPreviousAggregate(
+            $this->visitorFlowDeviceRepository,
+            $previousVisit,
+            $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+            $level
+        );
+        $previousAggregate->isLastPage = false;
+        $previousAggregate->exitCount--;
+        $this->visitorFlowDeviceRepository->save($previousAggregate);
+        return  $previousAggregate;
+    }
+
+    private function getAggregate(
         Visit $visit,
         int $level,
         bool $isFirstInSession,
@@ -125,7 +123,7 @@ private function getDeviceAggregate(
         );
     }
 
-    private function getPreviousDeviceAggregate(
+    private function getPreviousAggregate(
         VisitorFlowRepository $visitorFlowDeviceRepository,
         Visit $visit,
         string $previousVisitUrl,
diff --git a/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php b/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php
index 8b4751dd..74d2250d 100644
--- a/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php
@@ -43,53 +43,37 @@ public function aggregate(Visit $visit): void
         $isFirstInSession = $previousVisit === null;
         $level = $this->getLevel($visit, $isFirstInSession);
 
-        $screenAggregate = $this->getScreenAggregate($visit, $level, $isFirstInSession, $previousVisit);
+        $screenAggregate = $this->getAggregate($visit, $level, $isFirstInSession, $previousVisit);
 
-        $this->updateScreenAggregate($visit, $level, $previousVisit, $screenAggregate);
+        $this->updateAggregate($visit, $level, $previousVisit, $screenAggregate);
     }
 
-    private function updateScreenAggregate(
+    private function updateAggregate(
         Visit $visit,
         int $level,
         ?Visit $previousVisit,
         ?ScreenAggregate $screenAggregate
     ): void {
         if (!$screenAggregate) {
-            $screenAggregate = $this->createScreenAggregate($visit, $level, $previousVisit);
+            $screenAggregate = $this->createAggregate($visit, $level, $previousVisit);
             $this->visitorFlowScreenRepository->save($screenAggregate);
             return;
         }
         if ($level > self::FIRST_LEVEL) {
-            $previousAggregate = $this->getPreviousScreenAggregate(
-                $this->visitorFlowScreenRepository,
-                $previousVisit,
-                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                $level
-            );
-            $previousAggregate->isLastPage = false;
-            $previousAggregate->exitCount--;
-            $this->visitorFlowScreenRepository->save($previousAggregate);
+          $this->updatePrevious($previousVisit,$level);
         }
         $screenAggregate->views++;
         $screenAggregate->exitCount++;
         $this->visitorFlowScreenRepository->save($screenAggregate);
     }
 
-    private function createScreenAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): ScreenAggregate
+    private function createAggregate(Visit $currentVisit, int $level, ?Visit $previousVisit): ScreenAggregate
     {
         $page = $this->pageRepository->getById($currentVisit->page_id);
         $website = $this->websiteRepository->getById($page->website_id);
         $prevPage = new PageValue();
         if ($level !== self::FIRST_LEVEL) {
-            $previousAggregate = $this->getPreviousScreenAggregate(
-                $this->visitorFlowScreenRepository,
-                $previousVisit,
-                $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
-                $level
-            );
-            $previousAggregate->isLastPage = false;
-            $previousAggregate->exitCount--;
-            $this->visitorFlowScreenRepository->save($previousAggregate);
+            $previousAggregate = $this->updatePrevious($previousVisit,$level);
             $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
         }
         $exitCount = 1;
@@ -110,7 +94,21 @@ private function createScreenAggregate(Visit $currentVisit, int $level, ?Visit $
         );
     }
 
-    private function getScreenAggregate(
+    private function updatePrevious(Visit $previousVisit,int $level):Aggregate
+    {
+        $previousAggregate = $this->getPreviousAggregate(
+            $this->visitorFlowScreenRepository,
+            $previousVisit,
+            $level > 2 ? ($this->getPreviousVisit($previousVisit))->page->url : 'null',
+            $level
+        );
+        $previousAggregate->isLastPage = false;
+        $previousAggregate->exitCount--;
+        $this->visitorFlowScreenRepository->save($previousAggregate);
+        return  $previousAggregate;
+    }
+
+    private function getAggregate(
         Visit $visit,
         int $level,
         bool $isFirstInSession,
@@ -128,7 +126,7 @@ private function getScreenAggregate(
         );
     }
 
-    private function getPreviousScreenAggregate(
+    private function getPreviousAggregate(
         VisitorFlowRepository $visitorFlowScreenRepository,
         Visit $visit,
         string $previousVisitUrl,

From 44079890fe243e2fa203b0b4e5e00abd6e2979ce Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Tue, 10 Sep 2019 15:06:38 +0300
Subject: [PATCH 134/183] fix style code

---
 .../Services/VisitorsFlow/FlowBrowserAggregateService.php   | 6 +++---
 .../Services/VisitorsFlow/FlowCountryAggregateService.php   | 4 ++--
 .../Services/VisitorsFlow/FlowDeviceAggregateService.php    | 4 ++--
 .../Services/VisitorsFlow/FlowScreenAggregateService.php    | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/backend/app/Services/VisitorsFlow/FlowBrowserAggregateService.php b/backend/app/Services/VisitorsFlow/FlowBrowserAggregateService.php
index fa0f9a9d..9ddac38d 100644
--- a/backend/app/Services/VisitorsFlow/FlowBrowserAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowBrowserAggregateService.php
@@ -59,7 +59,7 @@ private function updateAggregate(
             return;
         }
         if ($level > self::FIRST_LEVEL) {
-            $this->updatePreviousAggregate($previousVisit,$level);
+            $this->updatePreviousAggregate($previousVisit, $level);
         }
         $browserAggregate->views++;
         $browserAggregate->exitCount++;
@@ -72,7 +72,7 @@ private function createAggregate(Visit $currentVisit, int $level, ?Visit $previo
         $website = $this->websiteRepository->getById($page->website_id);
         $prevPage = new PageValue();
         if ($level !== self::FIRST_LEVEL) {
-            $previousAggregate = $this->updatePreviousAggregate($previousVisit,$level);
+            $previousAggregate = $this->updatePreviousAggregate($previousVisit, $level);
             $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
         }
         $exitCount = 1;
@@ -92,7 +92,7 @@ private function createAggregate(Visit $currentVisit, int $level, ?Visit $previo
         );
     }
 
-    private function updatePreviousAggregate(Visit $previousVisit,int $level):Aggregate
+    private function updatePreviousAggregate(Visit $previousVisit, int $level):Aggregate
     {
         $previousAggregate = $this->getPreviousAggregate(
             $this->visitorFlowBrowserRepository,
diff --git a/backend/app/Services/VisitorsFlow/FlowCountryAggregateService.php b/backend/app/Services/VisitorsFlow/FlowCountryAggregateService.php
index b6841f03..c4510db1 100644
--- a/backend/app/Services/VisitorsFlow/FlowCountryAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowCountryAggregateService.php
@@ -61,7 +61,7 @@ private function updateAggregate(
             return;
         }
         if ($level > self::FIRST_LEVEL) {
-            $this->updatePreviousAggregate($previousVisit,$level);
+            $this->updatePreviousAggregate($previousVisit, $level);
         }
         $countryAggregate->views++;
         $countryAggregate->exitCount++;
@@ -75,7 +75,7 @@ private function createAggregate(Visit $currentVisit, int $level, ?Visit $previo
         $geoPosition = $this->geoPositionRepository->getById($currentVisit->geo_position_id);
         $prevPage = new PageValue();
         if ($level !== self::FIRST_LEVEL) {
-            $previousAggregate = $this->updatePreviousAggregate($previousVisit,$level);
+            $previousAggregate = $this->updatePreviousAggregate($previousVisit, $level);
             $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
         }
 
diff --git a/backend/app/Services/VisitorsFlow/FlowDeviceAggregateService.php b/backend/app/Services/VisitorsFlow/FlowDeviceAggregateService.php
index d67aaf2b..38fb6a37 100644
--- a/backend/app/Services/VisitorsFlow/FlowDeviceAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowDeviceAggregateService.php
@@ -59,7 +59,7 @@ private function updateAggregate(
             return;
         }
         if ($level > self::FIRST_LEVEL) {
-            $this->updatePrevious($previousVisit,$level);
+            $this->updatePrevious($previousVisit, $level);
         }
         $deviceAggregate->views++;
         $deviceAggregate->exitCount++;
@@ -72,7 +72,7 @@ private function createAggregate(Visit $currentVisit, int $level, ?Visit $previo
         $website = $this->websiteRepository->getById($page->website_id);
         $prevPage = new PageValue();
         if ($level !== self::FIRST_LEVEL) {
-            $previousAggregate = $this->updatePrevious($previousVisit,$level);
+            $previousAggregate = $this->updatePrevious($previousVisit, $level);
             $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
         }
         $exitCount = 1;
diff --git a/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php b/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php
index 74d2250d..020a0cb0 100644
--- a/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php
@@ -60,7 +60,7 @@ private function updateAggregate(
             return;
         }
         if ($level > self::FIRST_LEVEL) {
-          $this->updatePrevious($previousVisit,$level);
+          $this->updatePrevious($previousVisit, $level);
         }
         $screenAggregate->views++;
         $screenAggregate->exitCount++;
@@ -73,7 +73,7 @@ private function createAggregate(Visit $currentVisit, int $level, ?Visit $previo
         $website = $this->websiteRepository->getById($page->website_id);
         $prevPage = new PageValue();
         if ($level !== self::FIRST_LEVEL) {
-            $previousAggregate = $this->updatePrevious($previousVisit,$level);
+            $previousAggregate = $this->updatePrevious($previousVisit, $level);
             $prevPage = new PageValue($previousVisit->id, $previousAggregate->targetUrl);
         }
         $exitCount = 1;
@@ -94,7 +94,7 @@ private function createAggregate(Visit $currentVisit, int $level, ?Visit $previo
         );
     }
 
-    private function updatePrevious(Visit $previousVisit,int $level):Aggregate
+    private function updatePrevious(Visit $previousVisit, int $level):Aggregate
     {
         $previousAggregate = $this->getPreviousAggregate(
             $this->visitorFlowScreenRepository,

From d9dcd85920d2a9a2fc49008ba0c23f6ead8d2557 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Tue, 10 Sep 2019 15:08:10 +0300
Subject: [PATCH 135/183] final fix style code

---
 .../app/Services/VisitorsFlow/FlowScreenAggregateService.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php b/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php
index 020a0cb0..2e79579b 100644
--- a/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php
+++ b/backend/app/Services/VisitorsFlow/FlowScreenAggregateService.php
@@ -60,7 +60,7 @@ private function updateAggregate(
             return;
         }
         if ($level > self::FIRST_LEVEL) {
-          $this->updatePrevious($previousVisit, $level);
+            $this->updatePrevious($previousVisit, $level);
         }
         $screenAggregate->views++;
         $screenAggregate->exitCount++;

From cc977fde79bfb378220c25e2171bc65848301f67 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Tue, 10 Sep 2019 14:58:38 +0300
Subject: [PATCH 136/183] add session created event

---
 .../app/Actions/Visits/CreateVisitAction.php  |  5 ++++-
 backend/app/Events/SessionCreated.php         | 21 +++++++++++++++++++
 backend/app/Events/StatsChangeEvent.php       |  9 ++++----
 backend/app/Listeners/CalculateStats.php      | 15 -------------
 .../app/Listeners/SendSessionNotification.php | 14 +++++++++++++
 .../app/Providers/EventServiceProvider.php    |  4 +++-
 6 files changed, 47 insertions(+), 21 deletions(-)
 create mode 100644 backend/app/Events/SessionCreated.php
 delete mode 100644 backend/app/Listeners/CalculateStats.php
 create mode 100644 backend/app/Listeners/SendSessionNotification.php

diff --git a/backend/app/Actions/Visits/CreateVisitAction.php b/backend/app/Actions/Visits/CreateVisitAction.php
index ad1b1ec2..fcdfbe67 100644
--- a/backend/app/Actions/Visits/CreateVisitAction.php
+++ b/backend/app/Actions/Visits/CreateVisitAction.php
@@ -9,6 +9,7 @@
 use App\Entities\Session;
 use App\Entities\System;
 use App\Entities\Visit;
+use App\Events\SessionCreated;
 use App\Events\VisitCreated;
 use App\Repositories\Contracts\GeoPositionRepository;
 use App\Repositories\Contracts\PageRepository;
@@ -191,6 +192,8 @@ private function getOrCreateSession(
         $session->system_id = $systemId;
         $session->website_id = $websiteId;
 
-        return $this->sessionRepository->save($session);
+        $session = $this->sessionRepository->save($session);
+        SessionCreated::dispatch($session);
+        return $session;
     }
 }
diff --git a/backend/app/Events/SessionCreated.php b/backend/app/Events/SessionCreated.php
new file mode 100644
index 00000000..92141041
--- /dev/null
+++ b/backend/app/Events/SessionCreated.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Events;
+
+use App\Entities\Session;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Support\Facades\Event;
+
+class SessionCreated extends Event
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public $session;
+
+    public function __construct(Session $session)
+    {
+        $this->session = $session;
+    }
+}
diff --git a/backend/app/Events/StatsChangeEvent.php b/backend/app/Events/StatsChangeEvent.php
index 33c1feac..e92c0a1a 100644
--- a/backend/app/Events/StatsChangeEvent.php
+++ b/backend/app/Events/StatsChangeEvent.php
@@ -2,6 +2,7 @@
 
 namespace App\Events;
 
+use App\Entities\Session;
 use App\Entities\Visit;
 use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
@@ -14,15 +15,15 @@ class StatsChangeEvent extends Event implements ShouldBroadcast
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    public $visit;
+    public $session;
 
-    public function __construct(Visit $visit)
+    public function __construct(Session $session)
     {
-        $this->visit = $visit;
+        $this->session = $session;
     }
 
     public function broadcastOn()
     {
-        return new PrivateChannel('stats.' . $this->visit->page->website_id);
+        return new PrivateChannel('stats.' . $this->session->website->id);
     }
 }
diff --git a/backend/app/Listeners/CalculateStats.php b/backend/app/Listeners/CalculateStats.php
deleted file mode 100644
index 0285994e..00000000
--- a/backend/app/Listeners/CalculateStats.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Listeners;
-
-use App\Events\ActiveUserEvent;
-use App\Events\StatsChangeEvent;
-use App\Events\VisitCreated;
-
-class CalculateStats
-{
-    public function handle(VisitCreated $event)
-    {
-        event(new StatsChangeEvent($event->visit));
-    }
-}
diff --git a/backend/app/Listeners/SendSessionNotification.php b/backend/app/Listeners/SendSessionNotification.php
new file mode 100644
index 00000000..650fabff
--- /dev/null
+++ b/backend/app/Listeners/SendSessionNotification.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Events\SessionCreated;
+use App\Events\StatsChangeEvent;
+
+class SendSessionNotification
+{
+    public function handle(SessionCreated $event)
+    {
+        event(new StatsChangeEvent($event->session));
+    }
+}
diff --git a/backend/app/Providers/EventServiceProvider.php b/backend/app/Providers/EventServiceProvider.php
index 83d2eb6b..54a14aee 100644
--- a/backend/app/Providers/EventServiceProvider.php
+++ b/backend/app/Providers/EventServiceProvider.php
@@ -20,8 +20,10 @@ class EventServiceProvider extends ServiceProvider
         ],
         'App\Events\VisitCreated' => [
             'App\Listeners\SendVisitsNotification',
-            'App\Listeners\CalculateStats'
         ],
+        'App\Events\SessionCreated' => [
+            'App\Listeners\SendSessionNotification'
+        ]
     ];
 
     /**

From 71a09ed513fe41c2ee093a9dcad9af25f02d6428 Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Tue, 10 Sep 2019 18:00:56 +0300
Subject: [PATCH 137/183] remove excess getter

---
 frontend/src/store/modules/error_report/getters.js       | 2 --
 frontend/src/store/modules/error_report/types/getters.js | 1 -
 2 files changed, 3 deletions(-)

diff --git a/frontend/src/store/modules/error_report/getters.js b/frontend/src/store/modules/error_report/getters.js
index bc51c3e9..99e33aeb 100644
--- a/frontend/src/store/modules/error_report/getters.js
+++ b/frontend/src/store/modules/error_report/getters.js
@@ -5,7 +5,6 @@ import {
     GET_TABLE_DATA,
     GET_TABLE_DATA_FETCHING,
     GET_LINE_CHART_FETCHING,
-    FETCH_TABLE_DATA,
 } from "./types/getters";
 
 import { chartDataTransformer } from "@/api/widgets/transformers";
@@ -19,5 +18,4 @@ export default {
     [GET_TABLE_DATA]: (state) => state.tableData,
     [GET_TABLE_DATA_FETCHING]: (state) => state.tableData.isFetching,
     [GET_LINE_CHART_FETCHING]: (state) => state.chartData.isFetching,
-    [FETCH_TABLE_DATA]: (state) => state.tableData,
 };
diff --git a/frontend/src/store/modules/error_report/types/getters.js b/frontend/src/store/modules/error_report/types/getters.js
index 16859d76..c1efdc69 100644
--- a/frontend/src/store/modules/error_report/types/getters.js
+++ b/frontend/src/store/modules/error_report/types/getters.js
@@ -4,4 +4,3 @@ export const GET_FORMAT_LINE_CHART_DATA = 'getFormatLineChartData';
 export const GET_TABLE_DATA = 'getTableData';
 export const GET_TABLE_DATA_FETCHING = 'getTableDataFetching';
 export const GET_LINE_CHART_FETCHING = 'getLineChartFetching';
-export const FETCH_TABLE_DATA = 'getTableData';

From 23bab2f42bcf79636fdc323d755fec292df09186 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Tue, 10 Sep 2019 18:25:56 +0300
Subject: [PATCH 138/183] change getFlow method's response'

---
 .../VisitorsFlow/GetVisitorsFlowAction.php    | 47 +++++++++++++++----
 .../VisitorsFlow/ParameterFlowItem.php        | 10 ++++
 ...asticsearchVisitorFlowDeviceRepository.php |  2 +-
 3 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
index da9b56b3..9c7fec49 100644
--- a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
+++ b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
@@ -3,10 +3,12 @@
 
 namespace App\Actions\VisitorsFlow;
 
+use App\DataTransformer\VisitorsFlow\ParameterFlowItem;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowBrowserRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowCountryRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowDeviceRepository;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowScreenRepository;
+use Illuminate\Support\Collection;
 
 class GetVisitorsFlowAction
 {
@@ -34,35 +36,64 @@ public function execute(GetVisitorsFlowRequest $request): GetVisitorFlowResponse
             case 'browser':
                 if ($request->getLevel() > 2) {
                     $browsersFlow = $this->visitorsFlowBrowserRepository->getFlow($websiteId, $request->getLevel());
-                    return new GetVisitorFlowResponse($browsersFlow->getCollection());
+                    $filtered = $this->filter($browsersFlow->getCollection());
+                    return new GetVisitorFlowResponse($filtered);
                 }
                 $browsersViews = $this->visitorsFlowBrowserRepository->getViewsByEachBrowser($request->getParameter(), $websiteId);
                 $browsersFlow = $this->visitorsFlowBrowserRepository->getFlow($websiteId, $request->getLevel());
-                return new GetVisitorFlowResponse($browsersFlow->getCollection(), $browsersViews->getCollection());
+                $filtered = $this->filter($browsersFlow->getCollection());
+                return new GetVisitorFlowResponse($filtered, $browsersViews->getCollection());
             case 'country':
                 if ($request->getLevel() > 2) {
                     $countriesFlow = $this->visitorsFlowCountryRepository->getFlow($websiteId, $request->getLevel());
-                    return new GetVisitorFlowResponse($countriesFlow->getCollection());
+                    $filtered = $this->filter($countriesFlow->getCollection());
+                    return new GetVisitorFlowResponse($filtered);
                 }
                 $countriesViews = $this->visitorsFlowCountryRepository->getViewsByEachCountry($request->getParameter(), $websiteId);
                 $countriesFlow = $this->visitorsFlowCountryRepository->getFlow($websiteId, $request->getLevel());
-                return new GetVisitorFlowResponse($countriesFlow->getCollection(), $countriesViews->getCollection());
+                $filtered = $this->filter($countriesFlow->getCollection());
+                return new GetVisitorFlowResponse($filtered, $countriesViews->getCollection());
             case 'device':
                 if ($request->getLevel() > 2) {
                     $devicesFlow = $this->visitorsFlowDeviceRepository->getFlow($websiteId, $request->getLevel());
-                    return new GetVisitorFlowResponse($devicesFlow->getCollection());
+                    $filtered = $this->filter($devicesFlow->getCollection());
+                    return new GetVisitorFlowResponse($filtered);
                 }
                 $devicesViews = $this->visitorsFlowDeviceRepository->getViewsByEachDevice($request->getParameter(), $websiteId);
                 $devicesFlow = $this->visitorsFlowDeviceRepository->getFlow($websiteId, $request->getLevel());
-                return new GetVisitorFlowResponse($devicesFlow->getCollection(), $devicesViews->getCollection());
+                $filtered = $this->filter($devicesFlow->getCollection());
+                return new GetVisitorFlowResponse($filtered, $devicesViews->getCollection());
             case 'screen':
                 if ($request->getLevel() > 2) {
                     $screensFlow = $this->visitorsFlowScreenRepository->getFlow($websiteId, $request->getLevel());
-                    return new GetVisitorFlowResponse($screensFlow->getCollection());
+                    $filtered = $this->filter($screensFlow->getCollection());
+                    return new GetVisitorFlowResponse($filtered);
                 }
                 $screensViews = $this->visitorsFlowScreenRepository->getViewsByEachScreen($websiteId);
                 $screensFlow = $this->visitorsFlowScreenRepository->getFlow($websiteId, $request->getLevel());
-                return new GetVisitorFlowResponse($screensFlow->getCollection(), $screensViews->getCollection());
+                $filtered = $this->filter($screensFlow->getCollection());
+                return new GetVisitorFlowResponse($filtered, $screensViews->getCollection());
         }
     }
+
+    private function filter(Collection $collection): Collection
+    {
+        $result = collect();
+        $collection->each(function (ParameterFlowItem $item, $key) use (&$result) {
+            $found = false;
+            foreach ($result as $resItem) {
+                if ($resItem->getTargetUrl() === $item->getTargetUrl() && $resItem->getLevel() === $item->getLevel()
+                    && $resItem->getSourceUrl() === $item->getSourceUrl()) {
+                    $resItem->setViews($item->getViews());
+                    $resItem->setExitCount($item->getExitCount());
+                    $found = true;
+                    break;
+                }
+            }
+            if ($found === false) {
+                $result->add($item);
+            }
+        });
+        return $result;
+    }
 }
diff --git a/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php b/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php
index f389fd79..fe03e4f7 100644
--- a/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php
+++ b/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php
@@ -45,4 +45,14 @@ public function getSourceUrl(): string
     {
         return $this->sourceUrl;
     }
+
+    public function setViews(int $views): void
+    {
+        $this->views += $views;
+    }
+
+    public function setExitCount(int $exitCount): void
+    {
+        $this->exitCount += $exitCount;
+    }
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
index 1016289b..b3b9055d 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
@@ -47,7 +47,7 @@ public function getByCriteria(Criteria $criteria): ?DeviceAggregate
                             ['term' => ['level' => $criteria->level]],
                             ['match_phrase' => ['target_url' => $criteria->targetUrl]],
                             ['match_phrase' => ['device' => $criteria->device]],
-                            ['match_phrase'=>['prev_page.source_url'=>$criteria->prevPageUrl]]
+                            ['match_phrase' => ['prev_page.source_url' => $criteria->prevPageUrl]]
                         ],
                     ]
                 ]

From d68dc838d3d0981c84fb7aaffe369441d49b81eb Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Tue, 10 Sep 2019 18:38:20 +0300
Subject: [PATCH 139/183] remove unused parameter

---
 backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
index 9c7fec49..754178b1 100644
--- a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
+++ b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
@@ -79,7 +79,7 @@ public function execute(GetVisitorsFlowRequest $request): GetVisitorFlowResponse
     private function filter(Collection $collection): Collection
     {
         $result = collect();
-        $collection->each(function (ParameterFlowItem $item, $key) use (&$result) {
+        $collection->each(function (ParameterFlowItem $item) use (&$result) {
             $found = false;
             foreach ($result as $resItem) {
                 if ($resItem->getTargetUrl() === $item->getTargetUrl() && $resItem->getLevel() === $item->getLevel()

From 3db5ebdd6c44f950a8dcbbc0cbd37f6bdc40730e Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Tue, 10 Sep 2019 20:04:35 +0300
Subject: [PATCH 140/183] make rects with low values more visible

---
 .../dashboard/home/VisitsDensityWidget.vue    | 62 +++++++++++++++++--
 1 file changed, 57 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
index 6a27ca67..193396c3 100644
--- a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
+++ b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
@@ -65,7 +65,7 @@
                         },
                         fontFamily: 'Gilroy'
                     },
-                    colors: ["#3C57DE"],
+                    colors: ["#0935de"],
                     dataLabels: {
                         enabled: false
                     },
@@ -85,6 +85,9 @@
                     plotOptions: {
                         heatmap: {
                             radius: 6,
+                            colorScale: {
+                                ranges: []
+                            }
                         }
                     },
                     states: {
@@ -137,6 +140,7 @@
                 isFetching: IS_FETCHING
             }),
             drawHeatmap () {
+                const visitsData = this.getVisitsData;
                 let series = [];
 
                 for (let hour = 0; hour < 24; hour++) {
@@ -151,13 +155,13 @@
                     row.data = [];
 
                     for (let day = 0; day < 7; day++) {
-                        let visitsData = this.getVisitsData.find((item) => {
+                        let visitData = visitsData.find((item) => {
                             return item.hour === hour && item.day === day;
                         });
-                        if (visitsData) {
+                        if (visitData) {
                             row.data.push({
                                 x: this.days[day],
-                                y: visitsData.visits
+                                y: visitData.visits
                             });
                         } else {
                             row.data.push({
@@ -170,6 +174,8 @@
                     series.push(row);
                 }
 
+                this.setShadesRanges();
+
                 return series;
             }
         },
@@ -180,7 +186,53 @@
             ...mapActions('visits_density_widget', {
                 changeSelectedPeriod: CHANGE_SELECTED_PERIOD,
                 fetchWidgetData: FETCH_WIDGET_DATA
-            })
+            }),
+            setShadesRanges () {
+                let ranges = [{
+                    from: -1,
+                    to: 0,
+                    color: "#d0d8eb"
+                }];
+                let colors = [
+                    "#7887de",
+                    "#6f80de",
+                    "#6579de",
+                    "#5c72de",
+                    "#536ade",
+                    "#536cde",
+                    "#4a65de",
+                    "#415ede",
+                    "#3757de",
+                    "#2e50de",
+                    "#254ade",
+                    "#1b43de",
+                    "#123cde",
+                    "#0935de",
+                ];
+
+                let max = Math.max.apply(Math, this.getVisitsData.map(item => item.visits));
+                let min = Math.min.apply(Math, this.getVisitsData.map(item => item.visits));
+
+                let boundary = (max - min) / colors.length;
+
+                for (let i = 0; i < colors.length; i++) {
+                    ranges.push({
+                        from: i * boundary + 1,
+                        to: (i + 1) * boundary,
+                        color: colors[i]
+                    });
+                }
+
+                this.chartOptions = {...this.chartOptions, ...{
+                    plotOptions: {
+                        heatmap: {
+                            colorScale: {
+                                ranges: ranges
+                            }
+                        }
+                    },
+                }};
+            }
         }
     };
 </script>

From fd7de3684bf7a7ce7aebb7ef79b71a6847af3232 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Tue, 10 Sep 2019 20:11:25 +0300
Subject: [PATCH 141/183] remove extra content layout element from audience
 component

---
 frontend/src/pages/Audience.vue |  8 +-------
 frontend/src/pages/Visitors.vue | 10 ++++------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/frontend/src/pages/Audience.vue b/frontend/src/pages/Audience.vue
index 8bf2592c..005c15ca 100644
--- a/frontend/src/pages/Audience.vue
+++ b/frontend/src/pages/Audience.vue
@@ -1,18 +1,12 @@
 <template>
-    <ContentLayout>
-        <RouterView />
-    </ContentLayout>
+    <RouterView />
 </template>
 
 <script>
-    import ContentLayout from '../components/layout/ContentLayout.vue';
     import {isWebsite} from '../mixins/isWebsite';
 
     export default {
         mixins: [isWebsite],
         name: 'Audience',
-        components: {
-            ContentLayout
-        }
     };
 </script>
\ No newline at end of file
diff --git a/frontend/src/pages/Visitors.vue b/frontend/src/pages/Visitors.vue
index 80fcb649..5499b933 100644
--- a/frontend/src/pages/Visitors.vue
+++ b/frontend/src/pages/Visitors.vue
@@ -33,18 +33,16 @@
             wrap
         >
             <VCol
-                lg6
-                md-8
-                sm12
+                lg="7"
+                md="12"
                 height="100%"
                 class="img-card"
             >
                 <VisitorsTable />
             </VCol>
             <VCol
-                lg6
-                md5
-                sm12
+                lg="5"
+                md="12"
                 height="100%"
                 class="img-card"
             >

From 406dfce827538bbe039ef477328373738704088e Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Tue, 10 Sep 2019 21:58:52 +0300
Subject: [PATCH 142/183] add change-password endpoint

---
 .../Actions/User/UpdateUserPasswordAction.php | 36 +++++++++++++++++++
 .../User/UpdateUserPasswordRequest.php        | 36 +++++++++++++++++++
 .../User/UpdateUserPasswordResponse.php       | 14 ++++++++
 .../app/Exceptions/ResetPasswordException.php | 29 +++++++++++++++
 .../Http/Controllers/Api/UserController.php   | 14 +++++++-
 .../Auth/UpdatePasswordHttpRequest.php        | 28 +++++++++++++++
 backend/routes/api.php                        |  1 +
 frontend/src/api/users.js                     |  4 ++-
 .../components/auth/ChangePasswordFrom.vue    | 30 ++++++++--------
 9 files changed, 175 insertions(+), 17 deletions(-)
 create mode 100644 backend/app/Actions/User/UpdateUserPasswordAction.php
 create mode 100644 backend/app/Actions/User/UpdateUserPasswordRequest.php
 create mode 100644 backend/app/Actions/User/UpdateUserPasswordResponse.php
 create mode 100644 backend/app/Exceptions/ResetPasswordException.php
 create mode 100644 backend/app/Http/Requests/Auth/UpdatePasswordHttpRequest.php

diff --git a/backend/app/Actions/User/UpdateUserPasswordAction.php b/backend/app/Actions/User/UpdateUserPasswordAction.php
new file mode 100644
index 00000000..f0fca93f
--- /dev/null
+++ b/backend/app/Actions/User/UpdateUserPasswordAction.php
@@ -0,0 +1,36 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Actions\User;
+
+use App\Exceptions\ResetPasswordException;
+use App\Exceptions\UserNotFoundException;
+use App\Repositories\Contracts\UserRepository;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Support\Facades\Hash;
+
+class UpdateUserPasswordAction
+{
+    private $userRepository;
+
+    public function __construct(UserRepository $userRepository)
+    {
+        $this->userRepository = $userRepository;
+    }
+
+    public function execute(UpdateUserPasswordRequest $request): UpdateUserPasswordResponse
+    {
+        $user = auth()->user();
+        if (!$user) {
+            throw new ResetPasswordException();
+        }
+        try {
+            $user = $this->userRepository->getByEmail($user->email);
+        } catch (ModelNotFoundException $exception) {
+            throw new UserNotFoundException();
+        }
+        $user->password = Hash::make($request->getPassword());
+        $this->userRepository->save($user);
+        return new UpdateUserPasswordResponse();
+    }
+}
diff --git a/backend/app/Actions/User/UpdateUserPasswordRequest.php b/backend/app/Actions/User/UpdateUserPasswordRequest.php
new file mode 100644
index 00000000..14ead631
--- /dev/null
+++ b/backend/app/Actions/User/UpdateUserPasswordRequest.php
@@ -0,0 +1,36 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Actions\User;
+
+use App\Http\Requests\Auth\UpdatePasswordHttpRequest;
+
+final class UpdateUserPasswordRequest
+{
+    private $token;
+    private $password;
+
+    private function __construct(string $token, string $password)
+    {
+        $this->token = $token;
+        $this->password = $password;
+    }
+
+    public static function fromRequest(UpdatePasswordHttpRequest $request): self
+    {
+        return new static(
+            $request->getToken(),
+            $request->getPassword()
+        );
+    }
+
+    public function getToken(): string
+    {
+        return $this->token;
+    }
+
+    public function getPassword(): string
+    {
+        return $this->password;
+    }
+}
diff --git a/backend/app/Actions/User/UpdateUserPasswordResponse.php b/backend/app/Actions/User/UpdateUserPasswordResponse.php
new file mode 100644
index 00000000..facabb81
--- /dev/null
+++ b/backend/app/Actions/User/UpdateUserPasswordResponse.php
@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Actions\User;
+
+class UpdateUserPasswordResponse
+{
+    private $message = "New password was created. Please, sing in.";
+
+    public function message(): string
+    {
+        return $this->message;
+    }
+}
diff --git a/backend/app/Exceptions/ResetPasswordException.php b/backend/app/Exceptions/ResetPasswordException.php
new file mode 100644
index 00000000..7ff7f6d7
--- /dev/null
+++ b/backend/app/Exceptions/ResetPasswordException.php
@@ -0,0 +1,29 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Exceptions;
+
+use App\Contracts\ApiException;
+use Illuminate\Http\Response;
+
+class ResetPasswordException extends \Exception implements ApiException
+{
+    protected $message = "Something wrong happened with password or token!";
+
+    public function __construct($message = "", $code = 0, \Throwable $previous = null)
+    {
+        parent::__construct($this->message, $code, $previous);
+    }
+
+    public function getStatus(): int
+    {
+        return Response::HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'message' => $this->message
+        ];
+    }
+}
diff --git a/backend/app/Http/Controllers/Api/UserController.php b/backend/app/Http/Controllers/Api/UserController.php
index 6be95bc2..ceae3a4b 100644
--- a/backend/app/Http/Controllers/Api/UserController.php
+++ b/backend/app/Http/Controllers/Api/UserController.php
@@ -5,8 +5,12 @@
 namespace App\Http\Controllers\Api;
 
 use App\Actions\User\UpdateUserAction;
+use App\Actions\User\UpdateUserPasswordAction;
+use App\Actions\User\UpdateUserPasswordRequest;
 use App\Actions\User\UpdateUserRequest;
+use App\Http\Requests\Auth\UpdatePasswordHttpRequest;
 use App\Http\Requests\Auth\UpdateUserHttpRequest;
+use App\Http\Resources\MessageResource;
 use App\Http\Resources\UserResource;
 use App\Http\Response\ApiResponse;
 use App\Http\Controllers\Controller;
@@ -14,10 +18,12 @@
 final class UserController extends Controller
 {
     private $updateUserAction;
+    private $updateUserPasswordAction;
 
-    public function __construct(UpdateUserAction $updateUserAction)
+    public function __construct(UpdateUserAction $updateUserAction, UpdateUserPasswordAction $updateUserPasswordAction)
     {
         $this->updateUserAction = $updateUserAction;
+        $this->updateUserPasswordAction = $updateUserPasswordAction;
     }
 
     public function update(UpdateUserHttpRequest $request): ApiResponse
@@ -26,4 +32,10 @@ public function update(UpdateUserHttpRequest $request): ApiResponse
 
         return ApiResponse::success(new UserResource($response->user()));
     }
+
+    public function updatePassword(UpdatePasswordHttpRequest $request):ApiResponse
+    {
+        $response = $this->updateUserPasswordAction->execute(UpdateUserPasswordRequest::fromRequest($request));
+        return  ApiResponse::success(new MessageResource($response));
+    }
 }
diff --git a/backend/app/Http/Requests/Auth/UpdatePasswordHttpRequest.php b/backend/app/Http/Requests/Auth/UpdatePasswordHttpRequest.php
new file mode 100644
index 00000000..78e7d9de
--- /dev/null
+++ b/backend/app/Http/Requests/Auth/UpdatePasswordHttpRequest.php
@@ -0,0 +1,28 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Http\Requests\Auth;
+
+use App\Http\Request\ApiFormRequest;
+
+class UpdatePasswordHttpRequest extends ApiFormRequest
+{
+    public function rules(): array
+    {
+        return [
+            'password' => 'required|string',
+            'token' => 'required|string'
+        ];
+    }
+
+    public function getPassword(): string
+    {
+        return $this->get('password');
+    }
+
+    public function getToken(): string
+    {
+        return $this->get('token');
+    }
+
+}
diff --git a/backend/routes/api.php b/backend/routes/api.php
index 9547a985..5c7ca3a1 100644
--- a/backend/routes/api.php
+++ b/backend/routes/api.php
@@ -27,6 +27,7 @@
             'prefix' => 'users'
         ], function () {
             Route::put('/me', 'UserController@update');
+            Route::put('/update-password','UserController@updatePassword');
         });
 
         Route::group([
diff --git a/frontend/src/api/users.js b/frontend/src/api/users.js
index 9035b618..73846edb 100644
--- a/frontend/src/api/users.js
+++ b/frontend/src/api/users.js
@@ -4,7 +4,9 @@ import config from "@/config";
 const resourceUrl = config.getApiUrl() + '/users';
 
 const updateUser = params => requestService.update(resourceUrl + '/me', params);
+const updatePassword = params => requestService.update(resourceUrl + '/update-password', params);
 
 export {
-    updateUser
+    updateUser,
+    updatePassword
 };
diff --git a/frontend/src/components/auth/ChangePasswordFrom.vue b/frontend/src/components/auth/ChangePasswordFrom.vue
index 92936e5a..13c7c944 100644
--- a/frontend/src/components/auth/ChangePasswordFrom.vue
+++ b/frontend/src/components/auth/ChangePasswordFrom.vue
@@ -21,7 +21,7 @@
                     solo
                     name="password"
                     autocomplete="new-password"
-                    v-model="newUser.password"
+                    v-model="password"
                     :append-icon="show1 ? 'visibility' : 'visibility_off'"
                     :rules="passwordRules"
                     :type="show1 ? 'text' : 'password'"
@@ -37,7 +37,7 @@
                     solo
                     name="confirmPassword"
                     autocomplete="new-password"
-                    v-model="newUser.confirmPassword"
+                    v-model="confirmPassword"
                     :append-icon="show2 ? 'visibility' : 'visibility_off'"
                     :rules="confirmPasswordRules"
                     :type="show2 ? 'text' : 'password'"
@@ -49,6 +49,7 @@
                         min-width="140px"
                         color="primary"
                         :disabled="!valid"
+                        @click="changePassword"
                     >
                         CHANGE PASSWORD
                     </VBtn>
@@ -58,7 +59,6 @@
                     >
                         Sign in
                     </RouterLink>
-                    {{ tok }}
                 </div>
             </div>
         </VForm>
@@ -70,6 +70,7 @@
     import {validatePassword} from '@/services/validation';
     import { SHOW_SUCCESS_MESSAGE, SHOW_ERROR_MESSAGE } from "@/store/modules/notification/types/actions";
     import jwtService from "@/services/jwtService";
+    import {updatePassword} from "../../api/users";
 
     export default {
         name: "ChangePasswordForm",
@@ -77,11 +78,8 @@
             return {
                 show1: false,
                 show2: false,
-                newUser: {
-                    password: '',
-                    confirmPassword: '',
-                },
-                tok:'',
+                password: '',
+                confirmPassword: '',
                 valid: false,
                 passwordRules: [
                     v => !!v || 'Password is required',
@@ -89,7 +87,7 @@
                 ],
                 confirmPasswordRules: [
                     v => !!v || 'Password is required',
-                    v => v === this.newUser.password || 'Password should match'
+                    v => v === this.password || 'Password should match'
                 ]
             };
         },
@@ -97,19 +95,21 @@
             if (jwtService.checkExpireToken(this.$route.query.token)) {
                 this.showErrorMessage('Sorry, your token was expired. Please, enter your email again.');
                 this.$router.push({name: 'reset-password'});
-            }else {
-                const jwt = jwtService.parse(this.$route.query.token);
-                this.tok = jwt;
             }
         },
         methods: {
-            ...mapActions('auth', {
-
-            }),
             ...mapActions('notification', {
                 showSuccessMessage: SHOW_SUCCESS_MESSAGE,
                 showErrorMessage: SHOW_ERROR_MESSAGE
             }),
+            changePassword(){
+                updatePassword(
+                    {
+                        token: this.$route.query.token,
+                        password: this.password
+                    }
+                );
+            }
         },
     };
 </script>

From 5d0a6bc983f0b7c4b0b9fb39f14bde7292246a4e Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Tue, 10 Sep 2019 22:06:11 +0300
Subject: [PATCH 143/183] fix style code

---
 .../app/Http/Requests/Auth/UpdatePasswordHttpRequest.php | 1 -
 backend/routes/api.php                                   | 3 +--
 frontend/src/components/auth/ChangePasswordFrom.vue      | 9 ++++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/backend/app/Http/Requests/Auth/UpdatePasswordHttpRequest.php b/backend/app/Http/Requests/Auth/UpdatePasswordHttpRequest.php
index 78e7d9de..9fb4a996 100644
--- a/backend/app/Http/Requests/Auth/UpdatePasswordHttpRequest.php
+++ b/backend/app/Http/Requests/Auth/UpdatePasswordHttpRequest.php
@@ -24,5 +24,4 @@ public function getToken(): string
     {
         return $this->get('token');
     }
-
 }
diff --git a/backend/routes/api.php b/backend/routes/api.php
index 5c7ca3a1..c1b9a321 100644
--- a/backend/routes/api.php
+++ b/backend/routes/api.php
@@ -27,7 +27,7 @@
             'prefix' => 'users'
         ], function () {
             Route::put('/me', 'UserController@update');
-            Route::put('/update-password','UserController@updatePassword');
+            Route::put('/update-password', 'UserController@updatePassword');
         });
 
         Route::group([
@@ -145,7 +145,6 @@
         });
 
 
-
         Route::get('/button-visitors', 'VisitorController@getVisitorsCount');
 
         Route::get('/geo-location-items', 'GeoLocationController');
diff --git a/frontend/src/components/auth/ChangePasswordFrom.vue b/frontend/src/components/auth/ChangePasswordFrom.vue
index 13c7c944..70148222 100644
--- a/frontend/src/components/auth/ChangePasswordFrom.vue
+++ b/frontend/src/components/auth/ChangePasswordFrom.vue
@@ -71,6 +71,7 @@
     import { SHOW_SUCCESS_MESSAGE, SHOW_ERROR_MESSAGE } from "@/store/modules/notification/types/actions";
     import jwtService from "@/services/jwtService";
     import {updatePassword} from "../../api/users";
+    import _ from 'lodash';
 
     export default {
         name: "ChangePasswordForm",
@@ -108,7 +109,13 @@
                         token: this.$route.query.token,
                         password: this.password
                     }
-                );
+                ).then((response) => {
+                    this.showSuccessMessage(response.data.message);
+                    this.$router.push({name: 'login'});
+                }).catch(error => {
+                    this.showErrorMessage(_.get(error, 'response.data.error.message'));
+                    this.$router.push({name: 'login'});
+                });
             }
         },
     };

From 3b84d56ab9a78ac3ec14993cc149e15f62f08af5 Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Tue, 10 Sep 2019 21:54:22 +0300
Subject: [PATCH 144/183] add visitors flow module

---
 frontend/src/store/index.js                   |  4 ++-
 .../store/modules/visitors_flow/actions.js    | 25 +++++++++++++++++++
 .../store/modules/visitors_flow/getters.js    | 13 ++++++++++
 .../src/store/modules/visitors_flow/index.js  | 12 +++++++++
 .../store/modules/visitors_flow/mutations.js  | 25 +++++++++++++++++++
 .../src/store/modules/visitors_flow/state.js  |  8 ++++++
 .../modules/visitors_flow/types/actions.js    |  2 ++
 .../modules/visitors_flow/types/getters.js    |  4 +++
 .../modules/visitors_flow/types/mutations.js  |  5 ++++
 9 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/store/modules/visitors_flow/actions.js
 create mode 100644 frontend/src/store/modules/visitors_flow/getters.js
 create mode 100644 frontend/src/store/modules/visitors_flow/index.js
 create mode 100644 frontend/src/store/modules/visitors_flow/mutations.js
 create mode 100644 frontend/src/store/modules/visitors_flow/state.js
 create mode 100644 frontend/src/store/modules/visitors_flow/types/actions.js
 create mode 100644 frontend/src/store/modules/visitors_flow/types/getters.js
 create mode 100644 frontend/src/store/modules/visitors_flow/types/mutations.js

diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index f4813369..e98d25d1 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -12,6 +12,7 @@ import geo_location from './modules/geo_location';
 import devices from './modules/devices';
 import error_report from './modules/error_report';
 import visits_density_widget from './modules/visits_density_widget';
+import visitors_flow from './modules/visitors_flow';
 
 Vue.use(Vuex);
 
@@ -27,7 +28,8 @@ export default new Vuex.Store({
         geo_location,
         devices,
         visits_density_widget,
-        error_report
+        error_report,
+        visitors_flow
     },
     plugins: [authPlugin]
 });
diff --git a/frontend/src/store/modules/visitors_flow/actions.js b/frontend/src/store/modules/visitors_flow/actions.js
new file mode 100644
index 00000000..0f48e365
--- /dev/null
+++ b/frontend/src/store/modules/visitors_flow/actions.js
@@ -0,0 +1,25 @@
+import {
+    CHANGE_SELECTED_PARAMETER,
+    FETCH_VISITORS_FLOW
+} from "./types/actions";
+import {
+    SET_SELECTED_PARAMETER,
+    SET_VISITORS_FLOW,
+    SET_IS_FETCHING,
+    RESET_IS_FETCHING
+} from "./types/mutations";
+import { getVisitorsFlow } from '@/api/visitors_flow/visitorsFlowService';
+
+export default {
+    [CHANGE_SELECTED_PARAMETER]: (context, parameter) => {
+        context.commit(SET_SELECTED_PARAMETER, parameter);
+        context.dispatch(FETCH_VISITORS_FLOW);
+    },
+    [FETCH_VISITORS_FLOW]: context => {
+        context.commit(SET_IS_FETCHING);
+
+        return getVisitorsFlow(context.state.selectedParameter, context.state.currentLevel)
+            .then(visitorsFlow => context.commit(SET_VISITORS_FLOW, visitorsFlow))
+            .finally(() => context.commit(RESET_IS_FETCHING));
+    }
+};
diff --git a/frontend/src/store/modules/visitors_flow/getters.js b/frontend/src/store/modules/visitors_flow/getters.js
new file mode 100644
index 00000000..af9b69d7
--- /dev/null
+++ b/frontend/src/store/modules/visitors_flow/getters.js
@@ -0,0 +1,13 @@
+import {
+    GET_SELECTED_PARAMETER,
+    GET_CURRENT_LEVEL,
+    GET_VISITORS_FLOW,
+    IS_FETCHING
+} from "./types/getters";
+
+export default {
+    [GET_SELECTED_PARAMETER]: state => state.selectedParameter,
+    [GET_CURRENT_LEVEL]: state => state.currentLevel,
+    [GET_VISITORS_FLOW]: state => state.visitorsFlow.items,
+    [IS_FETCHING]: state => state.visitorsFlow.isFetching
+};
diff --git a/frontend/src/store/modules/visitors_flow/index.js b/frontend/src/store/modules/visitors_flow/index.js
new file mode 100644
index 00000000..a8a9d106
--- /dev/null
+++ b/frontend/src/store/modules/visitors_flow/index.js
@@ -0,0 +1,12 @@
+import state from './state';
+import getters from './getters';
+import actions from './actions';
+import mutations from './mutations';
+
+export default {
+    namespaced: true,
+    state,
+    getters,
+    actions,
+    mutations
+};
diff --git a/frontend/src/store/modules/visitors_flow/mutations.js b/frontend/src/store/modules/visitors_flow/mutations.js
new file mode 100644
index 00000000..afe49819
--- /dev/null
+++ b/frontend/src/store/modules/visitors_flow/mutations.js
@@ -0,0 +1,25 @@
+import {
+    SET_SELECTED_PARAMETER,
+    SET_CURRENT_LEVEL,
+    SET_VISITORS_FLOW,
+    SET_IS_FETCHING,
+    RESET_IS_FETCHING
+} from "./types/mutations";
+
+export default {
+    [SET_SELECTED_PARAMETER]: (state, parameter) => {
+        state.selectedParameter = parameter;
+    },
+    [SET_CURRENT_LEVEL]: (state, level) => {
+        state.currentLevel = level;
+    },
+    [SET_VISITORS_FLOW]: (state, visitorsFlow) => {
+        state.visitorsFlow.items = visitorsFlow;
+    },
+    [SET_IS_FETCHING]: (state) => {
+        state.visitorsFlow.isFetching = true;
+    },
+    [RESET_IS_FETCHING]: (state) => {
+        state.visitorsFlow.isFetching = false;
+    }
+};
diff --git a/frontend/src/store/modules/visitors_flow/state.js b/frontend/src/store/modules/visitors_flow/state.js
new file mode 100644
index 00000000..0863f621
--- /dev/null
+++ b/frontend/src/store/modules/visitors_flow/state.js
@@ -0,0 +1,8 @@
+export default {
+    selectedParameter: 'country',
+    currentLevel: 0,
+    visitorsFlow: {
+        items: [],
+        isFetching: true
+    }
+};
diff --git a/frontend/src/store/modules/visitors_flow/types/actions.js b/frontend/src/store/modules/visitors_flow/types/actions.js
new file mode 100644
index 00000000..67c04eda
--- /dev/null
+++ b/frontend/src/store/modules/visitors_flow/types/actions.js
@@ -0,0 +1,2 @@
+export const CHANGE_SELECTED_PARAMETER = 'changeSelectedParameter';
+export const FETCH_VISITORS_FLOW = 'fetchVisitorsFlow';
diff --git a/frontend/src/store/modules/visitors_flow/types/getters.js b/frontend/src/store/modules/visitors_flow/types/getters.js
new file mode 100644
index 00000000..7526b515
--- /dev/null
+++ b/frontend/src/store/modules/visitors_flow/types/getters.js
@@ -0,0 +1,4 @@
+export const GET_SELECTED_PARAMETER = 'getSelectedParameter';
+export const GET_CURRENT_LEVEL = 'getCurrentLevel';
+export const GET_VISITORS_FLOW = 'getVisitorsFlow';
+export const IS_FETCHING = 'isFetching';
diff --git a/frontend/src/store/modules/visitors_flow/types/mutations.js b/frontend/src/store/modules/visitors_flow/types/mutations.js
new file mode 100644
index 00000000..51002dd7
--- /dev/null
+++ b/frontend/src/store/modules/visitors_flow/types/mutations.js
@@ -0,0 +1,5 @@
+export const SET_SELECTED_PARAMETER = 'setSelectedParameter';
+export const SET_CURRENT_LEVEL = 'setCurrentLevel';
+export const SET_VISITORS_FLOW = 'setVisitorsFlow';
+export const SET_IS_FETCHING = 'setIsFetching';
+export const RESET_IS_FETCHING = 'resetIsFetching';

From f31cee747329373e492557704ec48ead1acad45f Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Tue, 10 Sep 2019 22:20:59 +0300
Subject: [PATCH 145/183] add api service

---
 .../api/visitors_flow/visitorsFlowService.js  | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 frontend/src/api/visitors_flow/visitorsFlowService.js

diff --git a/frontend/src/api/visitors_flow/visitorsFlowService.js b/frontend/src/api/visitors_flow/visitorsFlowService.js
new file mode 100644
index 00000000..7b1bcd8a
--- /dev/null
+++ b/frontend/src/api/visitors_flow/visitorsFlowService.js
@@ -0,0 +1,24 @@
+import requestService from "@/services/requestService";
+import config from "@/config";
+import _ from "lodash";
+
+const resourceUrl = config.getApiUrl() + '/visitors-flow';
+
+const getVisitorsFlow = (filter, parameter) => requestService.get(resourceUrl, {}, {
+    'filter': filter,
+    'parameter': parameter
+})
+    .then(response => response.data)
+    .catch(error => Promise.reject(
+        new Error(
+            _.get(
+                error,
+                'response.data.error.message',
+                'Something went wrong with getting visitors flow data'
+            )
+        )
+    ));
+
+export {
+    getVisitorsFlow
+};
\ No newline at end of file

From 261c22f7e6622ba3cc406f44218b5da8b4e2ba1d Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Tue, 10 Sep 2019 23:03:22 +0300
Subject: [PATCH 146/183] add showing successful message on recovery password
 page

---
 frontend/src/components/auth/ResetPasswordForm.vue | 2 +-
 frontend/src/store/modules/auth/actions.js         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/auth/ResetPasswordForm.vue b/frontend/src/components/auth/ResetPasswordForm.vue
index 926d4648..0f8ff340 100644
--- a/frontend/src/components/auth/ResetPasswordForm.vue
+++ b/frontend/src/components/auth/ResetPasswordForm.vue
@@ -44,7 +44,7 @@
                     class="success-response"
                     type="success"
                 >
-                    {{ successMsg }}
+                    <span v-html="successMsg" />
                 </VAlert>
             </VContainer>
         </VFlex>
diff --git a/frontend/src/store/modules/auth/actions.js b/frontend/src/store/modules/auth/actions.js
index 560a5574..cf445934 100644
--- a/frontend/src/store/modules/auth/actions.js
+++ b/frontend/src/store/modules/auth/actions.js
@@ -64,7 +64,8 @@ export default {
 
     [RESET_PASSWORD]: (context, payload) => {
         return resetPassword(payload).then(() => {
-                return `Your reset password link was created. Check your email ${payload.email}, please.`;
+                return ` Check your inbox. We just sent a link to reset your password via email to ${payload.email}.
+                Back to <a href="/login">sign in</a> `;
             }
         ).catch((error) => {
             switch (error.response.status) {

From cb4f9ed26325d7ea649e3eadd96a94f2ab4392d8 Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Tue, 10 Sep 2019 23:04:19 +0300
Subject: [PATCH 147/183] add type casting

---
 .../Http/Requests/VisitorsFlow/GetVisitorsFlowHttpRequest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/app/Http/Requests/VisitorsFlow/GetVisitorsFlowHttpRequest.php b/backend/app/Http/Requests/VisitorsFlow/GetVisitorsFlowHttpRequest.php
index 47d73e19..24475c8d 100644
--- a/backend/app/Http/Requests/VisitorsFlow/GetVisitorsFlowHttpRequest.php
+++ b/backend/app/Http/Requests/VisitorsFlow/GetVisitorsFlowHttpRequest.php
@@ -22,6 +22,6 @@ public function getParameter(): string
 
     public function getLevel(): int
     {
-        return $this->get('level');
+        return (int) $this->get('level');
     }
 }

From 72beb35a322c397ed0fa83b4a0dd10b602f92ae0 Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Wed, 11 Sep 2019 00:03:02 +0300
Subject: [PATCH 148/183] commit

---
 .../api/visitors_flow/visitorsFlowService.js  |  4 +-
 .../visitors_flow/VisitorsFlowDiagram.vue     |  6 +++
 .../visitors_flow/VisitorsFlowDropdown.vue    |  8 +--
 frontend/src/pages/VisitorsFlow.vue           | 54 +++++++++++++++++--
 4 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/frontend/src/api/visitors_flow/visitorsFlowService.js b/frontend/src/api/visitors_flow/visitorsFlowService.js
index 7b1bcd8a..8a60b6c3 100644
--- a/frontend/src/api/visitors_flow/visitorsFlowService.js
+++ b/frontend/src/api/visitors_flow/visitorsFlowService.js
@@ -4,9 +4,9 @@ import _ from "lodash";
 
 const resourceUrl = config.getApiUrl() + '/visitors-flow';
 
-const getVisitorsFlow = (filter, parameter) => requestService.get(resourceUrl, {}, {
+const getVisitorsFlow = (filter, level) => requestService.get(resourceUrl, {}, {
     'filter': filter,
-    'parameter': parameter
+    'level': level
 })
     .then(response => response.data)
     .catch(error => Promise.reject(
diff --git a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
index c555c736..7c35985f 100644
--- a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
+++ b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
@@ -26,6 +26,12 @@
 
     export default {
         name: "VisitorsFlowDiagram",
+        props: {
+            visitorsFlowData: {
+                type: Array,
+                required: true
+            }
+        },
         data () {
             return {
                 titles: [
diff --git a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDropdown.vue b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDropdown.vue
index bef2e76c..3e6d273a 100644
--- a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDropdown.vue
+++ b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDropdown.vue
@@ -23,10 +23,10 @@
         data () {
             return {
                 items: [
-                    {title: 'Country', value: 'Country'},
-                    {title: 'Browser', value: 'Browser'},
-                    {title: 'Device', value: 'Device'},
-                    {title: 'Screen', value: 'Screen'}
+                    {title: 'Country', value: 'country'},
+                    {title: 'Browser', value: 'browser'},
+                    {title: 'Device', value: 'device'},
+                    {title: 'Screen', value: 'screen'}
                 ]
             };
         },
diff --git a/frontend/src/pages/VisitorsFlow.vue b/frontend/src/pages/VisitorsFlow.vue
index 15eb64f5..43f1fde8 100644
--- a/frontend/src/pages/VisitorsFlow.vue
+++ b/frontend/src/pages/VisitorsFlow.vue
@@ -1,21 +1,65 @@
 <template>
-    <div>
+    <ContentLayout
+        :title="title"
+    >
+        <Spinner
+            v-if="isFetching"
+        />
         <VisitorsFlowDropdown
-            value="Country"
+            :value="getSelectedParameter"
+        />
+        <VisitorsFlowDiagram
+            :visitors-flow-data="getVisitorsFlow"
         />
-        <VisitorsFlowDiagram />
-    </div>
+    </ContentLayout>
 </template>
 
 <script>
+    import ContentLayout from '@/components/layout/ContentLayout.vue';
     import VisitorsFlowDiagram from "@/components/dashboard/visitors_flow/VisitorsFlowDiagram";
     import VisitorsFlowDropdown from "@/components/dashboard/visitors_flow/VisitorsFlowDropdown";
+    import Spinner from "@/components/utilites/Spinner";
+    import { mapGetters, mapActions } from 'vuex';
+    import {
+        GET_SELECTED_PARAMETER,
+        GET_CURRENT_LEVEL,
+        GET_VISITORS_FLOW,
+        IS_FETCHING
+    } from "@/store/modules/visitors_flow/types/getters";
+    import {
+        CHANGE_SELECTED_PARAMETER,
+        FETCH_VISITORS_FLOW
+    } from "@/store/modules/visitors_flow/types/actions";
 
     export default {
         name: "VisitorsFlow",
         components: {
+            ContentLayout,
             VisitorsFlowDiagram,
-            VisitorsFlowDropdown
+            VisitorsFlowDropdown,
+            Spinner
+        },
+        data () {
+            return {
+                title: "Visitors Flow"
+            };
+        },
+        computed: {
+            ...mapGetters('visitors_flow', {
+                getSelectedParameter: GET_SELECTED_PARAMETER,
+                getCurrentLevel: GET_CURRENT_LEVEL,
+                getVisitorsFlow: GET_VISITORS_FLOW,
+                isFetching: IS_FETCHING
+            })
+        },
+        created() {
+            this.fetchVisitorsFlow();
+        },
+        methods: {
+            ...mapActions('visitors_flow', {
+                changeSelectedParameter: CHANGE_SELECTED_PARAMETER,
+                fetchVisitorsFlow: FETCH_VISITORS_FLOW
+            }),
         }
     };
 </script>

From d9631ea38fed1b1cf5c12dc5770060c11fcc9122 Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Wed, 11 Sep 2019 00:41:07 +0300
Subject: [PATCH 149/183] link front with back

---
 frontend/scripts/metrica.js                   |  2 +-
 .../src/api/error_report/errorsService.js     | 45 +++++++++++++++++++
 frontend/src/api/error_report/transformer.js  | 13 ++++++
 frontend/src/api/transformers.js              | 12 +++++
 .../dashboard/errors/ErrorsDetailsModal.vue   | 17 ++++---
 .../dashboard/errors/ErrorsTable.vue          | 19 +-------
 .../src/pages/speed_overview/ErrorReports.vue | 44 ++----------------
 .../src/store/modules/error_report/actions.js | 34 ++++++--------
 .../src/store/modules/error_report/getters.js |  4 --
 .../modules/error_report/types/getters.js     |  2 -
 10 files changed, 101 insertions(+), 91 deletions(-)
 create mode 100644 frontend/src/api/error_report/errorsService.js
 create mode 100644 frontend/src/api/error_report/transformer.js

diff --git a/frontend/scripts/metrica.js b/frontend/scripts/metrica.js
index 2fc148dc..f0d435f7 100644
--- a/frontend/scripts/metrica.js
+++ b/frontend/scripts/metrica.js
@@ -19,7 +19,7 @@
             'x-website': tracking_number,
         };
         let data = {
-            message: error.message,
+            message: message,
             stack_trace: error.stack,
             page: window._metricaTracking.getPage(),
             page_title: window._metricaTracking.getTitle(),
diff --git a/frontend/src/api/error_report/errorsService.js b/frontend/src/api/error_report/errorsService.js
new file mode 100644
index 00000000..fb153ac7
--- /dev/null
+++ b/frontend/src/api/error_report/errorsService.js
@@ -0,0 +1,45 @@
+import requestService from "@/services/requestService";
+import config from "@/config";
+import _ from "lodash";
+import {chartTransformer, tableTransformerErrors} from "../transformers";
+
+const resourceUrl = config.getApiUrl() + '/errors';
+
+const getErrorTableItems = (startDate, endDate, parameter) => {
+    return requestService.get(resourceUrl + '/table-items', {}, {
+        'filter[startDate]': startDate,
+        'filter[endDate]': endDate,
+        'filter[parameter]': parameter
+    }).then(response => response.data.map(tableTransformerErrors))
+        .catch(error => Promise.reject(
+            new Error(
+                _.get(
+                    error,
+                    'response.data.error.message',
+                    'Something went wrong with getting errors table data'
+                )
+            )
+        ));
+};
+
+const getChartValues = (startDate, endDate, interval) => {
+    return requestService.get(resourceUrl + '/count', {}, {
+        'filter[startDate]': startDate,
+        'filter[endDate]': endDate,
+        'filter[period]': interval
+    }).then(response => response.data.map(chartTransformer))
+        .catch(error => Promise.reject(
+            new Error(
+                _.get(
+                    error,
+                    'response.data.error.message',
+                    'Something went wrong with getting errors chart data'
+                )
+            )
+        ));
+};
+
+export {
+    getErrorTableItems,
+    getChartValues
+};
\ No newline at end of file
diff --git a/frontend/src/api/error_report/transformer.js b/frontend/src/api/error_report/transformer.js
new file mode 100644
index 00000000..c7dc7d84
--- /dev/null
+++ b/frontend/src/api/error_report/transformer.js
@@ -0,0 +1,13 @@
+const tableTransformerErrors = (item) => {
+    return {
+        'parameter': item.parameter,
+        'parameter_value': item.parameter_value,
+        'total': item.total,
+        'message': item.message,
+        'stack_trace': item.stack_trace,
+    };
+};
+
+export {
+    tableTransformer,
+};
\ No newline at end of file
diff --git a/frontend/src/api/transformers.js b/frontend/src/api/transformers.js
index d33b6452..97961c56 100644
--- a/frontend/src/api/transformers.js
+++ b/frontend/src/api/transformers.js
@@ -69,6 +69,17 @@ const tableTransformerPageTiming = (item) => {
         'value': item.average_time / 1000
     };
 };
+
+const tableTransformerErrors = (item) => {
+    return {
+        'parameter': item.parameter,
+        'parameter_value': item.parameter_value,
+        'count': item.count,
+        'message': item.message,
+        'stack_trace': item.stack_trace,
+    };
+};
+
 export {
     buttonTransformer,
     buttonTransformerToPercent,
@@ -81,4 +92,5 @@ export {
     tableTransformer,
     tableTransformerPageTiming,
     tableTransformerPageViews,
+    tableTransformerErrors
 };
\ No newline at end of file
diff --git a/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue b/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue
index 49857baa..b950dceb 100644
--- a/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue
+++ b/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue
@@ -3,10 +3,13 @@
         <VDialog
             persistent
             v-model="dialog"
-            max-width="400"
+            max-width="500"
         >
             <VCard>
-                <VCardTitle>Error on page {{ errorItem.page }}</VCardTitle>
+                <VCardTitle>
+                    Error on page
+                    <span class="page-url">{{ errorItem.parameter_value }}</span>
+                </VCardTitle>
                 <VCardText>
                     <div class="mb-2">
                         Message
@@ -73,11 +76,6 @@
                 required: true
             }
         },
-        data () {
-            return {
-                toggleMore: false
-            };
-        },
         methods: {
             changeSelect () {
                 this.$emit('change', this.selected);
@@ -90,6 +88,11 @@
 </script>
 
 <style scoped lang="scss">
+    .page-url {
+        color: #3c57de;
+        font-size: 18px;
+        padding-left: 20px;
+    }
     .message-block {
         border-radius: 6px;
         padding: 10px;
diff --git a/frontend/src/components/dashboard/errors/ErrorsTable.vue b/frontend/src/components/dashboard/errors/ErrorsTable.vue
index d4bd5171..b0d019ba 100644
--- a/frontend/src/components/dashboard/errors/ErrorsTable.vue
+++ b/frontend/src/components/dashboard/errors/ErrorsTable.vue
@@ -14,7 +14,7 @@
                 Message
             </VCol>
             <VCol>
-                Page views
+                Count
             </VCol>
             <VCol>
                 Details
@@ -52,25 +52,10 @@
         },
         data () {
             return {
-                selected: 'page',
-                options: [
-                    {
-                        text: 'Page',
-                        value: 'page'
-                    },
-                    {
-                        text: 'Browser',
-                        value: 'browser'
-                    },
-                    {
-                        text: 'Country',
-                        value: 'country'
-                    },
-                ],
                 headers: [
                     { text: '', align: 'center', value: 'parameter_value' },
                     { text: '', align: 'center', value: 'message' },
-                    { text: '', align: 'center', value: 'page_views' },
+                    { text: '', align: 'center', value: 'count' },
                     { text: '', align: 'center', value: 'details' },
                 ],
             };
diff --git a/frontend/src/pages/speed_overview/ErrorReports.vue b/frontend/src/pages/speed_overview/ErrorReports.vue
index 8b7a31ca..39b68425 100644
--- a/frontend/src/pages/speed_overview/ErrorReports.vue
+++ b/frontend/src/pages/speed_overview/ErrorReports.vue
@@ -1,6 +1,6 @@
 <template>
     <ContentLayout :title="title">
-        <VRow>
+        <VRow class="mb-5">
             <VContainer class="white card px-7 py-6">
                 <LineChart
                     :data="formatLineChartData"
@@ -40,7 +40,8 @@
     import {
         GET_SELECTED_PERIOD,
         GET_LINE_CHART_DATA,
-        GET_FORMAT_LINE_CHART_DATA
+        GET_FORMAT_LINE_CHART_DATA,
+        GET_TABLE_DATA
     } from "@/store/modules/error_report/types/getters";
     import {
         CHANGE_SELECTED_PERIOD,
@@ -56,7 +57,6 @@
             Spinner,
             LineChart,
             PeriodDropdown
-
         },
         mixins: [isWebsite],
         data() {
@@ -66,49 +66,13 @@
                     message: 'message'
                 },
                 title: "Error Reports",
-                tableData: {
-                    isFetching: false,
-                    items: [
-                        {
-                            parameter_value: '/contacts',
-                            message: 'SyntaxError',
-                            stack_trasce: 'at Object.device.tablet (metrica.js?tracking_id=00000186:317)\n' +
-                                'at Object.device.desktop (metrica.js?tracking_id=00000186:325)\n' +
-                                'at Object.getDevice (metrica.js?tracking_id=00000186:130)',
-                            page_views: 45
-                        },
-                        {
-                            parameter_value: '/home',
-                            message: 'ReferenceError',
-                            stack_trace: 'at Object.device.tablet (metrica.js?tracking_id=00000186:317)\n' +
-                                'at Object.device.desktop (metrica.js?tracking_id=00000186:325)\n' +
-                                'at Object.getDevice (metrica.js?tracking_id=00000186:130)',
-                            page_views: 34
-                        },
-                        {
-                            parameter_value: '/products',
-                            message: 'TypeError',
-                            stack_trace: 'at Object.device.tablet (metrica.js?tracking_id=00000186:317)\n' +
-                                'at Object.device.desktop (metrica.js?tracking_id=00000186:325)\n' +
-                                'at Object.getDevice (metrica.js?tracking_id=00000186:130)',
-                            page_views: 12
-                        },
-                        {
-                            parameter_value: '/user',
-                            message: 'InternalError',
-                            stack_trace: 'at Object.device.tablet (metrica.js?tracking_id=00000186:317)\n' +
-                                'at Object.device.desktop (metrica.js?tracking_id=00000186:325)\n' +
-                                'at Object.getDevice (metrica.js?tracking_id=00000186:130)',
-                            page_views: 3
-                        }
-                    ]
-                }
             };
         },
         computed: {
             ...mapGetters('error_report', {
                 getSelectedPeriod: GET_SELECTED_PERIOD,
                 chartData: GET_LINE_CHART_DATA,
+                tableData: GET_TABLE_DATA,
                 formatLineChartData:GET_FORMAT_LINE_CHART_DATA,
             }),
         },
diff --git a/frontend/src/store/modules/error_report/actions.js b/frontend/src/store/modules/error_report/actions.js
index 3625d0b1..5bbdc587 100644
--- a/frontend/src/store/modules/error_report/actions.js
+++ b/frontend/src/store/modules/error_report/actions.js
@@ -12,7 +12,10 @@ import {
     SET_CHART_FETCHING,
     RESET_TABLE_FETCHING,
     SET_TABLE_FETCHING,
+    SET_TABLE_DATA,
 } from "./types/mutations";
+import {getErrorTableItems, getChartValues} from '@/api/error_report/errorsService';
+import {getTimeByPeriod} from '@/services/periodService';
 
 export default {
     [CHANGE_SELECTED_PERIOD]: (context, payload) => {
@@ -27,29 +30,20 @@ export default {
     [FETCH_CHART_DATA]: (context) => {
         context.commit(SET_CHART_FETCHING);
 
-        const items = [
-            {
-                date:'1565700000',
-                value:2,
-            },
-            {
-                date:'1565820000',
-                value:2,
-            },
-        ];
-        new Promise((resolve) => {
+        const period = getTimeByPeriod(context.state.selectedPeriod);
 
-            resolve(items);
-
-        }).then(response => {
-
-            context.commit(SET_CHART_VALUES, response);
-            context.commit(RESET_CHART_FETCHING);
-
-        }).finally(() => context.commit(RESET_CHART_FETCHING));
+        return getChartValues(period.startDate.unix(), period.endDate.unix(), period.interval)
+            .then(data => context.commit(SET_CHART_VALUES, data))
+            .finally(() => context.commit(RESET_CHART_FETCHING));
     },
     [FETCH_TABLE_DATA]: (context) => {
         context.commit(SET_TABLE_FETCHING);
-        context.commit(RESET_TABLE_FETCHING);
+
+        const period = getTimeByPeriod(context.state.selectedPeriod);
+        const parameter = 'page';
+
+        return getErrorTableItems(period.startDate.unix(), period.endDate.unix(), parameter)
+            .then(getErrorTableItems => context.commit(SET_TABLE_DATA, getErrorTableItems))
+            .finally(() => context.commit(RESET_TABLE_FETCHING));
     },
 };
diff --git a/frontend/src/store/modules/error_report/getters.js b/frontend/src/store/modules/error_report/getters.js
index 99e33aeb..d9972a47 100644
--- a/frontend/src/store/modules/error_report/getters.js
+++ b/frontend/src/store/modules/error_report/getters.js
@@ -3,8 +3,6 @@ import {
     GET_LINE_CHART_DATA,
     GET_FORMAT_LINE_CHART_DATA,
     GET_TABLE_DATA,
-    GET_TABLE_DATA_FETCHING,
-    GET_LINE_CHART_FETCHING,
 } from "./types/getters";
 
 import { chartDataTransformer } from "@/api/widgets/transformers";
@@ -16,6 +14,4 @@ export default {
         return chartDataTransformer(state.chartData.items, state.selectedPeriod);
     },
     [GET_TABLE_DATA]: (state) => state.tableData,
-    [GET_TABLE_DATA_FETCHING]: (state) => state.tableData.isFetching,
-    [GET_LINE_CHART_FETCHING]: (state) => state.chartData.isFetching,
 };
diff --git a/frontend/src/store/modules/error_report/types/getters.js b/frontend/src/store/modules/error_report/types/getters.js
index c1efdc69..0b602b8c 100644
--- a/frontend/src/store/modules/error_report/types/getters.js
+++ b/frontend/src/store/modules/error_report/types/getters.js
@@ -2,5 +2,3 @@ export const GET_SELECTED_PERIOD = 'getSelectedPeriod';
 export const GET_LINE_CHART_DATA = 'getLineChartData';
 export const GET_FORMAT_LINE_CHART_DATA = 'getFormatLineChartData';
 export const GET_TABLE_DATA = 'getTableData';
-export const GET_TABLE_DATA_FETCHING = 'getTableDataFetching';
-export const GET_LINE_CHART_FETCHING = 'getLineChartFetching';

From 46fe93621917f2589ddb0d5af992cdaa183d798c Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Wed, 11 Sep 2019 00:44:51 +0300
Subject: [PATCH 150/183] delete unusable transformer

---
 frontend/src/api/error_report/transformer.js | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 frontend/src/api/error_report/transformer.js

diff --git a/frontend/src/api/error_report/transformer.js b/frontend/src/api/error_report/transformer.js
deleted file mode 100644
index c7dc7d84..00000000
--- a/frontend/src/api/error_report/transformer.js
+++ /dev/null
@@ -1,13 +0,0 @@
-const tableTransformerErrors = (item) => {
-    return {
-        'parameter': item.parameter,
-        'parameter_value': item.parameter_value,
-        'total': item.total,
-        'message': item.message,
-        'stack_trace': item.stack_trace,
-    };
-};
-
-export {
-    tableTransformer,
-};
\ No newline at end of file

From 5d48a6016ae7f0850c16c3b234df58f51a9f297f Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Wed, 11 Sep 2019 06:38:21 +0300
Subject: [PATCH 151/183] add realtime update of chart, decrement previous
 visited page

---
 .../EloquentVisitorRepository.php             |  3 +-
 backend/tests/Feature/ActivityVisitorTest.php |  2 +-
 .../dashboard/home/ActiveVisitorsCard.vue     | 65 ++++++++++++++-----
 .../dashboard/home/VisitsDensityWidget.vue    |  2 +-
 .../components/widgets/DevicesPieChart.vue    |  2 +-
 .../src/store/modules/dashboard/actions.js    | 32 +++++++--
 6 files changed, 78 insertions(+), 28 deletions(-)

diff --git a/backend/app/Repositories/EloquentVisitorRepository.php b/backend/app/Repositories/EloquentVisitorRepository.php
index 300b2741..51880508 100644
--- a/backend/app/Repositories/EloquentVisitorRepository.php
+++ b/backend/app/Repositories/EloquentVisitorRepository.php
@@ -120,7 +120,8 @@ public function getAllActivityVisitors(int $websiteId): SupportCollection
         $subQueryFirst = "SELECT DISTINCT ON (v.id) visitor_id, v.last_activity as max_date, v.website_id, p.url 
                           from visitors v
                           LEFT JOIN  visits vs on vs.visitor_id = v.id left join pages p on vs.page_id = p.id
-                          where v.last_activity > NOW() - interval '5 minutes' and v.website_id = ".$websiteId;
+                          where v.last_activity > NOW() - interval '5 minutes' and v.website_id = ".$websiteId."
+                          order by v.id, vs.id desc";
         $query = DB::raw($subQueryFirst);
         $result = DB::select((string)$query);
 
diff --git a/backend/tests/Feature/ActivityVisitorTest.php b/backend/tests/Feature/ActivityVisitorTest.php
index 44e346d9..eb4f303c 100644
--- a/backend/tests/Feature/ActivityVisitorTest.php
+++ b/backend/tests/Feature/ActivityVisitorTest.php
@@ -43,7 +43,7 @@ public function testGetActivityUsersAction()
         $expectedData = [
             "data" => [
                 [
-                    'url' => "http://page_1.test",
+                    'url' => "http://page_2.test",
                     'visitor' => 1,
                     'date' => $this->thirdDate->format('Y-m-d H:i:s')
                 ],
diff --git a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
index 4aa880c7..8514f7a7 100644
--- a/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
+++ b/frontend/src/components/dashboard/home/ActiveVisitorsCard.vue
@@ -26,15 +26,13 @@
                 </p>
             </div>
             <VContainer>
-                <VSparkline
-                    v-if="activityChartData.length > 0"
-                    :value="activityChartData"
-                    :gradient="gradient"
-                    :smooth="radius"
-                    :padding="padding"
-                    :line-width="lineWidth"
-                    :gradient-direction="gradientDirection"
-                    auto-draw
+                <VueApexCharts
+                    type="bar"
+                    height="200px"
+                    width="100%"
+                    :options="options"
+                    :series="series"
+                    class="visits-heatmap"
                 />
             </VContainer>
             <TopActivePage
@@ -56,6 +54,8 @@
 
 <script>
     import Spinner from '../../utilites/Spinner';
+    import moment from 'moment';
+    import VueApexCharts from 'vue-apexcharts';
     import {mapGetters, mapActions} from 'vuex';
     import {
         GET_ACTIVITY_DATA_ITEMS,
@@ -76,7 +76,8 @@
         name: 'ActiveVisitorsCard',
         components: {
             TopActivePage,
-            Spinner
+            Spinner,
+            VueApexCharts
         },
         data: () => ({
             lineWidth: 4,
@@ -86,10 +87,22 @@
             gradientDirection: 'left',
             polling: null,
             fetch: null,
+            options: {
+                chart: {
+                    id: 'vuechart',
+                    toolbar: {
+                        show: false
+                    },
+                    fontFamily: 'Gilroy'
+                },
+            }
         }),
         mounted() {
             const channel = echoInstance.private('active-users.'+ this.website.id);
-            channel.listen('ActiveUserEvent', (data) => this.refreshActivityDataItems(data));
+            channel.listen('ActiveUserEvent', (data) => {
+                this.refreshActivityDataItems(data);
+                this.fetchingActiveUsersChartData();
+            });
         },
         computed: {
             ...mapGetters('dashboard', {
@@ -110,14 +123,32 @@
                 const result = _(this.activityDataItems)
                     .groupBy('url')
                     .map((items, url) => {
+
                         return { url: url, count: items.length };
                     }).value();
+
                 const sort = _.sortBy(result, ['count']).reverse();
                 if(sort.length > 3) {
                     return sort.slice(0, 3);
                 }
                 return sort;
-            }
+            },
+            series() {
+                let data = [];
+                let i = this.activityChartData.length - 1;
+                this.activityChartData.forEach((item) => {
+                    data.push({
+                        x: moment().subtract(i, 'minute').format('HH:mm'),
+                        y: item
+                    });
+                    i--;
+                });
+                return  [{
+                    name: 'count pages',
+                    data: data
+                }];
+            },
+
         },
         created() {
             this.fetchingActiveUsersNumbers();
@@ -138,16 +169,17 @@
             setIntervalDataActivity () {
                 this.polling = setInterval(() => {
                     this.reloadActivityDataItems();
-                }, 300000);
-                this.fetch = setInterval(() => {
                     this.fetchingActiveUsersChartData();
-                }, 60000);
+                }, 300000);
             },
         }
     };
 </script>
 
 <style lang="scss" scoped>
+    .visits-heatmap {
+        margin: 0 -22px 0 -32px;
+    }
     .visitors-card {
         border: none;
         box-shadow: 0px 0px 28px rgba(194, 205, 223, 0.7);
@@ -155,7 +187,7 @@
         font-family: Gilroy;
         width: 352px;
         font-size: 12px;
-        height: 480px;
+        height: 580px;
 
         .card-top-row {
             height: 53px;
@@ -170,7 +202,6 @@
         }
         .card-button {
             height: 32px;
-            width: 126px;
             background: #3C57DE;
             color:#ffffff;
             font-size: 12px;
diff --git a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
index 6a27ca67..8364f8b2 100644
--- a/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
+++ b/frontend/src/components/dashboard/home/VisitsDensityWidget.vue
@@ -192,7 +192,7 @@
         border-radius: 6px;
         padding: 1.5rem;
         width: 352px;
-        height: 480px;
+        height: 580px;
     }
 
     .visits-heatmap {
diff --git a/frontend/src/components/widgets/DevicesPieChart.vue b/frontend/src/components/widgets/DevicesPieChart.vue
index 83288605..ca6f1361 100644
--- a/frontend/src/components/widgets/DevicesPieChart.vue
+++ b/frontend/src/components/widgets/DevicesPieChart.vue
@@ -78,7 +78,7 @@
     box-shadow: 0 0 28px rgba(0, 0, 0, 0.11) !important;
     border-radius: 6px;
     width: 352px;
-    height: 480px;
+    height: 580px;
 }
 .header {
     font-size: 16px;
diff --git a/frontend/src/store/modules/dashboard/actions.js b/frontend/src/store/modules/dashboard/actions.js
index 4bfbb7c4..29b2d819 100644
--- a/frontend/src/store/modules/dashboard/actions.js
+++ b/frontend/src/store/modules/dashboard/actions.js
@@ -61,8 +61,14 @@ export default {
         context.commit(SET_BUTTON_FETCHING);
 
         return getActivityDataItems().then(response => {
+
             response.sort( (a, b) => {
-                return  a.date - b.date || a.visitor - b.visitor;
+                if (moment(a.date).unix() < moment(b.date).unix()) return 1;
+                if (moment(a.date).unix() > moment(b.date).unix()) return -1;
+                if (a.visitor < b.visitor) return 1;
+                if (a.visitor > b.visitor) return -1;
+                return 0;
+
             });
 
             const result = [];
@@ -71,7 +77,8 @@ export default {
                     result.push(element);
                 }
             });
-            context.commit(SET_ACTIVITY_DATA_ITEMS, result);
+
+            context.commit(SET_ACTIVITY_DATA_ITEMS, _.uniqBy(result, 'visitor'));
             context.commit(RESET_BUTTON_FETCHING);
         }).catch(() => {
             context.commit(RESET_BUTTON_FETCHING);
@@ -79,21 +86,21 @@ export default {
     },
     [FETCHING_ACTIVITY_CHART_DATA]: (context) => {
 
-        const startDay = moment().subtract(1, 'minute');
+        const startDay = moment().subtract(5, 'minute');
         const endDay = moment();
 
         pageViewsService.fetchChartValues(
             startDay.unix(),
             endDay.unix(),
-            1
+            60
         ).then(response => {
             const range = moment().range(startDay, endDay);
             const arrayOfDates = Array.from(range.by('seconds'));
             const result = [];
-
             let value = undefined;
             arrayOfDates.map((item) => {
                 value = _.find(response,  (i) => {
+
                     return parseInt(i.date, 10) === item.unix();
                 });
                 if(value) {
@@ -103,10 +110,12 @@ export default {
                     result.push(0);
                 }
             });
+
             const chunk = (arr, size) =>
                 arr.reduce((acc, _, i) => (i % size)
                     ? acc : [...acc, (arr.slice(i, i + size)).reduce((a, b) => a + b, 0)], []);
-            context.commit(SET_ACTIVITY_CHART_DATA, chunk(result, 6));
+
+            context.commit(SET_ACTIVITY_CHART_DATA, chunk(result, 61));
         });
     },
 
@@ -127,6 +136,15 @@ export default {
                 }),
             data,
         ];
-        context.commit(SET_ACTIVITY_DATA_ITEMS, items);
+
+        items.sort( (a, b) => {
+            if (moment(a.date).unix() < moment(b.date).unix()) return 1;
+            if (moment(a.date).unix() > moment(b.date).unix()) return -1;
+            if (a.visitor < b.visitor) return 1;
+            if (a.visitor > b.visitor) return -1;
+            return 0;
+
+        });
+        context.commit(SET_ACTIVITY_DATA_ITEMS,  _.uniqBy(items, 'visitor'));
     },
 };

From 60497cac0cfd99804e7613eab2e7a9e9f0f213e3 Mon Sep 17 00:00:00 2001
From: Mariia128 <mariia.tarantsova@ipayless.co.il>
Date: Wed, 11 Sep 2019 07:16:16 +0300
Subject: [PATCH 152/183] edit style code

---
 .../src/store/modules/dashboard/actions.js    | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/frontend/src/store/modules/dashboard/actions.js b/frontend/src/store/modules/dashboard/actions.js
index 29b2d819..22317dbc 100644
--- a/frontend/src/store/modules/dashboard/actions.js
+++ b/frontend/src/store/modules/dashboard/actions.js
@@ -63,10 +63,18 @@ export default {
         return getActivityDataItems().then(response => {
 
             response.sort( (a, b) => {
-                if (moment(a.date).unix() < moment(b.date).unix()) return 1;
-                if (moment(a.date).unix() > moment(b.date).unix()) return -1;
-                if (a.visitor < b.visitor) return 1;
-                if (a.visitor > b.visitor) return -1;
+                if (moment(a.date).unix() < moment(b.date).unix()) {
+                    return 1;
+                }
+                if (moment(a.date).unix() > moment(b.date).unix()) {
+                    return -1;
+                }
+                if (a.visitor < b.visitor) {
+                    return 1;
+                }
+                if (a.visitor > b.visitor) {
+                    return -1;
+                }
                 return 0;
 
             });
@@ -138,10 +146,18 @@ export default {
         ];
 
         items.sort( (a, b) => {
-            if (moment(a.date).unix() < moment(b.date).unix()) return 1;
-            if (moment(a.date).unix() > moment(b.date).unix()) return -1;
-            if (a.visitor < b.visitor) return 1;
-            if (a.visitor > b.visitor) return -1;
+            if (moment(a.date).unix() < moment(b.date).unix()) {
+                return 1;
+            }
+            if (moment(a.date).unix() > moment(b.date).unix()) {
+                return -1;
+            }
+            if (a.visitor < b.visitor) {
+                return 1;
+            }
+            if (a.visitor > b.visitor) {
+                return -1;
+            }
             return 0;
 
         });

From f8ce836667e3beff9332ed2ba5cc79260983b30a Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Wed, 11 Sep 2019 07:21:36 +0300
Subject: [PATCH 153/183] make visitors table responsive

---
 frontend/src/components/dashboard/visitors/GroupedTable.vue | 6 ++++++
 frontend/src/pages/Visitors.vue                             | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/frontend/src/components/dashboard/visitors/GroupedTable.vue b/frontend/src/components/dashboard/visitors/GroupedTable.vue
index 76ce5956..572b1b78 100644
--- a/frontend/src/components/dashboard/visitors/GroupedTable.vue
+++ b/frontend/src/components/dashboard/visitors/GroupedTable.vue
@@ -106,6 +106,7 @@ $gray: rgba(18, 39, 55, 0.5);
     align-items: center;
     text-align: center;
     text-transform: capitalize;
+    white-space: nowrap;
 }
 
 .container {
@@ -183,4 +184,9 @@ $gray: rgba(18, 39, 55, 0.5);
     font-family: 'Gilroy';
     text-transform: capitalize;
 }
+    @media (max-width: 870px) {
+        ::v-deep .v-text-field__prefix {
+            display: none;
+        }
+    }
 </style>
diff --git a/frontend/src/pages/Visitors.vue b/frontend/src/pages/Visitors.vue
index 5499b933..f18c8b47 100644
--- a/frontend/src/pages/Visitors.vue
+++ b/frontend/src/pages/Visitors.vue
@@ -35,6 +35,7 @@
             <VCol
                 lg="7"
                 md="12"
+                sm="12"
                 height="100%"
                 class="img-card"
             >
@@ -43,6 +44,7 @@
             <VCol
                 lg="5"
                 md="12"
+                sm="12"
                 height="100%"
                 class="img-card"
             >

From f4a926846cbb0275952ab51a5415ad8b51f8ad2b Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Wed, 11 Sep 2019 08:48:36 +0300
Subject: [PATCH 154/183] fix sign in link display on signup page

---
 frontend/src/components/auth/LoginForm.vue  |  3 +-
 frontend/src/components/auth/SignUpForm.vue | 52 ++++++++++-----------
 frontend/src/pages/SignUp.vue               | 11 ++---
 3 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/frontend/src/components/auth/LoginForm.vue b/frontend/src/components/auth/LoginForm.vue
index 786ddf77..1bd886d1 100644
--- a/frontend/src/components/auth/LoginForm.vue
+++ b/frontend/src/components/auth/LoginForm.vue
@@ -49,7 +49,6 @@
                     >
                         {{ signInText }}
                     </VBtn>
-
                     <VBtn
                         class="start"
                         min-width="100px"
@@ -60,7 +59,7 @@
                         SIGN UP
                     </VBtn>
                 </div>
-                <div class="btn-group">
+                <div>
                     <RouterLink
                         class="forgot-password-link"
                         :to="{name: 'reset-password'}"
diff --git a/frontend/src/components/auth/SignUpForm.vue b/frontend/src/components/auth/SignUpForm.vue
index 5a78838e..5ffe3e43 100644
--- a/frontend/src/components/auth/SignUpForm.vue
+++ b/frontend/src/components/auth/SignUpForm.vue
@@ -43,7 +43,7 @@
                     Password
                 </label>
                 <VTextField
-                    class="no-underline my-1"
+                    class="no-underline my-1 password"
                     solo
                     name="password"
                     autocomplete="new-password"
@@ -59,7 +59,7 @@
                     Confirm password
                 </label>
                 <VTextField
-                    class="no-underline my-1"
+                    class="no-underline my-1 password"
                     solo
                     name="confirmPassword"
                     autocomplete="new-password"
@@ -80,19 +80,25 @@
                         SIGN UP
                     </VBtn>
                 </div>
-                <div class="btn-group mt-5">
-                    Already have an account? Please
-                    <RouterLink
-                        class="forgot-password-link"
-                        :to="{name: 'login'}"
-                    >
-                        sign in
-                    </RouterLink>
+                <div class="mt-3">
+                    <span>
+                        Already have an account?
+                        <span class="nowrap">
+                            Please
+                            <RouterLink
+                                class="forgot-password-link"
+                                :to="{name: 'login'}"
+                            >
+                                sign in
+                            </RouterLink>
+                        </span>
+                    </span>
                 </div>
             </div>
         </VForm>
-
-        <SocialAuth />
+        <SocialAuth
+            class="mt-4"
+        />
     </div>
 </template>
 
@@ -169,6 +175,9 @@
 </script>
 
 <style lang="scss" scoped>
+.nowrap {
+    white-space: nowrap;
+}
 
 .v-btn {
     font-family: Gilroy;
@@ -187,26 +196,15 @@
         color: #3C57DE;
     }
 }
-
-.password-group {
-    display: flex;
-    flex-direction: column;
+.password {
     max-width: 80%;
 }
-
-.btn-group{
+.password-group {
     display: flex;
-    justify-content: space-between;
-    align-items: center;
-    max-width: 80%;
-    margin-bottom: 20px;
-}
-
-.choice{
-    margin: 0 15px;
+    flex-direction: column;
 }
 
-.form{
+.form {
     width: 50%;
 }
 
diff --git a/frontend/src/pages/SignUp.vue b/frontend/src/pages/SignUp.vue
index dab23aae..791e4c8e 100644
--- a/frontend/src/pages/SignUp.vue
+++ b/frontend/src/pages/SignUp.vue
@@ -1,7 +1,6 @@
 <template>
     <VContent>
         <VContainer
-            p-o
             fluid
             fill-height
         >
@@ -12,9 +11,9 @@
                 justify-center
             >
                 <VFlex
-                    form-wrapper
+                    class="background pt-10"
+                    fill-height
                     xs12
-                    sm8
                     md6
                 >
                     <VLayout
@@ -28,6 +27,7 @@
                     image
                     sm12
                     md6
+                    class="d-sm-none d-md-flex"
                 >
                     <VImg
                         src="/assets/images/home.png"
@@ -65,9 +65,4 @@ main{
     padding: 0px
 }
 
-.form-wrapper{
-    height: 100%;
-    background: #f5f8fd;
-}
-
 </style>

From e68723b5689ddb15d9e2976471961ad0d605d420 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Wed, 11 Sep 2019 09:00:22 +0300
Subject: [PATCH 155/183] add units display for average time chart tooltip

---
 frontend/src/pages/PageViews.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/frontend/src/pages/PageViews.vue b/frontend/src/pages/PageViews.vue
index 6f4df9b3..a4c44097 100644
--- a/frontend/src/pages/PageViews.vue
+++ b/frontend/src/pages/PageViews.vue
@@ -120,7 +120,14 @@
                 getTableData: GET_PAGE_VIEWS_TABLE_DATA
             }),
             units() {
-                return this.currentActiveButton === BOUNCE_RATE ? '%' : '';
+                switch (this.currentActiveButton) {
+                case BOUNCE_RATE:
+                    return '%';
+                case AVERAGE_TIME:
+                    return 's';
+                default:
+                    return '';
+                }
             },
         },
         created() {

From 13f76660471635530f3bc65afce6b9dd39827d13 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Wed, 11 Sep 2019 09:21:38 +0300
Subject: [PATCH 156/183] modify piechart component on visitors page

---
 frontend/src/components/common/PieChart.vue   | 19 ++++++++++++-------
 .../dashboard/visitors/GroupedTable.vue       |  1 -
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/common/PieChart.vue b/frontend/src/components/common/PieChart.vue
index 4d28c557..a5b94023 100644
--- a/frontend/src/components/common/PieChart.vue
+++ b/frontend/src/components/common/PieChart.vue
@@ -1,11 +1,15 @@
 <template>
     <VContainer>
-        <VSubheader
-            class="header my-3 text-dark"
-            fluid
-        >
-            Summary
-        </VSubheader>
+        <VRow>
+            <VCol>
+                <VSubheader
+                    class="my-3 header text-dark"
+                    fluid
+                >
+                    Summary
+                </VSubheader>
+            </VCol>
+        </VRow>
         <VLayout
             class="pie-container position-relative"
             wrap
@@ -120,6 +124,8 @@
 <style scoped lang="scss">
 .pie-container {
     background-color: white;
+    border-radius: 6px;
+    box-shadow: 0px 0px 28px rgba(194, 205, 223, 0.7);
 
     .chart-card {
         min-width: 165px;
@@ -130,7 +136,6 @@
     text-align: center;
     text-transform: capitalize;
     font-family: 'Gilroy';
-    padding-bottom: 10px;
     font-size: 16px;
     line-height: 19px;
 }
diff --git a/frontend/src/components/dashboard/visitors/GroupedTable.vue b/frontend/src/components/dashboard/visitors/GroupedTable.vue
index 572b1b78..a7161433 100644
--- a/frontend/src/components/dashboard/visitors/GroupedTable.vue
+++ b/frontend/src/components/dashboard/visitors/GroupedTable.vue
@@ -1,6 +1,5 @@
 <template>
     <VContainer
-        p-0
         class="users-table"
     >
         <VRow

From 8976bc96b2aad14ab69b6e0494d525b70a3336f4 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Wed, 11 Sep 2019 09:29:03 +0300
Subject: [PATCH 157/183] remove login/signup image sm and down

---
 frontend/src/pages/Login.vue  | 2 +-
 frontend/src/pages/SignUp.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 2b1deef4..2a613530 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -30,7 +30,7 @@
                     image
                     sm12
                     md6
-                    class="d-sm-none d-md-flex"
+                    class="d-none d-md-flex"
                 >
                     <VImg
                         src="/assets/images/home.png"
diff --git a/frontend/src/pages/SignUp.vue b/frontend/src/pages/SignUp.vue
index 791e4c8e..856e107a 100644
--- a/frontend/src/pages/SignUp.vue
+++ b/frontend/src/pages/SignUp.vue
@@ -27,7 +27,7 @@
                     image
                     sm12
                     md6
-                    class="d-sm-none d-md-flex"
+                    class="d-none d-md-flex"
                 >
                     <VImg
                         src="/assets/images/home.png"

From 0ecbf9083c27073891274ca78457188a15aef1b4 Mon Sep 17 00:00:00 2001
From: UMarina <m.udovitskaya@gmail.com>
Date: Wed, 11 Sep 2019 11:59:38 +0300
Subject: [PATCH 158/183] add buttons to generate errors, add sort errors in
 table and date to modal

---
 .../DataTransformer/ErrorReport/TableErrorReport.php | 10 +++++++++-
 backend/app/Http/Resources/ErrorTableResource.php    |  1 +
 .../Repositories/EloquentErrorReportRepository.php   |  6 ++++--
 .../dashboard/errors/ErrorsDetailsModal.vue          |  6 ++++++
 frontend/src/pages/speed_overview/ErrorReports.vue   |  8 +++++++-
 test-site/src/css/main.css                           | 10 ++++++++++
 test-site/src/index.html                             | 12 ++++++++++++
 7 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/backend/app/DataTransformer/ErrorReport/TableErrorReport.php b/backend/app/DataTransformer/ErrorReport/TableErrorReport.php
index cd1c37b2..ffe48bd1 100644
--- a/backend/app/DataTransformer/ErrorReport/TableErrorReport.php
+++ b/backend/app/DataTransformer/ErrorReport/TableErrorReport.php
@@ -15,19 +15,22 @@ final class TableErrorReport
     private $total;
     private $message;
     private $stackTrace;
+    private $maxCreated;
 
     public function __construct(
         string $parameter,
         string $parameterValue,
         string $total,
         string $message,
-        string $stackTrace
+        string $stackTrace,
+        string $maxCreated
     ) {
         $this->parameter = $parameter;
         $this->parameterValue = $parameterValue;
         $this->total = $total;
         $this->message = $message;
         $this->stackTrace = $stackTrace;
+        $this->maxCreated = $maxCreated;
     }
 
     public function message(): string
@@ -39,4 +42,9 @@ public function stackTrace(): string
     {
         return $this->stackTrace;
     }
+
+    public function maxCreated(): string
+    {
+        return $this->maxCreated;
+    }
 }
\ No newline at end of file
diff --git a/backend/app/Http/Resources/ErrorTableResource.php b/backend/app/Http/Resources/ErrorTableResource.php
index 0f50be22..7dc37693 100644
--- a/backend/app/Http/Resources/ErrorTableResource.php
+++ b/backend/app/Http/Resources/ErrorTableResource.php
@@ -24,6 +24,7 @@ public function present(TableErrorReport $table): array
             'count' => $table->total(),
             'message' => $table->message(),
             'stack_trace' => $table->stackTrace(),
+            'max_created' => $table->maxCreated(),
         ];
     }
 
diff --git a/backend/app/Repositories/EloquentErrorReportRepository.php b/backend/app/Repositories/EloquentErrorReportRepository.php
index 50e45b06..12271429 100644
--- a/backend/app/Repositories/EloquentErrorReportRepository.php
+++ b/backend/app/Repositories/EloquentErrorReportRepository.php
@@ -65,9 +65,10 @@ public function getErrorItemsGroupByPage(int $websiteId, DatePeriod $datePeriod)
     {
         $errors = Error::ForWebsite($websiteId)
             ->join('pages', 'pages.id', '=', 'errors.page_id')
-            ->select(DB::raw('pages.url as parameter_value, errors.message, errors.stack_trace, count(errors.id) as count_errors'))
+            ->select(DB::raw('pages.url as parameter_value, errors.message, errors.stack_trace, count(errors.id) as count_errors, max(errors.created_at) as max_created'))
             ->whereBetween('errors.created_at', [$datePeriod->getStartDate(), $datePeriod->getEndDate()])
             ->groupBy(['pages.id', 'errors.message', 'errors.stack_trace'])
+            ->orderBy('max_created','desc')
             ->get();
 
         return $this->mapToTableValues($errors, 'page');
@@ -81,7 +82,8 @@ private function mapToTableValues(Collection $errors, string $parameter)
                 $item->parameter_value,
                 strval($item->count_errors),
                 $item->message,
-                $item->stack_trace
+                $item->stack_trace,
+                $item->max_created
             );
         });
     }
diff --git a/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue b/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue
index b950dceb..1ce7af51 100644
--- a/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue
+++ b/frontend/src/components/dashboard/errors/ErrorsDetailsModal.vue
@@ -12,6 +12,12 @@
                 </VCardTitle>
                 <VCardText>
                     <div class="mb-2">
+                        Last date
+                    </div>
+                    <div class="text--primary message-block">
+                        {{ errorItem.max_created }}
+                    </div>
+                    <div class="mb-2 mt-5">
                         Message
                     </div>
                     <div class="text--primary message-block">
diff --git a/frontend/src/pages/speed_overview/ErrorReports.vue b/frontend/src/pages/speed_overview/ErrorReports.vue
index 39b68425..aa2d4e41 100644
--- a/frontend/src/pages/speed_overview/ErrorReports.vue
+++ b/frontend/src/pages/speed_overview/ErrorReports.vue
@@ -16,7 +16,7 @@
             <Spinner v-if="tableData.isFetching" />
             <ErrorsTable
                 @open="openModal"
-                :error-items="tableData.items"
+                :error-items="getTableDataItems()"
             />
         </VRow>
         <ErrorsDetailsModal
@@ -28,6 +28,7 @@
 </template>
 
 <script>
+    import moment from 'moment';
     import ContentLayout from '../../components/layout/ContentLayout.vue';
     import LineChart from "../../components/common/LineChart";
     import ErrorsTable from '../../components/dashboard/errors/ErrorsTable.vue';
@@ -84,6 +85,11 @@
                 changeSelectedPeriod: CHANGE_SELECTED_PERIOD,
                 fetchPageData: FETCH_PAGE_DATA
             }),
+            getTableDataItems () {
+                return this.tableData.items.map((item) => {
+                    return {...item, max_created: moment.utc(item.max_created).format('llll')};
+                });
+            },
             changePeriod (data) {
                 this.changeSelectedPeriod(data);
             },
diff --git a/test-site/src/css/main.css b/test-site/src/css/main.css
index 0b99fc7b..ba28bde9 100755
--- a/test-site/src/css/main.css
+++ b/test-site/src/css/main.css
@@ -145,3 +145,13 @@ body {
     display: none;
 }
 
+button {
+    background-color: white;
+    cursor: pointer;
+    text-transform: uppercase;
+}
+button:hover {
+    color: red;
+}
+
+
diff --git a/test-site/src/index.html b/test-site/src/index.html
index 3d54a48a..333f6e56 100755
--- a/test-site/src/index.html
+++ b/test-site/src/index.html
@@ -18,6 +18,8 @@
             <li><a href="about.html">about</a></li>
             <li><a href="contact.html">contact us</a></li>
             <li><a href="portfolio.html">portfolio</a></li>
+            <li><button onclick="generateError(0)">Stable error</button></li>
+            <li><button onclick="generateError(1)">New error</button></li>
         </ul>
     </header>
     <div class="container">
@@ -26,5 +28,15 @@
         </div>
     </div>
 </div>
+<script>
+    const generateError = (num) => someFunction(num);
+    const someFunction = (num) => {
+        if (num > 0) {
+            throw new Error('Random error ' + Math.floor(Math.random() * Math.floor(100)) +'.I was created using a function call!');
+        } else {
+            throw new Error('New error.I was created using a function call!');
+        }
+    };
+</script>
 </body>
 </html>

From 7c6cadfee418faff23b18a5cc56bac2145ab427e Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Wed, 11 Sep 2019 13:47:19 +0300
Subject: [PATCH 159/183] fix browserResponse aggregate

---
 .../VisitorsFlow/GetVisitorsFlowAction.php    | 45 ++++---------------
 .../VisitorsFlow/BrowserAggregate.php         | 10 ++---
 .../VisitorsFlow/ParameterFlowItem.php        | 16 +++----
 .../Http/Resources/VisitorsFlowResource.php   |  1 +
 .../VisitorsFlow/BrowserCriteria.php          |  6 +--
 ...sticsearchVisitorFlowBrowserRepository.php |  8 ++--
 ...sticsearchVisitorFlowCountryRepository.php |  4 +-
 ...asticsearchVisitorFlowDeviceRepository.php |  4 +-
 ...asticsearchVisitorFlowScreenRepository.php |  4 +-
 ...215_create_country_visitors_flow_index.php |  2 +-
 ...610_create_browser_visitors_flow_index.php |  9 ++--
 ...3620_create_device_visitors_flow_index.php |  2 +-
 12 files changed, 41 insertions(+), 70 deletions(-)

diff --git a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
index 754178b1..74b02def 100644
--- a/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
+++ b/backend/app/Actions/VisitorsFlow/GetVisitorsFlowAction.php
@@ -36,64 +36,35 @@ public function execute(GetVisitorsFlowRequest $request): GetVisitorFlowResponse
             case 'browser':
                 if ($request->getLevel() > 2) {
                     $browsersFlow = $this->visitorsFlowBrowserRepository->getFlow($websiteId, $request->getLevel());
-                    $filtered = $this->filter($browsersFlow->getCollection());
-                    return new GetVisitorFlowResponse($filtered);
+                    return new GetVisitorFlowResponse($browsersFlow->getCollection());
                 }
                 $browsersViews = $this->visitorsFlowBrowserRepository->getViewsByEachBrowser($request->getParameter(), $websiteId);
                 $browsersFlow = $this->visitorsFlowBrowserRepository->getFlow($websiteId, $request->getLevel());
-                $filtered = $this->filter($browsersFlow->getCollection());
-                return new GetVisitorFlowResponse($filtered, $browsersViews->getCollection());
+                return new GetVisitorFlowResponse($browsersFlow->getCollection(), $browsersViews->getCollection());
             case 'country':
                 if ($request->getLevel() > 2) {
                     $countriesFlow = $this->visitorsFlowCountryRepository->getFlow($websiteId, $request->getLevel());
-                    $filtered = $this->filter($countriesFlow->getCollection());
-                    return new GetVisitorFlowResponse($filtered);
+                    return new GetVisitorFlowResponse($countriesFlow->getCollection());
                 }
                 $countriesViews = $this->visitorsFlowCountryRepository->getViewsByEachCountry($request->getParameter(), $websiteId);
                 $countriesFlow = $this->visitorsFlowCountryRepository->getFlow($websiteId, $request->getLevel());
-                $filtered = $this->filter($countriesFlow->getCollection());
-                return new GetVisitorFlowResponse($filtered, $countriesViews->getCollection());
+                return new GetVisitorFlowResponse($countriesFlow->getCollection(), $countriesViews->getCollection());
             case 'device':
                 if ($request->getLevel() > 2) {
                     $devicesFlow = $this->visitorsFlowDeviceRepository->getFlow($websiteId, $request->getLevel());
-                    $filtered = $this->filter($devicesFlow->getCollection());
-                    return new GetVisitorFlowResponse($filtered);
+                    return new GetVisitorFlowResponse($devicesFlow->getCollection());
                 }
                 $devicesViews = $this->visitorsFlowDeviceRepository->getViewsByEachDevice($request->getParameter(), $websiteId);
                 $devicesFlow = $this->visitorsFlowDeviceRepository->getFlow($websiteId, $request->getLevel());
-                $filtered = $this->filter($devicesFlow->getCollection());
-                return new GetVisitorFlowResponse($filtered, $devicesViews->getCollection());
+                return new GetVisitorFlowResponse($devicesFlow->getCollection(), $devicesViews->getCollection());
             case 'screen':
                 if ($request->getLevel() > 2) {
                     $screensFlow = $this->visitorsFlowScreenRepository->getFlow($websiteId, $request->getLevel());
-                    $filtered = $this->filter($screensFlow->getCollection());
-                    return new GetVisitorFlowResponse($filtered);
+                    return new GetVisitorFlowResponse($screensFlow->getCollection());
                 }
                 $screensViews = $this->visitorsFlowScreenRepository->getViewsByEachScreen($websiteId);
                 $screensFlow = $this->visitorsFlowScreenRepository->getFlow($websiteId, $request->getLevel());
-                $filtered = $this->filter($screensFlow->getCollection());
-                return new GetVisitorFlowResponse($filtered, $screensViews->getCollection());
+                return new GetVisitorFlowResponse($screensFlow->getCollection(), $screensViews->getCollection());
         }
     }
-
-    private function filter(Collection $collection): Collection
-    {
-        $result = collect();
-        $collection->each(function (ParameterFlowItem $item) use (&$result) {
-            $found = false;
-            foreach ($result as $resItem) {
-                if ($resItem->getTargetUrl() === $item->getTargetUrl() && $resItem->getLevel() === $item->getLevel()
-                    && $resItem->getSourceUrl() === $item->getSourceUrl()) {
-                    $resItem->setViews($item->getViews());
-                    $resItem->setExitCount($item->getExitCount());
-                    $found = true;
-                    break;
-                }
-            }
-            if ($found === false) {
-                $result->add($item);
-            }
-        });
-        return $result;
-    }
 }
diff --git a/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php b/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
index 4ce2b99c..75065779 100644
--- a/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
@@ -10,7 +10,7 @@
 
 class BrowserAggregate extends Aggregate
 {
-    public $browser;
+    public $parameter;
 
     public function __construct(
         int $id,
@@ -21,16 +21,16 @@ public function __construct(
         int $level,
         bool $isLastPage,
         int $exitCount,
-        string $browser,
+        string $parameter,
         PageValue $prevPage
     ) {
         parent::__construct($id, $websiteId, $targetUrl, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
-        $this->browser = $browser;
+        $this->parameter = $parameter;
     }
 
     public function toArray(): array
     {
-        return array_merge(parent::toArray(), ['browser' => $this->browser]);
+        return array_merge(parent::toArray(), ['parameter' => $this->parameter]);
     }
 
     public static function fromResult(array $result): Aggregate
@@ -44,7 +44,7 @@ public static function fromResult(array $result): Aggregate
             (int)$result['level'],
             (bool)$result['is_last_page'],
             (int)$result['exit_count'],
-            (string)$result['browser'],
+            (string)$result['parameter'],
             new PageValue(
                 (int)$result['prev_page']['id'],
                 (string)$result['prev_page']['source_url']
diff --git a/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php b/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php
index fe03e4f7..f2c2d035 100644
--- a/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php
+++ b/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php
@@ -5,6 +5,7 @@
 
 class ParameterFlowItem
 {
+    private $parameter;
     private $targetUrl;
     private $views;
     private $exitCount;
@@ -13,6 +14,7 @@ class ParameterFlowItem
 
     public function __construct(array $item)
     {
+        $this->parameter = $item['parameter'];
         $this->targetUrl = $item['target_url'];
         $this->views = $item['views'];
         $this->level = $item['level'];
@@ -20,6 +22,10 @@ public function __construct(array $item)
         $this->sourceUrl = $item['prev_page']['source_url'];
     }
 
+    public function getParameter():string
+    {
+        return  $this->parameter;
+    }
 
     public function getTargetUrl(): string
     {
@@ -45,14 +51,4 @@ public function getSourceUrl(): string
     {
         return $this->sourceUrl;
     }
-
-    public function setViews(int $views): void
-    {
-        $this->views += $views;
-    }
-
-    public function setExitCount(int $exitCount): void
-    {
-        $this->exitCount += $exitCount;
-    }
 }
diff --git a/backend/app/Http/Resources/VisitorsFlowResource.php b/backend/app/Http/Resources/VisitorsFlowResource.php
index 41a394f8..88af397c 100644
--- a/backend/app/Http/Resources/VisitorsFlowResource.php
+++ b/backend/app/Http/Resources/VisitorsFlowResource.php
@@ -27,6 +27,7 @@ public function presentParameterViews(ParameterItem $item): array
     public function presentVisitorsFlow(ParameterFlowItem $item): array
     {
         return [
+            'parameter' => $item->getParameter(),
             'target_url' => $item->getTargetUrl(),
             'level' => $item->getLevel(),
             'views' => $item->getViews(),
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php
index b3b14c77..8edd9bdd 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php
@@ -10,16 +10,16 @@ class BrowserCriteria implements Criteria
     public $websiteId;
     public $targetUrl;
     public $level;
-    public $browser;
+    public $parameter;
     public $prevPageUrl;
 
-    private function __construct(int $websiteId, string $targetUrl, int $level, ?string $prevPageUrl, string $browser)
+    private function __construct(int $websiteId, string $targetUrl, int $level, ?string $prevPageUrl, string $parameter)
     {
         $this->websiteId = $websiteId;
         $this->targetUrl = $targetUrl;
         $this->level = $level;
-        $this->browser = $browser;
         $this->prevPageUrl = $prevPageUrl;
+        $this->parameter = $parameter;
     }
 
     public static function getCriteria(int $websiteId, string $targetUrl, int $level, ?string $prevPageUrl, ...$params)
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
index ceff266a..5a5a5cac 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
@@ -46,7 +46,7 @@ public function getByCriteria(Criteria $criteria): ?BrowserAggregate
                         'filter' => [
                             ['term' => ['level' => $criteria->level]],
                             ['match_phrase' => ['target_url' => $criteria->targetUrl]],
-                            ['match_phrase' => ['browser' => $criteria->browser]],
+                            ['match_phrase' => ['parameter' => $criteria->parameter]],
                             ['match_phrase' => ['prev_page.source_url' => $criteria->prevPageUrl]]
                         ],
                     ]
@@ -79,7 +79,7 @@ public function getViewsByEachBrowser(string $type, int $websiteId): ParametersC
                 'aggregations' => [
                     'browsers' => [
                         'terms' => [
-                            'field' => $type
+                            'field' => 'parameter'
                         ],
                         'aggregations' => [
                             'views' => [
@@ -120,8 +120,8 @@ public function getFlow(int $websiteId, int $level): ParameterFlowCollection
                     ]
                 ],
                 'sort' => [
-                    'level' => 'asc',
-                    'views' => 'desc'
+                   [ 'level' => ['order' => 'asc', "unmapped_type" => "integer"]],
+                   [ 'views' => ['order' => 'desc',  "unmapped_type" => "integer"]]
                 ]
             ]
         ];
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
index a81d8830..cc38ee41 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
@@ -118,8 +118,8 @@ public function getFlow(int $websiteId, int $level): ParameterFlowCollection
                     ]
                 ],
                 'sort' => [
-                    'level' => 'asc',
-                    'views' => 'desc'
+                    [ 'level' => ['order' => 'asc', "unmapped_type" => "integer"]],
+                    [ 'views' => ['order' => 'desc',  "unmapped_type" => "integer"]]
                 ]
             ]
         ];
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
index b3b9055d..72cfa5c3 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
@@ -120,8 +120,8 @@ public function getFlow(int $websiteId, int $level): ParameterFlowCollection
                     ]
                 ],
                 'sort' => [
-                    'level' => 'asc',
-                    'views' => 'desc'
+                    [ 'level' => ['order' => 'asc', "unmapped_type" => "integer"]],
+                    [ 'views' => ['order' => 'desc',  "unmapped_type" => "integer"]]
                 ]
             ]
         ];
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
index daff1727..9f4a1021 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
@@ -121,8 +121,8 @@ public function getFlow(int $websiteId, int $level): ParameterFlowCollection
                     ]
                 ],
                 'sort' => [
-                    'level' => 'asc',
-                    'views' => 'desc'
+                    [ 'level' => ['order' => 'asc', "unmapped_type" => "integer"]],
+                    [ 'views' => ['order' => 'desc',  "unmapped_type" => "integer"]]
                 ]
             ]
         ];
diff --git a/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php
index d258c482..631beaf0 100644
--- a/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php
@@ -20,7 +20,7 @@ public function up()
             'body' => [
                 'mappings' => [
                     "properties" => [
-                        "country" => [
+                        "parameter" => [
                             "type" => "keyword"
                         ]
                     ]
diff --git a/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php
index 2da1faaf..280c2ba1 100644
--- a/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php
@@ -9,8 +9,9 @@ class CreateBrowserVisitorsFlowIndex extends Migration
 
     public function __construct()
     {
-        $this->client =  app('elasticsearch');
+        $this->client = app('elasticsearch');
     }
+
     public function up()
     {
         $this->down();
@@ -19,12 +20,14 @@ public function up()
             'body' => [
                 'mappings' => [
                     "properties" => [
-                        "browser" => [
+                        "parameter" => [
                             "type" => "keyword"
-                        ]
+                        ],
+
                     ]
                 ]
             ]
+
         ];
         $this->client->indices()->create($params);
     }
diff --git a/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php
index af8cc391..146f94e2 100644
--- a/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php
@@ -19,7 +19,7 @@ public function up()
             'body' => [
                 'mappings' => [
                     "properties" => [
-                        "device" => [
+                        "parameter" => [
                             "type" => "keyword"
                         ]
                     ]

From 064d7412fd0a94f989b9841290e21429f1a2c764 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Wed, 11 Sep 2019 14:10:32 +0300
Subject: [PATCH 160/183] change browserAggregate response

---
 .../VisitorsFlow/BrowserAggregate.php         | 10 +++++-----
 .../VisitorsFlow/BrowserFlowCollection.php    | 16 +++++++++++++++
 .../VisitorsFlow/BrowserFlowItem.php          | 20 +++++++++++++++++++
 .../VisitorsFlow/ParameterFlowCollection.php  | 11 +++-------
 .../VisitorsFlow/ParameterFlowItem.php        |  9 +--------
 .../VisitorsFlow/BrowserCriteria.php          |  6 +++---
 ...sticsearchVisitorFlowBrowserRepository.php |  7 ++++---
 ...215_create_country_visitors_flow_index.php |  2 +-
 ...610_create_browser_visitors_flow_index.php |  2 +-
 ...3620_create_device_visitors_flow_index.php |  2 +-
 10 files changed, 55 insertions(+), 30 deletions(-)
 create mode 100644 backend/app/DataTransformer/VisitorsFlow/BrowserFlowCollection.php
 create mode 100644 backend/app/DataTransformer/VisitorsFlow/BrowserFlowItem.php

diff --git a/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php b/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
index 75065779..4ce2b99c 100644
--- a/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
+++ b/backend/app/Aggregates/VisitorsFlow/BrowserAggregate.php
@@ -10,7 +10,7 @@
 
 class BrowserAggregate extends Aggregate
 {
-    public $parameter;
+    public $browser;
 
     public function __construct(
         int $id,
@@ -21,16 +21,16 @@ public function __construct(
         int $level,
         bool $isLastPage,
         int $exitCount,
-        string $parameter,
+        string $browser,
         PageValue $prevPage
     ) {
         parent::__construct($id, $websiteId, $targetUrl, $title, $views, $level, $isLastPage, $exitCount, $prevPage);
-        $this->parameter = $parameter;
+        $this->browser = $browser;
     }
 
     public function toArray(): array
     {
-        return array_merge(parent::toArray(), ['parameter' => $this->parameter]);
+        return array_merge(parent::toArray(), ['browser' => $this->browser]);
     }
 
     public static function fromResult(array $result): Aggregate
@@ -44,7 +44,7 @@ public static function fromResult(array $result): Aggregate
             (int)$result['level'],
             (bool)$result['is_last_page'],
             (int)$result['exit_count'],
-            (string)$result['parameter'],
+            (string)$result['browser'],
             new PageValue(
                 (int)$result['prev_page']['id'],
                 (string)$result['prev_page']['source_url']
diff --git a/backend/app/DataTransformer/VisitorsFlow/BrowserFlowCollection.php b/backend/app/DataTransformer/VisitorsFlow/BrowserFlowCollection.php
new file mode 100644
index 00000000..81c1575a
--- /dev/null
+++ b/backend/app/DataTransformer/VisitorsFlow/BrowserFlowCollection.php
@@ -0,0 +1,16 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DataTransformer\VisitorsFlow;
+
+use Illuminate\Support\Collection;
+
+class BrowserFlowCollection extends ParameterFlowCollection
+{
+    public function getCollection(): Collection
+    {
+        return collect($this->collection)->map(function ($item) {
+            return new BrowserFlowItem($item['_source']);
+        });
+    }
+}
diff --git a/backend/app/DataTransformer/VisitorsFlow/BrowserFlowItem.php b/backend/app/DataTransformer/VisitorsFlow/BrowserFlowItem.php
new file mode 100644
index 00000000..5a4d2816
--- /dev/null
+++ b/backend/app/DataTransformer/VisitorsFlow/BrowserFlowItem.php
@@ -0,0 +1,20 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DataTransformer\VisitorsFlow;
+
+class BrowserFlowItem extends ParameterFlowItem
+{
+    private $browser;
+
+    public function __construct(array $item)
+    {
+        parent::__construct($item);
+        $this->browser = $item['browser'];
+    }
+
+    public function getParameter(): string
+    {
+        return $this->browser;
+    }
+}
diff --git a/backend/app/DataTransformer/VisitorsFlow/ParameterFlowCollection.php b/backend/app/DataTransformer/VisitorsFlow/ParameterFlowCollection.php
index 48001ae2..9f0672c3 100644
--- a/backend/app/DataTransformer/VisitorsFlow/ParameterFlowCollection.php
+++ b/backend/app/DataTransformer/VisitorsFlow/ParameterFlowCollection.php
@@ -5,19 +5,14 @@
 
 use Illuminate\Support\Collection;
 
-class ParameterFlowCollection
+abstract class ParameterFlowCollection
 {
-    private $collection;
+    protected $collection;
 
     public function __construct(array $collection)
     {
         $this->collection = $collection;
     }
 
-    public function getCollection():Collection
-    {
-        return collect($this->collection)->map(function ($item) {
-            return new ParameterFlowItem($item['_source']);
-        });
-    }
+    abstract public function getCollection():Collection;
 }
diff --git a/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php b/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php
index f2c2d035..8de6130c 100644
--- a/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php
+++ b/backend/app/DataTransformer/VisitorsFlow/ParameterFlowItem.php
@@ -3,9 +3,8 @@
 
 namespace App\DataTransformer\VisitorsFlow;
 
-class ParameterFlowItem
+abstract class ParameterFlowItem
 {
-    private $parameter;
     private $targetUrl;
     private $views;
     private $exitCount;
@@ -14,7 +13,6 @@ class ParameterFlowItem
 
     public function __construct(array $item)
     {
-        $this->parameter = $item['parameter'];
         $this->targetUrl = $item['target_url'];
         $this->views = $item['views'];
         $this->level = $item['level'];
@@ -22,11 +20,6 @@ public function __construct(array $item)
         $this->sourceUrl = $item['prev_page']['source_url'];
     }
 
-    public function getParameter():string
-    {
-        return  $this->parameter;
-    }
-
     public function getTargetUrl(): string
     {
         return $this->targetUrl;
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php
index 8edd9bdd..951de79d 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/BrowserCriteria.php
@@ -10,16 +10,16 @@ class BrowserCriteria implements Criteria
     public $websiteId;
     public $targetUrl;
     public $level;
-    public $parameter;
+    public $browser;
     public $prevPageUrl;
 
-    private function __construct(int $websiteId, string $targetUrl, int $level, ?string $prevPageUrl, string $parameter)
+    private function __construct(int $websiteId, string $targetUrl, int $level, ?string $prevPageUrl, string $browser)
     {
         $this->websiteId = $websiteId;
         $this->targetUrl = $targetUrl;
         $this->level = $level;
         $this->prevPageUrl = $prevPageUrl;
-        $this->parameter = $parameter;
+        $this->browser = $browser;
     }
 
     public static function getCriteria(int $websiteId, string $targetUrl, int $level, ?string $prevPageUrl, ...$params)
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
index 5a5a5cac..1ab080e7 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowBrowserRepository.php
@@ -5,6 +5,7 @@
 
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\BrowserAggregate;
+use App\DataTransformer\VisitorsFlow\BrowserFlowCollection;
 use App\DataTransformer\VisitorsFlow\ParameterFlowCollection;
 use App\DataTransformer\VisitorsFlow\ParametersCollection;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
@@ -46,7 +47,7 @@ public function getByCriteria(Criteria $criteria): ?BrowserAggregate
                         'filter' => [
                             ['term' => ['level' => $criteria->level]],
                             ['match_phrase' => ['target_url' => $criteria->targetUrl]],
-                            ['match_phrase' => ['parameter' => $criteria->parameter]],
+                            ['match_phrase' => ['browser' => $criteria->browser]],
                             ['match_phrase' => ['prev_page.source_url' => $criteria->prevPageUrl]]
                         ],
                     ]
@@ -79,7 +80,7 @@ public function getViewsByEachBrowser(string $type, int $websiteId): ParametersC
                 'aggregations' => [
                     'browsers' => [
                         'terms' => [
-                            'field' => 'parameter'
+                            'field' => $type
                         ],
                         'aggregations' => [
                             'views' => [
@@ -126,7 +127,7 @@ public function getFlow(int $websiteId, int $level): ParameterFlowCollection
             ]
         ];
         $result = $this->client->search($params);
-        return new ParameterFlowCollection($result['hits']['hits']);
+        return new BrowserFlowCollection($result['hits']['hits']);
     }
 }
 
diff --git a/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php
index 631beaf0..d258c482 100644
--- a/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013215_create_country_visitors_flow_index.php
@@ -20,7 +20,7 @@ public function up()
             'body' => [
                 'mappings' => [
                     "properties" => [
-                        "parameter" => [
+                        "country" => [
                             "type" => "keyword"
                         ]
                     ]
diff --git a/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php
index 280c2ba1..94e38607 100644
--- a/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013610_create_browser_visitors_flow_index.php
@@ -20,7 +20,7 @@ public function up()
             'body' => [
                 'mappings' => [
                     "properties" => [
-                        "parameter" => [
+                        "browser" => [
                             "type" => "keyword"
                         ],
 
diff --git a/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php b/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php
index 146f94e2..af8cc391 100644
--- a/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php
+++ b/backend/database/migrations/2019_09_08_013620_create_device_visitors_flow_index.php
@@ -19,7 +19,7 @@ public function up()
             'body' => [
                 'mappings' => [
                     "properties" => [
-                        "parameter" => [
+                        "device" => [
                             "type" => "keyword"
                         ]
                     ]

From 1938ddca791388263dac1ee5866f87d665f09fc1 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Wed, 11 Sep 2019 14:25:55 +0300
Subject: [PATCH 161/183] fix deviceAggregate and countryAggregate response

---
 .../VisitorsFlow/CountryFlowCollection.php    | 16 +++++++++++++++
 .../VisitorsFlow/CountryFlowItem.php          | 20 +++++++++++++++++++
 .../VisitorsFlow/DeviceFlowCollection.php     | 16 +++++++++++++++
 .../VisitorsFlow/DeviceFlowItem.php           | 20 +++++++++++++++++++
 ...sticsearchVisitorFlowCountryRepository.php |  3 ++-
 ...asticsearchVisitorFlowDeviceRepository.php |  3 ++-
 6 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 backend/app/DataTransformer/VisitorsFlow/CountryFlowCollection.php
 create mode 100644 backend/app/DataTransformer/VisitorsFlow/CountryFlowItem.php
 create mode 100644 backend/app/DataTransformer/VisitorsFlow/DeviceFlowCollection.php
 create mode 100644 backend/app/DataTransformer/VisitorsFlow/DeviceFlowItem.php

diff --git a/backend/app/DataTransformer/VisitorsFlow/CountryFlowCollection.php b/backend/app/DataTransformer/VisitorsFlow/CountryFlowCollection.php
new file mode 100644
index 00000000..db897eee
--- /dev/null
+++ b/backend/app/DataTransformer/VisitorsFlow/CountryFlowCollection.php
@@ -0,0 +1,16 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DataTransformer\VisitorsFlow;
+
+use Illuminate\Support\Collection;
+
+class CountryFlowCollection extends ParameterFlowCollection
+{
+    public function getCollection(): Collection
+    {
+        return collect($this->collection)->map(function ($item) {
+            return new CountryFlowItem($item['_source']);
+        });
+    }
+}
diff --git a/backend/app/DataTransformer/VisitorsFlow/CountryFlowItem.php b/backend/app/DataTransformer/VisitorsFlow/CountryFlowItem.php
new file mode 100644
index 00000000..be73322d
--- /dev/null
+++ b/backend/app/DataTransformer/VisitorsFlow/CountryFlowItem.php
@@ -0,0 +1,20 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DataTransformer\VisitorsFlow;
+
+class CountryFlowItem extends ParameterFlowItem
+{
+    private $country;
+
+    public function __construct(array $item)
+    {
+        parent::__construct($item);
+        $this->country = $item['country'];
+    }
+
+    public function getParameter(): string
+    {
+        return $this->country;
+    }
+}
diff --git a/backend/app/DataTransformer/VisitorsFlow/DeviceFlowCollection.php b/backend/app/DataTransformer/VisitorsFlow/DeviceFlowCollection.php
new file mode 100644
index 00000000..8554da21
--- /dev/null
+++ b/backend/app/DataTransformer/VisitorsFlow/DeviceFlowCollection.php
@@ -0,0 +1,16 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DataTransformer\VisitorsFlow;
+
+use Illuminate\Support\Collection;
+
+class DeviceFlowCollection extends ParameterFlowCollection
+{
+    public function getCollection(): Collection
+    {
+        return collect($this->collection)->map(function ($item) {
+            return new DeviceFlowItem($item['_source']);
+        });
+    }
+}
diff --git a/backend/app/DataTransformer/VisitorsFlow/DeviceFlowItem.php b/backend/app/DataTransformer/VisitorsFlow/DeviceFlowItem.php
new file mode 100644
index 00000000..b178276e
--- /dev/null
+++ b/backend/app/DataTransformer/VisitorsFlow/DeviceFlowItem.php
@@ -0,0 +1,20 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DataTransformer\VisitorsFlow;
+
+class DeviceFlowItem extends ParameterFlowItem
+{
+    private $device;
+
+    public function __construct(array $item)
+    {
+        parent::__construct($item);
+        $this->device = $item['device'];
+    }
+
+    public function getParameter(): string
+    {
+        return $this->device;
+    }
+}
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
index cc38ee41..3d708147 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowCountryRepository.php
@@ -5,6 +5,7 @@
 
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\CountryAggregate;
+use App\DataTransformer\VisitorsFlow\CountryFlowCollection;
 use App\DataTransformer\VisitorsFlow\ParameterFlowCollection;
 use App\DataTransformer\VisitorsFlow\ParametersCollection;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
@@ -124,6 +125,6 @@ public function getFlow(int $websiteId, int $level): ParameterFlowCollection
             ]
         ];
         $result = $this->client->search($params);
-        return new ParameterFlowCollection($result['hits']['hits']);
+        return new CountryFlowCollection($result['hits']['hits']);
     }
 }
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
index 72cfa5c3..d1c0dedf 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowDeviceRepository.php
@@ -5,6 +5,7 @@
 
 use App\Aggregates\VisitorsFlow\Aggregate;
 use App\Aggregates\VisitorsFlow\DeviceAggregate;
+use App\DataTransformer\VisitorsFlow\DeviceFlowCollection;
 use App\DataTransformer\VisitorsFlow\ParameterFlowCollection;
 use App\DataTransformer\VisitorsFlow\ParametersCollection;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
@@ -126,6 +127,6 @@ public function getFlow(int $websiteId, int $level): ParameterFlowCollection
             ]
         ];
         $result = $this->client->search($params);
-        return new ParameterFlowCollection($result['hits']['hits']);
+        return new DeviceFlowCollection($result['hits']['hits']);
     }
 }

From c094f1d96ebd35d16542fd6eeaf0747b0a2b562e Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Wed, 11 Sep 2019 14:36:52 +0300
Subject: [PATCH 162/183] fix screenAggregate response

---
 .../VisitorsFlow/ScreenFlowCollection.php     | 16 ++++++++++++++
 .../VisitorsFlow/ScreenFlowItem.php           | 22 +++++++++++++++++++
 ...asticsearchVisitorFlowScreenRepository.php |  5 +++--
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 backend/app/DataTransformer/VisitorsFlow/ScreenFlowCollection.php
 create mode 100644 backend/app/DataTransformer/VisitorsFlow/ScreenFlowItem.php

diff --git a/backend/app/DataTransformer/VisitorsFlow/ScreenFlowCollection.php b/backend/app/DataTransformer/VisitorsFlow/ScreenFlowCollection.php
new file mode 100644
index 00000000..ec05a369
--- /dev/null
+++ b/backend/app/DataTransformer/VisitorsFlow/ScreenFlowCollection.php
@@ -0,0 +1,16 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DataTransformer\VisitorsFlow;
+
+use Illuminate\Support\Collection;
+
+class ScreenFlowCollection extends ParameterFlowCollection
+{
+    public function getCollection(): Collection
+    {
+        return collect($this->collection)->map(function ($item) {
+            return new ScreenFlowItem($item['_source']);
+        });
+    }
+}
diff --git a/backend/app/DataTransformer/VisitorsFlow/ScreenFlowItem.php b/backend/app/DataTransformer/VisitorsFlow/ScreenFlowItem.php
new file mode 100644
index 00000000..03136295
--- /dev/null
+++ b/backend/app/DataTransformer/VisitorsFlow/ScreenFlowItem.php
@@ -0,0 +1,22 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DataTransformer\VisitorsFlow;
+
+class ScreenFlowItem extends ParameterFlowItem
+{
+    private $resolutionWidth;
+    private $resolutionHeight;
+
+    public function __construct(array $item)
+    {
+        parent::__construct($item);
+        $this->resolutionWidth = $item['resolution_width'];
+        $this->resolutionHeight = $item['resolution_height'];
+    }
+
+    public function getParameter(): string
+    {
+        return "{$this->resolutionWidth}x{$this->resolutionHeight}";
+    }
+}
diff --git a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
index 9f4a1021..4d2a0270 100644
--- a/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
+++ b/backend/app/Repositories/Elasticsearch/VisitorsFlow/ElasticsearchVisitorFlowScreenRepository.php
@@ -8,6 +8,7 @@
 use App\Aggregates\VisitorsFlow\ScreenAggregate;
 use App\DataTransformer\VisitorsFlow\ParameterFlowCollection;
 use App\DataTransformer\VisitorsFlow\ParametersCollection;
+use App\DataTransformer\VisitorsFlow\ScreenFlowCollection;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\Criteria;
 use App\Repositories\Elasticsearch\VisitorsFlow\Contracts\VisitorFlowScreenRepository;
 use Cviebrock\LaravelElasticsearch\Manager as ElasticsearchManager;
@@ -81,7 +82,7 @@ public function getViewsByEachScreen(int $websiteId): ParametersCollection
                 'aggregations' => [
                     'resolutions' => [
                         'terms' => [
-                            'script' => "doc['resolution_width'].value + ' ' + doc['resolution_height'].value"
+                            'script' => "doc['resolution_width'].value + 'х' + doc['resolution_height'].value"
                         ],
                         'aggregations' => [
                             'views' => [
@@ -127,6 +128,6 @@ public function getFlow(int $websiteId, int $level): ParameterFlowCollection
             ]
         ];
         $result = $this->client->search($params);
-        return new ParameterFlowCollection($result['hits']['hits']);
+        return new ScreenFlowCollection($result['hits']['hits']);
     }
 }

From f9ad7287c8686bee08ece1ea1669a46abbccb346 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Wed, 11 Sep 2019 14:39:16 +0300
Subject: [PATCH 163/183] fix getVisitorsFlwoHttpRequest

---
 .../Http/Requests/VisitorsFlow/GetVisitorsFlowHttpRequest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/app/Http/Requests/VisitorsFlow/GetVisitorsFlowHttpRequest.php b/backend/app/Http/Requests/VisitorsFlow/GetVisitorsFlowHttpRequest.php
index 47d73e19..43383ee0 100644
--- a/backend/app/Http/Requests/VisitorsFlow/GetVisitorsFlowHttpRequest.php
+++ b/backend/app/Http/Requests/VisitorsFlow/GetVisitorsFlowHttpRequest.php
@@ -22,6 +22,6 @@ public function getParameter(): string
 
     public function getLevel(): int
     {
-        return $this->get('level');
+        return (int)$this->get('level');
     }
 }

From dc392731a287f570034d057c349a9037d9fd41d7 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Wed, 11 Sep 2019 15:21:31 +0300
Subject: [PATCH 164/183] fix response from onResetPssword method

---
 frontend/src/components/auth/ResetPasswordForm.vue | 11 ++++++++---
 frontend/src/store/modules/auth/actions.js         |  6 +-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/auth/ResetPasswordForm.vue b/frontend/src/components/auth/ResetPasswordForm.vue
index 0f8ff340..19aaedeb 100644
--- a/frontend/src/components/auth/ResetPasswordForm.vue
+++ b/frontend/src/components/auth/ResetPasswordForm.vue
@@ -44,7 +44,13 @@
                     class="success-response"
                     type="success"
                 >
-                    <span v-html="successMsg" />
+                    Check your inbox. We just sent a link to reset your password via email {{ email }}. Back to
+                    <RouterLink
+                        class="forgot-password-link"
+                        :to="{name: 'login'}"
+                    >
+                        sign in
+                    </RouterLink>
                 </VAlert>
             </VContainer>
         </VFlex>
@@ -83,9 +89,8 @@
                     this.sending = true;
                     this.resetPassword({
                         email: this.email,
-                    }).then((response) => {
+                    }).then(() => {
                         this.showEmail = false;
-                        this.successMsg = response;
                     }).catch(err => {
                         this.hasError = true;
                         this.errorMsg = err;
diff --git a/frontend/src/store/modules/auth/actions.js b/frontend/src/store/modules/auth/actions.js
index cf445934..84cc7440 100644
--- a/frontend/src/store/modules/auth/actions.js
+++ b/frontend/src/store/modules/auth/actions.js
@@ -63,11 +63,7 @@ export default {
     },
 
     [RESET_PASSWORD]: (context, payload) => {
-        return resetPassword(payload).then(() => {
-                return ` Check your inbox. We just sent a link to reset your password via email to ${payload.email}.
-                Back to <a href="/login">sign in</a> `;
-            }
-        ).catch((error) => {
+        return resetPassword(payload).catch((error) => {
             switch (error.response.status) {
                 case 404:
                     throw `It looks like there is no account associated with this email address.

From ce20fd6ef148fdc05e26e986de9cb1386648682b Mon Sep 17 00:00:00 2001
From: LymarMaryna <marina.web.php@gmail.com>
Date: Wed, 11 Sep 2019 12:33:20 +0000
Subject: [PATCH 165/183] Apply fixes from StyleCI

---
 backend/app/Repositories/EloquentErrorReportRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/app/Repositories/EloquentErrorReportRepository.php b/backend/app/Repositories/EloquentErrorReportRepository.php
index 12271429..81288841 100644
--- a/backend/app/Repositories/EloquentErrorReportRepository.php
+++ b/backend/app/Repositories/EloquentErrorReportRepository.php
@@ -68,7 +68,7 @@ public function getErrorItemsGroupByPage(int $websiteId, DatePeriod $datePeriod)
             ->select(DB::raw('pages.url as parameter_value, errors.message, errors.stack_trace, count(errors.id) as count_errors, max(errors.created_at) as max_created'))
             ->whereBetween('errors.created_at', [$datePeriod->getStartDate(), $datePeriod->getEndDate()])
             ->groupBy(['pages.id', 'errors.message', 'errors.stack_trace'])
-            ->orderBy('max_created','desc')
+            ->orderBy('max_created', 'desc')
             ->get();
 
         return $this->mapToTableValues($errors, 'page');

From c1d84c6627bd144b43da20657cbb1369bbc27e52 Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Wed, 11 Sep 2019 16:01:17 +0300
Subject: [PATCH 166/183] add method for parse visitors flow data with fake
 data

---
 .../visitors_flow/VisitorsFlowDiagram.vue     | 241 ++++++++++++++----
 frontend/src/pages/VisitorsFlow.vue           |   4 +-
 2 files changed, 192 insertions(+), 53 deletions(-)

diff --git a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
index 7c35985f..faca0785 100644
--- a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
+++ b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
@@ -22,18 +22,19 @@
 
 <script>
     import * as d3 from "d3";
-    import { sankey, sankeyLinkHorizontal } from "d3-sankey";
+    import { sankey, sankeyLinkHorizontal, sankeyLeft } from "d3-sankey";
 
     export default {
         name: "VisitorsFlowDiagram",
-        props: {
+        /*props: {
             visitorsFlowData: {
-                type: Array,
-                required: true
+                type: Object,
+                required: false
             }
-        },
+        },*/
         data () {
             return {
+                visitorsFlowData: {},
                 titles: [
                     'Starting pages',
                     '1st Interaction',
@@ -42,72 +43,214 @@
                 ],
                 height: 600,
                 tooltip: {},
-                nodes: [
-                    { id: 1, name: 'United States' },
-                    { id: 2, name: 'United Kingdom' },
-                    { id: 3, name: 'Japan' },
-                    { id: 4, name: 'Canada'},
-                    { id: 5, name: '...'},
-
-                    { id: 6, name: '/home' },
-                    { id: 7, name: '/market' },
-                    { id: 8, name: '/about' },
-                    { id: 9, name: '/contacts' },
-                    { id: 10, name: '(> 100 more pages)'},
-
-                    { id: 11, name: '/sign-in' },
-                    { id: 12, name: '/basket' },
-                    { id: 13, name: '/profile' },
-                    { id: 14, name: '/sales' },
-                    { id: 15, name: '(> 100 more pages)'},
-                ],
+                nodes: [],
                 links: [],
                 exits: []
             };
         },
         computed: {
             width () {
-                return this.nodes.length / 5 * 400;
+                return Math.max(this.nodes.length / 5 * 400, 1200);
             }
         },
+        created() {
+            this.seed();
+            this.parseVisitorsFlowData();
+        },
         mounted() {
             this.drawDiagram();
         },
         methods: {
-            createLinks () {
+            seed () {
+                this.visitorsFlowData = {
+                    "parameter_views": [
+                        {
+                            "title": "Safari",
+                            "count": 3
+                        },
+                        {
+                            "title": "IE",
+                            "count": 2
+                        }
+                    ],
+                    "visitors_flow": [
+                        {
+                            "parameter": "Safari",
+                            "target_url": "https://localhost/a",
+                            "level": 1,
+                            "views": 1,
+                            "exit_count": 0,
+                            "source_url": "null"
+                        },
+                        {
+                            "parameter": "IE",
+                            "target_url": "https://localhost/a",
+                            "level": 1,
+                            "views": 1,
+                            "exit_count": 0,
+                            "source_url": "null"
+                        },
+                        {
+                            "parameter": "Opera",
+                            "target_url": "https://localhost/e",
+                            "level": 1,
+                            "views": 1,
+                            "exit_count": 0,
+                            "source_url": "null"
+                        },
+                        {
+                            "parameter": "Chrome",
+                            "target_url": "https://localhost/c",
+                            "level": 1,
+                            "views": 1,
+                            "exit_count": 0,
+                            "source_url": "null"
+                        },
+                        {
+                            "parameter": "Other",
+                            "target_url": "https://localhost/d",
+                            "level": 1,
+                            "views": 1,
+                            "exit_count": 0,
+                            "source_url": "null"
+                        },
+                        {
+                            "parameter": "Safari",
+                            "target_url": "https://localhost/b",
+                            "level": 2,
+                            "views": 1,
+                            "exit_count": 0,
+                            "source_url": "https://localhost/a"
+                        },
+                        {
+                            "parameter": "IE",
+                            "target_url": "https://localhost/b",
+                            "level": 2,
+                            "views": 1,
+                            "exit_count": 1,
+                            "source_url": "https://localhost/a"
+                        }
+                    ]
+                };
+            },
+            parseVisitorsFlowData () {
+                let nodes = [];
                 let links = [];
-                let lastNodeId = this.nodes.slice(-1)[0].id;
+                let exits = [];
 
-                for (let coef = 1, sourceInd = 0; sourceInd < lastNodeId - 5; sourceInd++) {
-                    let sourceId = this.nodes[sourceInd].id;
+                let visitorsFlow = this.visitorsFlowData.visitors_flow;
 
-                    for (let targetInd = 0; targetInd < 5; targetInd++) {
-                        let targetId = this.nodes[targetInd + 5 * coef].id;
-                        let value = Math.floor(Math.random() * Math.floor(100));
-                        let link = { source: sourceId, target: targetId, value: value };
-                        links.push(link);
-                    }
+                for (let key in visitorsFlow) {
+                    let visitorFlowItem = visitorsFlow[key];
+
+                    let sourceId = this.findOrCreateSource(visitorFlowItem, nodes);
+                    let targetId = this.findOrCreateTarget(visitorFlowItem, nodes);
 
-                    if (sourceId % 5 === 0) {
-                        coef++;
+                    this.findOrCreateLink(visitorFlowItem, links, sourceId, targetId);
+                    this.findOrCreateExit(visitorFlowItem, exits, sourceId);
+                }
+
+                this.nodes = [...this.nodes, ...nodes];
+                this.links = [...this.links, ...links];
+                this.exits = [...this.exits, ...exits];
+            },
+
+            findOrCreateSource (visitorsFlowItem, nodes ) {
+                let source = nodes.find(node => {
+                    let source;
+                    if (visitorsFlowItem.level === 1) {
+                        source = visitorsFlowItem.parameter === node.name;
+                    } else {
+                        source = visitorsFlowItem.source_url === node.name;
                     }
+                    return source && node.level === visitorsFlowItem.level;
+                });
+
+                if (source) {
+                    return source.id;
+                }
+
+                let sourceId;
+                if (nodes.length === 0) {
+                    sourceId = 1;
+                } else {
+                    sourceId = nodes[nodes.length - 1].id + 1;
+                }
+
+                if (visitorsFlowItem.level === 1) {
+                    nodes.push({
+                        id: sourceId,
+                        name: visitorsFlowItem.parameter,
+                        level: visitorsFlowItem.level
+                    });
+                } else {
+                    nodes.push({
+                        id: sourceId,
+                        name: visitorsFlowItem.source_url,
+                        level: visitorsFlowItem.level
+                    });
                 }
 
-                this.links = links;
+                return sourceId;
             },
 
-            createExits () {
-                let lastNodeId = this.nodes.slice(-1)[0].id;
-                let exits = [];
+            findOrCreateTarget (visitorsFlowItem, nodes) {
+                let target = nodes.find(node => {
+                    return visitorsFlowItem.target_url === node.name && node.level === visitorsFlowItem.level + 1;
+                });
 
-                for (let sourceInd = 5; sourceInd < lastNodeId; sourceInd++) {
-                    let sourceId = this.nodes[sourceInd].id;
-                    let value = Math.floor(Math.random() * 50);
-                    let exit = { source: sourceId, value: value, index: sourceId - 1 };
-                    exits.push(exit);
+                if (target) {
+                    return target.id;
                 }
 
-                this.exits = exits;
+                let targetId = nodes[nodes.length - 1].id + 1;
+
+                nodes.push({
+                    id: targetId,
+                    name: visitorsFlowItem.target_url,
+                    level: visitorsFlowItem.level + 1
+                });
+
+                return targetId;
+            },
+
+            findOrCreateLink (visitorsFlowItem, links, sourceId, targetId) {
+                let linkIndex = links.findIndex(link => {
+                    return link.level === visitorsFlowItem.level && // level condition is redundant?
+                        link.source === sourceId &&
+                        link.target === targetId;
+                });
+
+                if (linkIndex !== -1) {
+                    links[linkIndex].value += visitorsFlowItem.views;
+                    return links[linkIndex].id;
+                }
+
+                links.push({
+                    source: sourceId,
+                    target: targetId,
+                    value: visitorsFlowItem.views,
+                    level: visitorsFlowItem.level
+                });
+
+                return links.length - 1;
+            },
+
+            findOrCreateExit (visitorsFlowItem, exits, sourceId) {
+                let exitIndex = exits.findIndex(exit => exit.source === sourceId);
+
+                if (exitIndex !== -1) {
+                    exits[exitIndex].value += visitorsFlowItem.exit_count;
+                    return exits[exitIndex].id;
+                }
+
+                exits.push({
+                    source: sourceId,
+                    value: visitorsFlowItem.exit_count,
+                    index: sourceId - 1
+                });
+
+                return exits.length - 1;
             },
 
             addInteraction () {
@@ -132,14 +275,12 @@
                 d3.select('.diagram-tooltip')
                     .remove();
 
-                this.createLinks();
-                this.createExits();
-
                 const _sankey = sankey()
                     .nodeSort(null)
                     .nodeWidth(160)
                     .nodeId(d => d.id)
                     .nodePadding(10)
+                    .nodeAlign(sankeyLeft)
                     .extent([
                         [1, 1],
                         [this.width - 1, this.height - 5]
diff --git a/frontend/src/pages/VisitorsFlow.vue b/frontend/src/pages/VisitorsFlow.vue
index 43f1fde8..7bcee0ec 100644
--- a/frontend/src/pages/VisitorsFlow.vue
+++ b/frontend/src/pages/VisitorsFlow.vue
@@ -8,9 +8,7 @@
         <VisitorsFlowDropdown
             :value="getSelectedParameter"
         />
-        <VisitorsFlowDiagram
-            :visitors-flow-data="getVisitorsFlow"
-        />
+        <VisitorsFlowDiagram />
     </ContentLayout>
 </template>
 

From 22f0f9ae7fd2a88d64798ee260358cb8193a2dd8 Mon Sep 17 00:00:00 2001
From: Serhii Plotnikov <serhiiplotnikov1934@gmail.com>
Date: Wed, 11 Sep 2019 17:27:48 +0300
Subject: [PATCH 167/183] add handling of invalid token

---
 .../src/components/auth/ChangePasswordFrom.vue     | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/auth/ChangePasswordFrom.vue b/frontend/src/components/auth/ChangePasswordFrom.vue
index 70148222..0f2e30ec 100644
--- a/frontend/src/components/auth/ChangePasswordFrom.vue
+++ b/frontend/src/components/auth/ChangePasswordFrom.vue
@@ -93,8 +93,17 @@
             };
         },
         created() {
-            if (jwtService.checkExpireToken(this.$route.query.token)) {
-                this.showErrorMessage('Sorry, your token was expired. Please, enter your email again.');
+            try {
+                if (!this.$route.query.token) {
+                    this.showErrorMessage('Sorry, your token is absent');
+                    this.$router.push({name: 'reset-password'});
+                }
+                if (jwtService.checkExpireToken(this.$route.query.token)) {
+                    this.showErrorMessage('Sorry, your token was expired. Please, enter your email again.');
+                    this.$router.push({name: 'reset-password'});
+                }
+            }catch (e) {
+                this.showErrorMessage('Sorry, your token is invalid.');
                 this.$router.push({name: 'reset-password'});
             }
         },
@@ -114,7 +123,6 @@
                     this.$router.push({name: 'login'});
                 }).catch(error => {
                     this.showErrorMessage(_.get(error, 'response.data.error.message'));
-                    this.$router.push({name: 'login'});
                 });
             }
         },

From 9d7979259e1e079176441fcb9981be1b5de1e3e8 Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Wed, 11 Sep 2019 17:54:02 +0300
Subject: [PATCH 168/183] add real data and component for no data case

---
 .../api/visitors_flow/visitorsFlowService.js  |  2 +-
 .../dashboard/visitors_flow/NoData.vue        | 24 +++++
 .../visitors_flow/VisitorsFlowDiagram.vue     | 88 ++-----------------
 frontend/src/pages/VisitorsFlow.vue           | 15 +++-
 4 files changed, 42 insertions(+), 87 deletions(-)
 create mode 100644 frontend/src/components/dashboard/visitors_flow/NoData.vue

diff --git a/frontend/src/api/visitors_flow/visitorsFlowService.js b/frontend/src/api/visitors_flow/visitorsFlowService.js
index 8a60b6c3..3941c9ec 100644
--- a/frontend/src/api/visitors_flow/visitorsFlowService.js
+++ b/frontend/src/api/visitors_flow/visitorsFlowService.js
@@ -8,7 +8,7 @@ const getVisitorsFlow = (filter, level) => requestService.get(resourceUrl, {}, {
     'filter': filter,
     'level': level
 })
-    .then(response => response.data)
+    .then(response => response.data.visitors_flow)
     .catch(error => Promise.reject(
         new Error(
             _.get(
diff --git a/frontend/src/components/dashboard/visitors_flow/NoData.vue b/frontend/src/components/dashboard/visitors_flow/NoData.vue
new file mode 100644
index 00000000..b5096184
--- /dev/null
+++ b/frontend/src/components/dashboard/visitors_flow/NoData.vue
@@ -0,0 +1,24 @@
+<template>
+    <VCardTitle
+        primary-title
+        class="grey--text"
+    >
+        There is no data to display!
+    </VCardTitle>
+</template>
+
+<script>
+    export default {
+        name: "NoData"
+    };
+</script>
+
+<style lang="scss" scoped>
+    .v-card__title {
+        display: flex;
+        height: calc(50vh - 1.5rem);
+        justify-content: center;
+        align-content: center;
+        padding: 0;
+    }
+</style>
\ No newline at end of file
diff --git a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
index faca0785..a1c17083 100644
--- a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
+++ b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
@@ -26,15 +26,14 @@
 
     export default {
         name: "VisitorsFlowDiagram",
-        /*props: {
+        props: {
             visitorsFlowData: {
-                type: Object,
-                required: false
+                type: Array,
+                required: true
             }
-        },*/
+        },
         data () {
             return {
-                visitorsFlowData: {},
                 titles: [
                     'Starting pages',
                     '1st Interaction',
@@ -53,92 +52,17 @@
                 return Math.max(this.nodes.length / 5 * 400, 1200);
             }
         },
-        created() {
-            this.seed();
-            this.parseVisitorsFlowData();
-        },
         mounted() {
+            this.parseVisitorsFlowData();
             this.drawDiagram();
         },
         methods: {
-            seed () {
-                this.visitorsFlowData = {
-                    "parameter_views": [
-                        {
-                            "title": "Safari",
-                            "count": 3
-                        },
-                        {
-                            "title": "IE",
-                            "count": 2
-                        }
-                    ],
-                    "visitors_flow": [
-                        {
-                            "parameter": "Safari",
-                            "target_url": "https://localhost/a",
-                            "level": 1,
-                            "views": 1,
-                            "exit_count": 0,
-                            "source_url": "null"
-                        },
-                        {
-                            "parameter": "IE",
-                            "target_url": "https://localhost/a",
-                            "level": 1,
-                            "views": 1,
-                            "exit_count": 0,
-                            "source_url": "null"
-                        },
-                        {
-                            "parameter": "Opera",
-                            "target_url": "https://localhost/e",
-                            "level": 1,
-                            "views": 1,
-                            "exit_count": 0,
-                            "source_url": "null"
-                        },
-                        {
-                            "parameter": "Chrome",
-                            "target_url": "https://localhost/c",
-                            "level": 1,
-                            "views": 1,
-                            "exit_count": 0,
-                            "source_url": "null"
-                        },
-                        {
-                            "parameter": "Other",
-                            "target_url": "https://localhost/d",
-                            "level": 1,
-                            "views": 1,
-                            "exit_count": 0,
-                            "source_url": "null"
-                        },
-                        {
-                            "parameter": "Safari",
-                            "target_url": "https://localhost/b",
-                            "level": 2,
-                            "views": 1,
-                            "exit_count": 0,
-                            "source_url": "https://localhost/a"
-                        },
-                        {
-                            "parameter": "IE",
-                            "target_url": "https://localhost/b",
-                            "level": 2,
-                            "views": 1,
-                            "exit_count": 1,
-                            "source_url": "https://localhost/a"
-                        }
-                    ]
-                };
-            },
             parseVisitorsFlowData () {
                 let nodes = [];
                 let links = [];
                 let exits = [];
 
-                let visitorsFlow = this.visitorsFlowData.visitors_flow;
+                let visitorsFlow = this.visitorsFlowData;
 
                 for (let key in visitorsFlow) {
                     let visitorFlowItem = visitorsFlow[key];
diff --git a/frontend/src/pages/VisitorsFlow.vue b/frontend/src/pages/VisitorsFlow.vue
index 7bcee0ec..409e3c65 100644
--- a/frontend/src/pages/VisitorsFlow.vue
+++ b/frontend/src/pages/VisitorsFlow.vue
@@ -5,10 +5,15 @@
         <Spinner
             v-if="isFetching"
         />
-        <VisitorsFlowDropdown
-            :value="getSelectedParameter"
-        />
-        <VisitorsFlowDiagram />
+        <template v-if="getVisitorsFlow.length !== 0">
+            <VisitorsFlowDropdown
+                :value="getSelectedParameter"
+            />
+            <VisitorsFlowDiagram
+                :visitors-flow-data="getVisitorsFlow"
+            />
+        </template>
+        <NoData v-else />
     </ContentLayout>
 </template>
 
@@ -16,6 +21,7 @@
     import ContentLayout from '@/components/layout/ContentLayout.vue';
     import VisitorsFlowDiagram from "@/components/dashboard/visitors_flow/VisitorsFlowDiagram";
     import VisitorsFlowDropdown from "@/components/dashboard/visitors_flow/VisitorsFlowDropdown";
+    import NoData from "@/components/dashboard/visitors_flow/NoData";
     import Spinner from "@/components/utilites/Spinner";
     import { mapGetters, mapActions } from 'vuex';
     import {
@@ -35,6 +41,7 @@
             ContentLayout,
             VisitorsFlowDiagram,
             VisitorsFlowDropdown,
+            NoData,
             Spinner
         },
         data () {

From f866c7a2f8a16094c4c086422848897d8936e305 Mon Sep 17 00:00:00 2001
From: Volodymyr <tumko.volodymyr@gmail.com>
Date: Wed, 11 Sep 2019 18:03:54 +0300
Subject: [PATCH 169/183] fix date condition in selecting active session

---
 backend/app/Repositories/EloquentSessionRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/app/Repositories/EloquentSessionRepository.php b/backend/app/Repositories/EloquentSessionRepository.php
index 5fdbe154..f368545a 100644
--- a/backend/app/Repositories/EloquentSessionRepository.php
+++ b/backend/app/Repositories/EloquentSessionRepository.php
@@ -47,7 +47,7 @@ public function getAvgSession(AverageSessionFilter $filter): Collection
     public function lastActiveByVisitorId(int $visitorId): ?Session
     {
         return Session::whereVisitorId($visitorId)
-            ->whereTime('end_session', '>', (Carbon::now())->subMinutes(30)->toDateTimeString())->first();
+            ->where('end_session', '>', (Carbon::now())->subMinutes(30))->first();
     }
 
     public function updateEndSession(Session $session): void

From 0d96fbc3947a29fcb10c8299a0f9abd8ed16641c Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Wed, 11 Sep 2019 18:29:30 +0300
Subject: [PATCH 170/183] make requests on dropdown changes

---
 .../dashboard/visitors_flow/VisitorsFlowDiagram.vue  | 12 +++++++++---
 .../dashboard/visitors_flow/VisitorsFlowDropdown.vue | 12 +++++++-----
 frontend/src/pages/VisitorsFlow.vue                  |  1 +
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
index a1c17083..b992ae3a 100644
--- a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
+++ b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
@@ -32,6 +32,12 @@
                 required: true
             }
         },
+        watch: {
+            visitorsFlowData: function () {
+                this.parseVisitorsFlowData();
+                this.drawDiagram();
+            }
+        },
         data () {
             return {
                 titles: [
@@ -74,9 +80,9 @@
                     this.findOrCreateExit(visitorFlowItem, exits, sourceId);
                 }
 
-                this.nodes = [...this.nodes, ...nodes];
-                this.links = [...this.links, ...links];
-                this.exits = [...this.exits, ...exits];
+                this.nodes = nodes;
+                this.links = links;
+                this.exits = exits;
             },
 
             findOrCreateSource (visitorsFlowItem, nodes ) {
diff --git a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDropdown.vue b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDropdown.vue
index 3e6d273a..d306c07b 100644
--- a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDropdown.vue
+++ b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDropdown.vue
@@ -23,16 +23,18 @@
         data () {
             return {
                 items: [
-                    {title: 'Country', value: 'country'},
-                    {title: 'Browser', value: 'browser'},
-                    {title: 'Device', value: 'device'},
-                    {title: 'Screen', value: 'screen'}
+                    { title: 'Country', value: 'country' },
+                    { title: 'Browser', value: 'browser' },
+                    { title: 'Device', value: 'device' },
+                    { title: 'Screen', value: 'screen' }
                 ]
             };
         },
         methods: {
             change(selectedItem) {
-                this.$emit("change", selectedItem);
+                if (this.value !== selectedItem.value) {
+                    this.$emit("change", selectedItem.value);
+                }
             }
         }
     };
diff --git a/frontend/src/pages/VisitorsFlow.vue b/frontend/src/pages/VisitorsFlow.vue
index 409e3c65..80b34f68 100644
--- a/frontend/src/pages/VisitorsFlow.vue
+++ b/frontend/src/pages/VisitorsFlow.vue
@@ -8,6 +8,7 @@
         <template v-if="getVisitorsFlow.length !== 0">
             <VisitorsFlowDropdown
                 :value="getSelectedParameter"
+                @change="changeSelectedParameter"
             />
             <VisitorsFlowDiagram
                 :visitors-flow-data="getVisitorsFlow"

From 71ab1619ecbab8a9d3421c9d1345bdd01374357a Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Wed, 11 Sep 2019 19:37:54 +0300
Subject: [PATCH 171/183] add data loading on 'add step' click

---
 .../visitors_flow/VisitorsFlowDiagram.vue     | 33 +++++++++++--------
 frontend/src/pages/VisitorsFlow.vue           | 16 +++++++--
 .../store/modules/visitors_flow/actions.js    | 21 ++++++++++--
 .../store/modules/visitors_flow/mutations.js  |  4 +++
 .../modules/visitors_flow/types/actions.js    |  4 ++-
 .../modules/visitors_flow/types/mutations.js  |  1 +
 6 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
index b992ae3a..df811cfc 100644
--- a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
+++ b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
@@ -4,6 +4,7 @@
         <svg id="visitors-flow-diagram" />
         <div class="step">
             <button
+                :disabled="addInteractionDisabled"
                 class="step-button"
                 @click="addInteraction"
             >
@@ -30,10 +31,16 @@
             visitorsFlowData: {
                 type: Array,
                 required: true
+            },
+            currentLevel: {
+                type: Number,
+                required: true
             }
         },
         watch: {
             visitorsFlowData: function () {
+                this.addInteractionDisabled = this.lastLevel === this.currentLevel;
+                this.lastLevel = this.currentLevel;
                 this.parseVisitorsFlowData();
                 this.drawDiagram();
             }
@@ -48,9 +55,11 @@
                 ],
                 height: 600,
                 tooltip: {},
+                lastLevel: 0,
                 nodes: [],
                 links: [],
-                exits: []
+                exits: [],
+                addInteractionDisabled: false
             };
         },
         computed: {
@@ -80,6 +89,8 @@
                     this.findOrCreateExit(visitorFlowItem, exits, sourceId);
                 }
 
+                this.lastLevel = nodes[nodes.length - 1].level;
+
                 this.nodes = nodes;
                 this.links = links;
                 this.exits = exits;
@@ -184,19 +195,7 @@
             },
 
             addInteraction () {
-                let lastNodeId = this.nodes.slice(-1)[0].id;
-
-                for (let i = lastNodeId + 1; i < lastNodeId + 6; i++) {
-                    this.nodes.push({ id: i, name: `/link${i}`});
-                }
-
-                this.drawDiagram();
-
-                d3.transition()
-                    .select('#visitors-flow-container')
-                    .tween("scroll", function () {
-                        this.scrollLeft += this.scrollWidth;
-                    });
+                this.$emit("add-interaction", this.lastLevel);
             },
 
             drawDiagram () {
@@ -521,6 +520,12 @@
                         color: #4061de;
                     }
                 }
+
+                &:disabled {
+                    .step-arrow {
+                        color: #afafaf;
+                    }
+                }
             }
         }
     }
diff --git a/frontend/src/pages/VisitorsFlow.vue b/frontend/src/pages/VisitorsFlow.vue
index 80b34f68..99817b39 100644
--- a/frontend/src/pages/VisitorsFlow.vue
+++ b/frontend/src/pages/VisitorsFlow.vue
@@ -12,6 +12,8 @@
             />
             <VisitorsFlowDiagram
                 :visitors-flow-data="getVisitorsFlow"
+                :current-level="getCurrentLevel"
+                @add-interaction="addInteraction"
             />
         </template>
         <NoData v-else />
@@ -33,7 +35,9 @@
     } from "@/store/modules/visitors_flow/types/getters";
     import {
         CHANGE_SELECTED_PARAMETER,
-        FETCH_VISITORS_FLOW
+        CHANGE_CURRENT_LEVEL,
+        FETCH_AND_SET_VISITORS_FLOW,
+        FETCH_AND_PUSH_VISITORS_FLOW
     } from "@/store/modules/visitors_flow/types/actions";
 
     export default {
@@ -59,13 +63,19 @@
             })
         },
         created() {
-            this.fetchVisitorsFlow();
+            this.fetchAndSetVisitorsFlow();
         },
         methods: {
             ...mapActions('visitors_flow', {
                 changeSelectedParameter: CHANGE_SELECTED_PARAMETER,
-                fetchVisitorsFlow: FETCH_VISITORS_FLOW
+                changeCurrentLevel: CHANGE_CURRENT_LEVEL,
+                fetchAndSetVisitorsFlow: FETCH_AND_SET_VISITORS_FLOW,
+                fetchAndPushVisitorsFlow: FETCH_AND_PUSH_VISITORS_FLOW
             }),
+            addInteraction (level) {
+                this.changeCurrentLevel(level);
+                this.fetchAndPushVisitorsFlow();
+            }
         }
     };
 </script>
diff --git a/frontend/src/store/modules/visitors_flow/actions.js b/frontend/src/store/modules/visitors_flow/actions.js
index 0f48e365..23f6f51d 100644
--- a/frontend/src/store/modules/visitors_flow/actions.js
+++ b/frontend/src/store/modules/visitors_flow/actions.js
@@ -1,10 +1,14 @@
 import {
     CHANGE_SELECTED_PARAMETER,
-    FETCH_VISITORS_FLOW
+    CHANGE_CURRENT_LEVEL,
+    FETCH_AND_SET_VISITORS_FLOW,
+    FETCH_AND_PUSH_VISITORS_FLOW
 } from "./types/actions";
 import {
     SET_SELECTED_PARAMETER,
+    SET_CURRENT_LEVEL,
     SET_VISITORS_FLOW,
+    PUSH_VISITORS_FLOW,
     SET_IS_FETCHING,
     RESET_IS_FETCHING
 } from "./types/mutations";
@@ -13,13 +17,24 @@ import { getVisitorsFlow } from '@/api/visitors_flow/visitorsFlowService';
 export default {
     [CHANGE_SELECTED_PARAMETER]: (context, parameter) => {
         context.commit(SET_SELECTED_PARAMETER, parameter);
-        context.dispatch(FETCH_VISITORS_FLOW);
+        context.dispatch(CHANGE_CURRENT_LEVEL, 0);
+        context.dispatch(FETCH_AND_SET_VISITORS_FLOW);
     },
-    [FETCH_VISITORS_FLOW]: context => {
+    [CHANGE_CURRENT_LEVEL]: (context, level) => {
+        context.commit(SET_CURRENT_LEVEL, level);
+    },
+    [FETCH_AND_SET_VISITORS_FLOW]: context => {
         context.commit(SET_IS_FETCHING);
 
         return getVisitorsFlow(context.state.selectedParameter, context.state.currentLevel)
             .then(visitorsFlow => context.commit(SET_VISITORS_FLOW, visitorsFlow))
             .finally(() => context.commit(RESET_IS_FETCHING));
+    },
+    [FETCH_AND_PUSH_VISITORS_FLOW]: context => {
+        context.commit(SET_IS_FETCHING);
+
+        return getVisitorsFlow(context.state.selectedParameter, context.state.currentLevel)
+            .then(visitorsFlow => context.commit(PUSH_VISITORS_FLOW, visitorsFlow))
+            .finally(() => context.commit(RESET_IS_FETCHING));
     }
 };
diff --git a/frontend/src/store/modules/visitors_flow/mutations.js b/frontend/src/store/modules/visitors_flow/mutations.js
index afe49819..75cbcc13 100644
--- a/frontend/src/store/modules/visitors_flow/mutations.js
+++ b/frontend/src/store/modules/visitors_flow/mutations.js
@@ -2,6 +2,7 @@ import {
     SET_SELECTED_PARAMETER,
     SET_CURRENT_LEVEL,
     SET_VISITORS_FLOW,
+    PUSH_VISITORS_FLOW,
     SET_IS_FETCHING,
     RESET_IS_FETCHING
 } from "./types/mutations";
@@ -16,6 +17,9 @@ export default {
     [SET_VISITORS_FLOW]: (state, visitorsFlow) => {
         state.visitorsFlow.items = visitorsFlow;
     },
+    [PUSH_VISITORS_FLOW]: (state, visitorsFlow) => {
+        state.visitorsFlow.items = [...state.visitorsFlow.items, ...visitorsFlow];
+    },
     [SET_IS_FETCHING]: (state) => {
         state.visitorsFlow.isFetching = true;
     },
diff --git a/frontend/src/store/modules/visitors_flow/types/actions.js b/frontend/src/store/modules/visitors_flow/types/actions.js
index 67c04eda..6094be7a 100644
--- a/frontend/src/store/modules/visitors_flow/types/actions.js
+++ b/frontend/src/store/modules/visitors_flow/types/actions.js
@@ -1,2 +1,4 @@
 export const CHANGE_SELECTED_PARAMETER = 'changeSelectedParameter';
-export const FETCH_VISITORS_FLOW = 'fetchVisitorsFlow';
+export const CHANGE_CURRENT_LEVEL = 'changeCurrentLevel';
+export const FETCH_AND_SET_VISITORS_FLOW = 'fetchAndSetVisitorsFlow';
+export const FETCH_AND_PUSH_VISITORS_FLOW = 'fetchAndPushVisitorsFlow';
diff --git a/frontend/src/store/modules/visitors_flow/types/mutations.js b/frontend/src/store/modules/visitors_flow/types/mutations.js
index 51002dd7..c6494d2c 100644
--- a/frontend/src/store/modules/visitors_flow/types/mutations.js
+++ b/frontend/src/store/modules/visitors_flow/types/mutations.js
@@ -1,5 +1,6 @@
 export const SET_SELECTED_PARAMETER = 'setSelectedParameter';
 export const SET_CURRENT_LEVEL = 'setCurrentLevel';
 export const SET_VISITORS_FLOW = 'setVisitorsFlow';
+export const PUSH_VISITORS_FLOW = 'pushVisitorsFlow';
 export const SET_IS_FETCHING = 'setIsFetching';
 export const RESET_IS_FETCHING = 'resetIsFetching';

From 278f7b4b560aff62fea1cc9ddede3fa015ae4cb9 Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Wed, 11 Sep 2019 20:11:03 +0300
Subject: [PATCH 172/183] add limit number of values in column

---
 .../visitors_flow/VisitorsFlowDiagram.vue       | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
index df811cfc..acebc0e8 100644
--- a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
+++ b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
@@ -118,6 +118,21 @@
                     sourceId = nodes[nodes.length - 1].id + 1;
                 }
 
+                let column = nodes.filter(node => node.level === visitorsFlowItem.level);
+
+                if (column.length === 4) {
+                    nodes.push({
+                        id: sourceId,
+                        name: '...',
+                        level: visitorsFlowItem.level
+                    });
+                    return sourceId;
+                }
+
+                if (column.length > 4) {
+                    return column[column.length - 1].id;
+                }
+
                 if (visitorsFlowItem.level === 1) {
                     nodes.push({
                         id: sourceId,
@@ -272,7 +287,7 @@
                     .attr("id", d => `link-${d.index}`)
                     .attr("stroke", '#829afa')
                     .attr("stroke-opacity", ".5")
-                    .attr("stroke-width", d => Math.max(1, d.width))
+                    .attr("stroke-width", d => Math.max(1, d.width / 1.5))
                     .on("mouseover", (d, i, links) => {
                         tooltip.text(`${d.source.name} → ${d.target.name}, ${d.value}`)
                             .style("visibility", "visible");

From 4486a885aa7a43b3cb57670f4e36a9f48699a1d1 Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Wed, 11 Sep 2019 20:36:42 +0300
Subject: [PATCH 173/183] fix column titles

---
 .../dashboard/visitors_flow/VisitorsFlowDiagram.vue    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
index acebc0e8..a7ab6251 100644
--- a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
+++ b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
@@ -91,6 +91,8 @@
 
                 this.lastLevel = nodes[nodes.length - 1].level;
 
+                nodes = nodes.sort((a, b) => a.level - b.level);
+
                 this.nodes = nodes;
                 this.links = links;
                 this.exits = exits;
@@ -382,8 +384,8 @@
 
                 svg.append("g")
                     .selectAll("rect")
-                    .data(nodes.filter((node) => {
-                        return node.id !== 5 && node.id % 5 === 0;
+                    .data(nodes.filter((node, i, nodes) => {
+                        return nodes[i - 1] && node.level !== 1 && node.level !== nodes[i - 1].level;
                     }))
                     .join("text")
                     .attr("x", d => d.x1 - 80)
@@ -391,8 +393,8 @@
                     .attr("class", "title")
                     .attr("text-anchor", "middle")
                     .text((d) => {
-                        if (this.titles[d.depth]) {
-                            return this.titles[d.depth];
+                        if (this.titles[d.depth - 1]) {
+                            return this.titles[d.depth - 1];
                         }
                         return `${[d.depth]}th Interaction`;
                     });

From 05fb665e0d871030e4eac7a6d8232b5fa34a7f00 Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Wed, 11 Sep 2019 20:44:32 +0300
Subject: [PATCH 174/183] fix urls in columns

---
 .../dashboard/visitors_flow/VisitorsFlowDiagram.vue    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
index a7ab6251..6ebde36e 100644
--- a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
+++ b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
@@ -104,7 +104,7 @@
                     if (visitorsFlowItem.level === 1) {
                         source = visitorsFlowItem.parameter === node.name;
                     } else {
-                        source = visitorsFlowItem.source_url === node.name;
+                        source = new URL(visitorsFlowItem.source_url).pathname === node.name;
                     }
                     return source && node.level === visitorsFlowItem.level;
                 });
@@ -144,7 +144,7 @@
                 } else {
                     nodes.push({
                         id: sourceId,
-                        name: visitorsFlowItem.source_url,
+                        name: new URL(visitorsFlowItem.source_url).pathname,
                         level: visitorsFlowItem.level
                     });
                 }
@@ -153,8 +153,10 @@
             },
 
             findOrCreateTarget (visitorsFlowItem, nodes) {
+                const urlPath = new URL(visitorsFlowItem.target_url).pathname;
+
                 let target = nodes.find(node => {
-                    return visitorsFlowItem.target_url === node.name && node.level === visitorsFlowItem.level + 1;
+                    return urlPath === node.name && node.level === visitorsFlowItem.level + 1;
                 });
 
                 if (target) {
@@ -165,7 +167,7 @@
 
                 nodes.push({
                     id: targetId,
-                    name: visitorsFlowItem.target_url,
+                    name: urlPath,
                     level: visitorsFlowItem.level + 1
                 });
 

From 5ae64e7f4bfde3db1fec612e64b05c29065e8907 Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Wed, 11 Sep 2019 20:56:53 +0300
Subject: [PATCH 175/183] fix exits lines width

---
 .../dashboard/visitors_flow/VisitorsFlowDiagram.vue         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
index 6ebde36e..6c9c0aa8 100644
--- a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
+++ b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
@@ -320,6 +320,8 @@
                             .style("top", (d3.event.pageY - 40) + "px");
                     });
 
+                const widthCoef = links[0].width / links[0].value / 10;
+
                 svg.append("g")
                     .attr("fill", "none")
                     .selectAll("rect")
@@ -329,7 +331,7 @@
                         let node = nodes.find((node) => node.id === d.source);
 
                         let mx = node.x1;
-                        let my = node.y1 - d.value / 2 - 2;
+                        let my = node.y1 - d.value * widthCoef / 2 - 2;
 
                         return `M ${mx} ${my} a 25 40 0 0 1 25 40`;
                     })
@@ -337,7 +339,7 @@
                     .attr("id", d => `exit-${d.index}`)
                     .attr("stroke", "#fa514a")
                     .attr("stroke-opacity", ".5")
-                    .attr("stroke-width", d => d.value)
+                    .attr("stroke-width", d => d.value * widthCoef)
                     .on("mouseover", (d, i, exits) => {
                         tooltip.text(`${d.value} drop-offs`)
                             .style("visibility", "visible");

From c0582f561f312ba475289d6cde62e77e81ae3f6f Mon Sep 17 00:00:00 2001
From: Volodymyr <tumko.volodymyr@gmail.com>
Date: Wed, 11 Sep 2019 21:13:08 +0300
Subject: [PATCH 176/183] show avg time in minutes on line chart

---
 frontend/src/api/page_views/averageTimeService.js   | 4 ++--
 frontend/src/api/transformers.js                    | 6 +++---
 frontend/src/api/visitors/averageSessionsService.js | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/api/page_views/averageTimeService.js b/frontend/src/api/page_views/averageTimeService.js
index 0a44064a..11dbfd73 100644
--- a/frontend/src/api/page_views/averageTimeService.js
+++ b/frontend/src/api/page_views/averageTimeService.js
@@ -1,6 +1,6 @@
 import config from "@/config";
 import requestService from "../../services/requestService";
-import {buttonTransformerToTime, chartTransformerToInt} from "../transformers";
+import {buttonTransformerToTime, chartTransformerToMinutes} from "../transformers";
 import _ from "lodash";
 
 const resourceUrl = config.getApiUrl();
@@ -26,7 +26,7 @@ const fetchChartValues = (startDate, endDate, interval) => {
         'filter[startDate]': startDate,
         'filter[endDate]': endDate,
         'filter[period]': interval
-    }).then(response => response.data.map(chartTransformerToInt))
+    }).then(response => response.data.map(chartTransformerToMinutes))
         .catch(error => Promise.reject(
             new Error(
                 _.get(
diff --git a/frontend/src/api/transformers.js b/frontend/src/api/transformers.js
index 97961c56..c3ed629b 100644
--- a/frontend/src/api/transformers.js
+++ b/frontend/src/api/transformers.js
@@ -23,10 +23,10 @@ const chartTransformer = (item) => {
     };
 };
 
-const chartTransformerToInt = (item) => {
+const chartTransformerToMinutes = (item) => {
     return {
         date: item.date,
-        value: parseInt(item.value)
+        value: parseFloat(moment.utc(item.value*1000).format('mm.ss'))
     };
 };
 
@@ -86,7 +86,7 @@ export {
     buttonTransformerToTime,
     buttonTransformerToSeconds,
     chartTransformer,
-    chartTransformerToInt,
+    chartTransformerToMinutes,
     chartTransformerToPercent,
     chartTransformerToSeconds,
     tableTransformer,
diff --git a/frontend/src/api/visitors/averageSessionsService.js b/frontend/src/api/visitors/averageSessionsService.js
index c88b37d7..2c3c913b 100644
--- a/frontend/src/api/visitors/averageSessionsService.js
+++ b/frontend/src/api/visitors/averageSessionsService.js
@@ -1,6 +1,6 @@
 import requestService from "@/services/requestService";
 import config from "@/config";
-import {buttonTransformer, tableTransformer, chartTransformerToInt} from '../transformers';
+import {buttonTransformer, tableTransformer, chartTransformerToMinutes} from '../transformers';
 import _ from "lodash";
 
 const resourceUrl = config.getApiUrl();
@@ -26,7 +26,7 @@ const fetchChartValues = (startDate, endDate, interval) => {
         'filter[startDate]': startDate,
         'filter[endDate]': endDate,
         'filter[period]': interval
-    }).then(response => response.data.map(chartTransformerToInt))
+    }).then(response => response.data.map(chartTransformerToMinutes))
         .catch(error => Promise.reject(
             new Error(
                 _.get(

From e9207851a097cf2308902cece5181331b03db2ff Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Wed, 11 Sep 2019 21:17:52 +0300
Subject: [PATCH 177/183] minor fixes

---
 .../visitors_flow/VisitorsFlowDiagram.vue     | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
index 6c9c0aa8..c0fe570c 100644
--- a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
+++ b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
@@ -91,8 +91,6 @@
 
                 this.lastLevel = nodes[nodes.length - 1].level;
 
-                nodes = nodes.sort((a, b) => a.level - b.level);
-
                 this.nodes = nodes;
                 this.links = links;
                 this.exits = exits;
@@ -176,9 +174,7 @@
 
             findOrCreateLink (visitorsFlowItem, links, sourceId, targetId) {
                 let linkIndex = links.findIndex(link => {
-                    return link.level === visitorsFlowItem.level && // level condition is redundant?
-                        link.source === sourceId &&
-                        link.target === targetId;
+                    return link.source === sourceId && link.target === targetId;
                 });
 
                 if (linkIndex !== -1) {
@@ -335,7 +331,7 @@
 
                         return `M ${mx} ${my} a 25 40 0 0 1 25 40`;
                     })
-                    .attr("class", "exits")
+                    .attr("class", "exit")
                     .attr("id", d => `exit-${d.index}`)
                     .attr("stroke", "#fa514a")
                     .attr("stroke-opacity", ".5")
@@ -388,8 +384,9 @@
 
                 svg.append("g")
                     .selectAll("rect")
-                    .data(nodes.filter((node, i, nodes) => {
-                        return nodes[i - 1] && node.level !== 1 && node.level !== nodes[i - 1].level;
+                    .data(nodes.filter((node, index, nodes) => {
+                        return node.level !== 1 &&
+                            nodes.map(anotherNode => anotherNode.level).indexOf(node.level) === index;
                     }))
                     .join("text")
                     .attr("x", d => d.x1 - 80)
@@ -457,16 +454,16 @@
         margin-top: 1rem;
 
         &::-webkit-scrollbar {
-            background-color:#fff;
+            background-color:#f5f8fd;
             width:16px
         }
 
         &::-webkit-scrollbar-track {
-             background-color:#fff
+             background-color:#f5f8fd
         }
 
         &::-webkit-scrollbar-track:hover {
-            background-color:#f4f4f4
+            background-color:#f5f8fd
         }
 
         &::-webkit-scrollbar-thumb {
@@ -485,7 +482,7 @@
         }
 
         #visitors-flow-diagram {
-            .link {
+            .link, .exit, .node {
                 transition: all .4s;
                 cursor: pointer;
             }
@@ -494,11 +491,6 @@
                 font-size: 1rem;
             }
 
-            .node {
-                transition: all .4s;
-                cursor: pointer;
-            }
-
             .node-text {
                 cursor: pointer;
             }

From ce8653c957f26279ec83ed2ad56c1fe6bc1aa206 Mon Sep 17 00:00:00 2001
From: naytis <binaural.omega@gmail.com>
Date: Wed, 11 Sep 2019 22:14:33 +0300
Subject: [PATCH 178/183] fix urls

---
 .../dashboard/visitors_flow/VisitorsFlowDiagram.vue    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
index c0fe570c..722eebb9 100644
--- a/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
+++ b/frontend/src/components/dashboard/visitors_flow/VisitorsFlowDiagram.vue
@@ -102,7 +102,7 @@
                     if (visitorsFlowItem.level === 1) {
                         source = visitorsFlowItem.parameter === node.name;
                     } else {
-                        source = new URL(visitorsFlowItem.source_url).pathname === node.name;
+                        source = visitorsFlowItem.source_url === node.name;
                     }
                     return source && node.level === visitorsFlowItem.level;
                 });
@@ -142,7 +142,7 @@
                 } else {
                     nodes.push({
                         id: sourceId,
-                        name: new URL(visitorsFlowItem.source_url).pathname,
+                        name: visitorsFlowItem.source_url,
                         level: visitorsFlowItem.level
                     });
                 }
@@ -151,10 +151,8 @@
             },
 
             findOrCreateTarget (visitorsFlowItem, nodes) {
-                const urlPath = new URL(visitorsFlowItem.target_url).pathname;
-
                 let target = nodes.find(node => {
-                    return urlPath === node.name && node.level === visitorsFlowItem.level + 1;
+                    return visitorsFlowItem.target_url === node.name && node.level === visitorsFlowItem.level + 1;
                 });
 
                 if (target) {
@@ -165,7 +163,7 @@
 
                 nodes.push({
                     id: targetId,
-                    name: urlPath,
+                    name: visitorsFlowItem.target_url,
                     level: visitorsFlowItem.level + 1
                 });
 

From 95fa095c532a26595014b0b610ae333f0116c048 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Wed, 11 Sep 2019 15:27:17 +0300
Subject: [PATCH 179/183] modify pie chart

---
 frontend/src/components/common/PieChart.vue | 104 +++++++++-----------
 1 file changed, 47 insertions(+), 57 deletions(-)

diff --git a/frontend/src/components/common/PieChart.vue b/frontend/src/components/common/PieChart.vue
index a5b94023..0bb7b563 100644
--- a/frontend/src/components/common/PieChart.vue
+++ b/frontend/src/components/common/PieChart.vue
@@ -10,62 +10,53 @@
                 </VSubheader>
             </VCol>
         </VRow>
-        <VLayout
+        <VContainer
             class="pie-container position-relative"
             wrap
         >
-            <VFlex
-                lg4
-                md10
-                sm4
-                height="100%"
-                class="img-card chart-card"
-            >
-                <Spinner v-if="isFetching" />
-                <GChart
-                    type="PieChart"
-                    :data="chartData"
-                    :options="chartOptions"
-                />
-            </VFlex>
-            <VFlex
-                lg6
-                md10
-                sm6
-                height="100%"
-                class="img-card"
-            >
+            <VRow>
                 <VSubheader
                     v-text="legend.title"
-                    class="legend-title text-dark justify-content-center"
+                    class="legend-title grey--text text--darken-1 col-7 offset-5"
                 />
-                <VList>
-                    <VListItem
-                        v-for="visitor in legend.data"
-                        :key="visitor.title"
-                    >
-                        <VRow class="align-center justify-content-between">
+            </VRow>
+            <Spinner v-if="isFetching" />
+            <VRow>
+                <VCol class="col-5">
+                    <GChart
+                        type="PieChart"
+                        :data="chartData"
+                        :options="chartOptions"
+                    />
+                </VCol>
+                <VCol class="d-flex flex-column flex-grow-1 pl-4 justify-center">
+                    <VList>
+                        <VListItem
+                            class="justify-space-between align-center pa-0"
+                            v-for="visitor in legend.data"
+                            :key="visitor.title"
+                        >
                             <VIcon
                                 :color="visitor.color"
-                                small
+                                size="12"
                             >
                                 mdi-circle
                             </VIcon>
-                            <VLabel>{{ visitor.title }}</VLabel>
-                            <VLabel>
-                                <VIcon
-                                    :color="visitor.color"
-                                    small
-                                >
-                                    mdi-arrow-up
-                                </VIcon>
+                            <div
+                                class="title pl-2 grey--text flex-grow-1"
+                            >
+                                {{ visitor.title }}
+                            </div>
+                            <div
+                                class="percent grey--text"
+                            >
                                 {{ visitor.percentageDiff }}%
-                            </VLabel>
-                        </VRow>
-                    </VListItem>
-                </VList>
-            </VFlex>
-        </VLayout>
+                            </div>
+                        </VListItem>
+                    </VList>
+                </VCol>
+            </VRow>
+        </VContainer>
     </VContainer>
 </template>
 
@@ -98,8 +89,12 @@
         data() {
             return {
                 chartOptions: {
-                    width: 200,
-                    height: 200,
+                    chartArea: {
+                        width: '80%',
+                        height: '80%'
+                    },
+                    height: 150,
+                    width: 150,
                     pieHole: this.pieHole,
                     legend: 'none',
                     pieSliceText: 'none',
@@ -126,14 +121,13 @@
     background-color: white;
     border-radius: 6px;
     box-shadow: 0px 0px 28px rgba(194, 205, 223, 0.7);
+    max-width: 500px;
 
     .chart-card {
         min-width: 165px;
     }
 }
 .header {
-    align-items: center;
-    text-align: center;
     text-transform: capitalize;
     font-family: 'Gilroy';
     font-size: 16px;
@@ -144,15 +138,11 @@
     font-size: 14px;
     line-height: 16px;
 }
-.radio {
-    -webkit-border-radius: 50%;
-    -moz-border-radius: 50%;
-    border-radius: 50%;
+.title, .percent {
+    font-size: 16px !important;
+    font-family: 'GilroySemiBold' !important;
 }
-.dot {
-    height: 8px;
-    width: 8px;
-    border-radius: 50%;
-    display: inline-block;
+.v-subheader {
+    text-align: start;
 }
 </style>

From 9b31b4ebb6a8f52bbd9c40f5ce2767120f887e60 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Wed, 11 Sep 2019 21:46:54 +0300
Subject: [PATCH 180/183] adjust table and piechart on visitors page

---
 frontend/src/components/common/PieChart.vue   | 107 ++++++++----------
 .../dashboard/visitors/GroupedTable.vue       |   9 +-
 .../dashboard/visitors/VisitorsTable.vue      |  13 ++-
 frontend/src/pages/Dashboard.vue              |   3 -
 frontend/src/pages/PageViews.vue              |   1 -
 frontend/src/pages/Visitors.vue               |  16 +--
 6 files changed, 69 insertions(+), 80 deletions(-)

diff --git a/frontend/src/components/common/PieChart.vue b/frontend/src/components/common/PieChart.vue
index 0bb7b563..9f0f7328 100644
--- a/frontend/src/components/common/PieChart.vue
+++ b/frontend/src/components/common/PieChart.vue
@@ -1,61 +1,54 @@
 <template>
-    <VContainer>
+    <VContainer class="piechart">
         <VRow>
             <VCol>
-                <VSubheader
-                    class="my-3 header text-dark"
+                <div
+                    class="my-5 header text-dark"
                     fluid
                 >
                     Summary
-                </VSubheader>
+                </div>
             </VCol>
         </VRow>
         <VContainer
-            class="pie-container position-relative"
-            wrap
+            class="pie-container position-relative d-flex pr-6"
         >
-            <VRow>
-                <VSubheader
-                    v-text="legend.title"
-                    class="legend-title grey--text text--darken-1 col-7 offset-5"
-                />
-            </VRow>
             <Spinner v-if="isFetching" />
-            <VRow>
-                <VCol class="col-5">
-                    <GChart
-                        type="PieChart"
-                        :data="chartData"
-                        :options="chartOptions"
-                    />
-                </VCol>
-                <VCol class="d-flex flex-column flex-grow-1 pl-4 justify-center">
-                    <VList>
-                        <VListItem
-                            class="justify-space-between align-center pa-0"
-                            v-for="visitor in legend.data"
-                            :key="visitor.title"
-                        >
-                            <VIcon
-                                :color="visitor.color"
-                                size="12"
-                            >
-                                mdi-circle
-                            </VIcon>
-                            <div
-                                class="title pl-2 grey--text flex-grow-1"
-                            >
-                                {{ visitor.title }}
-                            </div>
-                            <div
-                                class="percent grey--text"
-                            >
-                                {{ visitor.percentageDiff }}%
-                            </div>
-                        </VListItem>
-                    </VList>
-                </VCol>
-            </VRow>
+            <GChart
+                class="align-self-end"
+                type="PieChart"
+                :data="chartData"
+                :options="chartOptions"
+            />
+            <VList class="flex-grow-1 ml-3">
+                <div
+                    class="grey--text text--darken-1 pb-3"
+                >
+                    {{ legend.title }}
+                </div>
+                <VListItem
+                    class="justify-space-between align-center pa-0"
+                    v-for="visitor in legend.data"
+                    :key="visitor.title"
+                >
+                    <VIcon
+                        :color="visitor.color"
+                        size="12"
+                    >
+                        mdi-circle
+                    </VIcon>
+                    <div
+                        class="title pl-2 grey--text flex-grow-1"
+                    >
+                        {{ visitor.title }}
+                    </div>
+                    <div
+                        class="percent grey--text"
+                    >
+                        {{ visitor.percentageDiff }}%
+                    </div>
+                </VListItem>
+            </VList>
         </VContainer>
     </VContainer>
 </template>
@@ -93,8 +86,8 @@
                         width: '80%',
                         height: '80%'
                     },
-                    height: 150,
-                    width: 150,
+                    height: 128,
+                    width: 128,
                     pieHole: this.pieHole,
                     legend: 'none',
                     pieSliceText: 'none',
@@ -107,7 +100,6 @@
                         },
                         1: {
                             color: '#1BC3DA',
-                            offset: 0.04,
                         },
                     }
                 }
@@ -117,11 +109,13 @@
 </script>
 
 <style scoped lang="scss">
+.piechart {
+    max-width: 500px;
+}
 .pie-container {
     background-color: white;
     border-radius: 6px;
     box-shadow: 0px 0px 28px rgba(194, 205, 223, 0.7);
-    max-width: 500px;
 
     .chart-card {
         min-width: 165px;
@@ -133,13 +127,10 @@
     font-size: 16px;
     line-height: 19px;
 }
-.legend-title {
-    font-family: Gilroy;
-    font-size: 14px;
-    line-height: 16px;
-}
-.title, .percent {
-    font-size: 16px !important;
+.legend-title,
+.title,
+.percent {
+    font-size: 14px !important;
     font-family: 'GilroySemiBold' !important;
 }
 .v-subheader {
diff --git a/frontend/src/components/dashboard/visitors/GroupedTable.vue b/frontend/src/components/dashboard/visitors/GroupedTable.vue
index a7161433..43357292 100644
--- a/frontend/src/components/dashboard/visitors/GroupedTable.vue
+++ b/frontend/src/components/dashboard/visitors/GroupedTable.vue
@@ -98,7 +98,7 @@ $gray: rgba(18, 39, 55, 0.5);
 
 .users-table {
     max-width: 1032px;
-    font-family: 'Gilroy';
+    font-family: 'GilroySemiBold';
 }
 
 .header {
@@ -180,12 +180,7 @@ $gray: rgba(18, 39, 55, 0.5);
 }
 
 ::v-deep .v-list-item {
-    font-family: 'Gilroy';
+    font-family: 'GilroySemiBold';
     text-transform: capitalize;
 }
-    @media (max-width: 870px) {
-        ::v-deep .v-text-field__prefix {
-            display: none;
-        }
-    }
 </style>
diff --git a/frontend/src/components/dashboard/visitors/VisitorsTable.vue b/frontend/src/components/dashboard/visitors/VisitorsTable.vue
index d89c5602..28e7c8ae 100644
--- a/frontend/src/components/dashboard/visitors/VisitorsTable.vue
+++ b/frontend/src/components/dashboard/visitors/VisitorsTable.vue
@@ -1,6 +1,6 @@
 <template>
     <VContainer
-        clas="position-relative"
+        class="position-relative pa-0"
     >
         <Spinner v-if="isFetching" />
         <GroupedTable
@@ -77,3 +77,14 @@
         }
     };
 </script>
+
+<style scoped lang="scss">
+    @media (max-width: 1500px) {
+        ::v-deep .v-text-field__prefix {
+            display: none;
+        }
+        ::v-deep .v-select__selections {
+            padding-left: 16px;
+        }
+    }
+</style>
diff --git a/frontend/src/pages/Dashboard.vue b/frontend/src/pages/Dashboard.vue
index a404ef21..c7638fc5 100644
--- a/frontend/src/pages/Dashboard.vue
+++ b/frontend/src/pages/Dashboard.vue
@@ -43,6 +43,3 @@
         },
     };
 </script>
-
-<style>
-</style>
diff --git a/frontend/src/pages/PageViews.vue b/frontend/src/pages/PageViews.vue
index a4c44097..ae39f111 100644
--- a/frontend/src/pages/PageViews.vue
+++ b/frontend/src/pages/PageViews.vue
@@ -32,7 +32,6 @@
             <VFlex
                 lg12
                 md12
-                hidden-sm-and-down
                 height="100%"
                 class="img-card"
             >
diff --git a/frontend/src/pages/Visitors.vue b/frontend/src/pages/Visitors.vue
index f18c8b47..5bceb4f3 100644
--- a/frontend/src/pages/Visitors.vue
+++ b/frontend/src/pages/Visitors.vue
@@ -28,25 +28,16 @@
                 @change="changeButton"
             />
         </VRow>
-        <VRow
-            flex
-            wrap
-        >
+        <VRow>
             <VCol
                 lg="7"
-                md="12"
                 sm="12"
-                height="100%"
-                class="img-card"
             >
                 <VisitorsTable />
             </VCol>
             <VCol
                 lg="5"
-                md="12"
                 sm="12"
-                height="100%"
-                class="img-card"
             >
                 <PieChart
                     :chart-data="pieData"
@@ -218,4 +209,9 @@
     .buttons-row {
         margin-top: 50px;
     }
+    @media (max-width: 1263px) {
+        .piechart {
+            margin: 0;
+        }
+    }
 </style>

From 6018798d837da52b67de867987ff2345aeea8c8a Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Wed, 11 Sep 2019 21:59:07 +0300
Subject: [PATCH 181/183] add units for avg session on visitors page

---
 frontend/src/pages/Visitors.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/frontend/src/pages/Visitors.vue b/frontend/src/pages/Visitors.vue
index 5bceb4f3..442740b0 100644
--- a/frontend/src/pages/Visitors.vue
+++ b/frontend/src/pages/Visitors.vue
@@ -138,7 +138,14 @@
                 formatLineChartData:GET_FORMAT_LINE_CHART_DATA,
             }),
             units() {
-                return this.currentActiveButton === BOUNCE_RATE ? '%' : '';
+                switch (this.currentActiveButton) {
+                case BOUNCE_RATE:
+                    return '%';
+                case AVG_SESSION:
+                    return 's';
+                default:
+                    return '';
+                }
             },
             pieData () {
                 return [

From 4608b3bb6b59f80a48562f326e14492992ea93cb Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Wed, 11 Sep 2019 22:10:24 +0300
Subject: [PATCH 182/183] change font on tables to semi bold

---
 .../src/components/dashboard/errors/ErrorsTable.vue | 13 ++-----------
 .../dashboard/geo_location/GroupedTable.vue         | 10 ++--------
 .../dashboard/page_timings/PageTimingsTable.vue     |  7 +++----
 .../dashboard/page_views/GroupedTable.vue           | 10 ++--------
 .../components/dashboard/visitors/GroupedTable.vue  |  3 +++
 5 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/frontend/src/components/dashboard/errors/ErrorsTable.vue b/frontend/src/components/dashboard/errors/ErrorsTable.vue
index b0d019ba..e1eca2fc 100644
--- a/frontend/src/components/dashboard/errors/ErrorsTable.vue
+++ b/frontend/src/components/dashboard/errors/ErrorsTable.vue
@@ -74,8 +74,8 @@
     $blue: #3C57DE;
     $gray: rgba(18, 39, 55, 0.5);
 
-    .users-table {
-        font-family: 'Gilroy';
+    .v-data-table {
+        font-family: 'GilroySemiBold';
     }
 
     .header {
@@ -159,13 +159,4 @@
             display: none;
         }
     }
-
-    ::v-deep .v-list-item {
-        font-family: 'Gilroy';
-        text-transform: capitalize;
-    }
-
-    .units {
-        text-transform: none;
-    }
 </style>
\ No newline at end of file
diff --git a/frontend/src/components/dashboard/geo_location/GroupedTable.vue b/frontend/src/components/dashboard/geo_location/GroupedTable.vue
index eb2328c7..318f727b 100644
--- a/frontend/src/components/dashboard/geo_location/GroupedTable.vue
+++ b/frontend/src/components/dashboard/geo_location/GroupedTable.vue
@@ -94,8 +94,8 @@
     $blue: #3C57DE;
     $gray: rgba(18, 39, 55, 0.5);
 
-    .geo-location-table {
-        font-family: 'Gilroy';
+    .v-data-table {
+        font-family: 'GilroySemiBold';
     }
 
     .header {
@@ -130,16 +130,10 @@
                     display: flex;
                     justify-content: center;
                     align-items: center;
-                    max-width: calc(100% / 3);
                     word-break: break-all;
                     padding: 8px;
                 }
             }
         }
     }
-
-    ::v-deep .v-list-item {
-        font-family: 'Gilroy';
-        text-transform: capitalize;
-    }
 </style>
\ No newline at end of file
diff --git a/frontend/src/components/dashboard/page_timings/PageTimingsTable.vue b/frontend/src/components/dashboard/page_timings/PageTimingsTable.vue
index d5f9f292..89d838cb 100644
--- a/frontend/src/components/dashboard/page_timings/PageTimingsTable.vue
+++ b/frontend/src/components/dashboard/page_timings/PageTimingsTable.vue
@@ -1,7 +1,6 @@
 <template>
     <VContainer
         p-0
-        class="users-table"
     >
         <VRow
             class="header my-3"
@@ -96,8 +95,8 @@
     $blue: #3C57DE;
     $gray: rgba(18, 39, 55, 0.5);
 
-    .users-table {
-        font-family: 'Gilroy';
+    .v-data-table {
+        font-family: 'GilroySemiBold';
     }
 
     .header {
@@ -183,7 +182,7 @@
     }
 
     ::v-deep .v-list-item {
-        font-family: 'Gilroy';
+        font-family: 'GilroySemiBold';
         text-transform: capitalize;
     }
 
diff --git a/frontend/src/components/dashboard/page_views/GroupedTable.vue b/frontend/src/components/dashboard/page_views/GroupedTable.vue
index ff60b575..df48d906 100644
--- a/frontend/src/components/dashboard/page_views/GroupedTable.vue
+++ b/frontend/src/components/dashboard/page_views/GroupedTable.vue
@@ -90,8 +90,8 @@
     $blue: #3C57DE;
     $gray: rgba(18, 39, 55, 0.5);
 
-    .page-views-table {
-        font-family: 'Gilroy';
+    ::v-deep .v-data-table {
+        font-family: 'GilroySemiBold';
     }
 
     .header {
@@ -126,16 +126,10 @@
                     display: flex;
                     justify-content: center;
                     align-items: center;
-                    max-width: calc(100% / 3);
                     word-break: break-all;
                     padding: 8px;
                 }
             }
         }
     }
-
-    ::v-deep .v-list-item {
-        font-family: 'Gilroy';
-        text-transform: capitalize;
-    }
 </style>
\ No newline at end of file
diff --git a/frontend/src/components/dashboard/visitors/GroupedTable.vue b/frontend/src/components/dashboard/visitors/GroupedTable.vue
index 43357292..1e3926c7 100644
--- a/frontend/src/components/dashboard/visitors/GroupedTable.vue
+++ b/frontend/src/components/dashboard/visitors/GroupedTable.vue
@@ -98,6 +98,9 @@ $gray: rgba(18, 39, 55, 0.5);
 
 .users-table {
     max-width: 1032px;
+}
+
+.v-data-table {
     font-family: 'GilroySemiBold';
 }
 

From b2f00d0f1d9da5fc37b1f7db17ece88b1fbef139 Mon Sep 17 00:00:00 2001
From: Yana Yakovenko <y.yakovenko@lenal.biz>
Date: Wed, 11 Sep 2019 22:53:23 +0300
Subject: [PATCH 183/183] modify reset password form

---
 .../src/components/auth/ResetPasswordForm.vue | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/auth/ResetPasswordForm.vue b/frontend/src/components/auth/ResetPasswordForm.vue
index 19aaedeb..c0114a4f 100644
--- a/frontend/src/components/auth/ResetPasswordForm.vue
+++ b/frontend/src/components/auth/ResetPasswordForm.vue
@@ -1,23 +1,25 @@
 <template>
     <VContent>
         <VFlex
-            lg6
             md6
-            sm12
             xs12
-            :class="{'mx-5': $vuetify.breakpoint.smAndUp}"
+            class="mt-10 mx-10"
         >
             <VContainer v-if="showEmail">
-                <VSubheader class="body-1 grey--text text--darken-1 pa-0 mb-4">
-                    Forgot your password? Please enter your email address and we'll send you a link to reset your password
+                <VSubheader class="body-1 grey--text text--darken-1 pa-0 mb-5">
+                    Forgot your password?
+                </VSubheader>
+                <VSubheader class="instruction body-2 px-0 grey--text mb-5">
+                    Please enter your email address and we'll send you a link to reset your password
                 </VSubheader>
                 <VForm ref="form">
-                    <label class="caption grey--text">
+                    <label class="caption grey--text text--darken-1">
                         Email
                     </label>
                     <VTextField
                         name="email"
                         class="no-underline mt-5"
+                        solo
                         v-model="email"
                         type="text"
                         :rules="emailRules"
@@ -25,7 +27,7 @@
                     />
                 </VForm>
                 <VBtn
-                    class="mt-9"
+                    class="mt-4"
                     color="primary"
                     :disabled="sending"
                     @click="onResetPassword"
@@ -105,6 +107,11 @@
 </script>
 
 <style lang="scss" scoped>
+    .v-subheader.instruction,
+    .v-text-field {
+        max-width: 400px;
+        font-family: GilroySemiBold;
+    }
     .success-response{
         margin-top: 100px;
         min-width: 245px;