1057 bar chart for profile statistics

BackEnd/administration/serializers.py

@@ -277,6 +277,11 @@ class StatisticsSerializer(serializers.Serializer):
     investors_count = serializers.IntegerField()
     startups_count = serializers.IntegerField()
     blocked_companies_count = serializers.IntegerField()
+    manufacturers_count = serializers.IntegerField()
+    importers_count = serializers.IntegerField()
+    retail_networks_count = serializers.IntegerField()
+    horeca_count = serializers.IntegerField()
+    others_count = serializers.IntegerField()
 
 
 class ContactInformationSerializer(serializers.ModelSerializer):

BackEnd/administration/tests/test_profile_statistics.py

@@ -1,28 +1,58 @@
 from rest_framework.test import APITestCase
 from rest_framework import status
-from administration.factories import AdminUserFactory, AdminProfileFactory
+from administration.factories import AdminUserFactory
+from authentication.factories import UserFactory
+from profiles.factories import (
+    ProfileFactory,
+    ActivityFactory,
+    ProfileCompanyFactory,
+    ProfileStartupFactory,
+)
 from utils.unittest_helper import utc_datetime
 
 
 class TestProfileStatisticsStaff(APITestCase):
     def setUp(self):
-        self.user = AdminUserFactory()
+        self.user = UserFactory(is_staff=True)
         self.client.force_authenticate(self.user)
-        self.test_startup_user = AdminUserFactory(is_staff=False)
-        self.test_investor_user = AdminUserFactory(is_staff=False)
-        self.test_blocked_company_user = AdminUserFactory(is_staff=False)
-        self.startup_company = AdminProfileFactory(
-            person_id=self.test_startup_user.id, is_registered=False
+
+        self.activities = {
+            "Виробник": ActivityFactory(name="Виробник"),
+            "Імпортер": ActivityFactory(name="Імпортер"),
+            "Роздрібна мережа": ActivityFactory(name="Роздрібна мережа"),
+            "HORECA": ActivityFactory(name="HORECA"),
+            "Інші послуги": ActivityFactory(name="Інші послуги"),
+        }
+
+        self.test_startup_user = UserFactory()
+        self.test_investor_user = UserFactory()
+        self.test_blocked_company_user = UserFactory()
+        self.startup_company = ProfileStartupFactory(
+            person_id=self.test_startup_user.id,
+            activities=[
+                self.activities["Виробник"],
+                self.activities["HORECA"],
+            ],
         )
         self.startup_company.created_at = utc_datetime(2023, 12, 7)
+
         self.startup_company.save()
-        self.investor_company = AdminProfileFactory(
-            person_id=self.test_investor_user.id, is_startup=False
+        self.investor_company = ProfileCompanyFactory(
+            person_id=self.test_investor_user.id,
+            activities=[
+                self.activities["Імпортер"],
+                self.activities["HORECA"],
+            ],
         )
         self.investor_company.created_at = utc_datetime(2024, 5, 10)
+
         self.investor_company.save()
-        self.blocked_company = AdminProfileFactory(
-            person_id=self.test_blocked_company_user.id, status="blocked"
+        self.blocked_company = ProfileFactory(
+            is_registered=True,
+            is_startup=True,
+            person_id=self.test_blocked_company_user.id,
+            status="blocked",
+            activities=[self.activities["Роздрібна мережа"]],
         )
         self.blocked_company.created_at = utc_datetime(2024, 12, 12)
         self.blocked_company.save()
@@ -34,6 +64,11 @@ def test_get_profile_statistics(self):
             "investors_count": 2,
             "startups_count": 2,
             "blocked_companies_count": 1,
+            "manufacturers_count": 1,
+            "importers_count": 1,
+            "retail_networks_count": 1,
+            "horeca_count": 2,
+            "others_count": 0,
         }
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data, data)
@@ -45,6 +80,11 @@ def test_get_profile_statistics_filtered_by_year(self):
             "investors_count": 2,
             "startups_count": 1,
             "blocked_companies_count": 1,
+            "manufacturers_count": 0,
+            "importers_count": 1,
+            "retail_networks_count": 1,
+            "horeca_count": 1,
+            "others_count": 0,
         }
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data, data)
@@ -58,6 +98,11 @@ def test_get_profile_statistics_filtered_by_range(self):
             "investors_count": 2,
             "startups_count": 1,
             "blocked_companies_count": 1,
+            "manufacturers_count": 0,
+            "importers_count": 1,
+            "retail_networks_count": 1,
+            "horeca_count": 1,
+            "others_count": 0,
         }
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data, data)
@@ -71,6 +116,11 @@ def test_get_profile_statistics_filtered_by_month(self):
             "investors_count": 0,
             "startups_count": 1,
             "blocked_companies_count": 0,
+            "manufacturers_count": 1,
+            "importers_count": 0,
+            "retail_networks_count": 0,
+            "horeca_count": 1,
+            "others_count": 0,
         }
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data, data)
@@ -84,6 +134,11 @@ def test_get_profile_statistics_filtered_by_day(self):
             "investors_count": 0,
             "startups_count": 1,
             "blocked_companies_count": 0,
+            "manufacturers_count": 1,
+            "importers_count": 0,
+            "retail_networks_count": 0,
+            "horeca_count": 1,
+            "others_count": 0,
         }
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data, data)

BackEnd/administration/views.py

@@ -23,8 +23,8 @@
     CreateAPIView,
 )
 
+
 from administration.serializers import (
-    AdminRegistrationSerializer,
     AdminCompanyListSerializer,
     AdminCompanyDetailSerializer,
     AdminUserListSerializer,
@@ -36,6 +36,7 @@
     StatisticsSerializer,
     ContactInformationSerializer,
     MonthlyProfileStatisticsSerializer,
+    AdminRegistrationSerializer,
 )
 from administration.pagination import ListPagination
 from administration.models import (
@@ -166,10 +167,33 @@ class ProfileStatisticsView(RetrieveAPIView):
     def get_object(self):
         queryset = self.filter_queryset(Profile.objects.all())
         return queryset.aggregate(
-            companies_count=Count("pk"),
-            investors_count=Count("pk", filter=Q(is_registered=True)),
-            startups_count=Count("pk", filter=Q(is_startup=True)),
-            blocked_companies_count=Count("pk", filter=Q(status="blocked")),
+            companies_count=Count("pk", distinct=True),
+            investors_count=Count(
+                "pk", filter=Q(is_registered=True), distinct=True
+            ),
+            startups_count=Count(
+                "pk", filter=Q(is_startup=True), distinct=True
+            ),
+            blocked_companies_count=Count(
+                "pk", filter=Q(status="blocked"), distinct=True
+            ),
+            manufacturers_count=Count(
+                "pk", filter=Q(activities__name="Виробник"), distinct=True
+            ),
+            importers_count=Count(
+                "pk", filter=Q(activities__name="Імпортер"), distinct=True
+            ),
+            retail_networks_count=Count(
+                "pk",
+                filter=Q(activities__name="Роздрібна мережа"),
+                distinct=True,
+            ),
+            horeca_count=Count(
+                "pk", filter=Q(activities__name="HORECA"), distinct=True
+            ),
+            others_count=Count(
+                "pk", filter=Q(activities__name="Інші послуги"), distinct=True
+            ),
         )
 
 

FrontEnd/package.json

@@ -19,9 +19,11 @@
     "@testing-library/user-event": "^13.5.0",
     "antd": "^5.21.5",
     "axios": "^1.5.0",
+    "chart.js": "^4.4.7",
     "hamburger-react": "^2.5.1",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
+    "react-chartjs-2": "^5.2.0",
     "react-cookie": "^6.1.0",
     "react-dom": "^18.2.0",
     "react-google-recaptcha": "^3.1.0",

FrontEnd/src/pages/AdminPage/Charts/ActivitiesBarChart.jsx

@@ -0,0 +1,83 @@
+import React from 'react';
+import {
+  Chart as ChartJS,
+  CategoryScale,
+  LinearScale,
+  BarElement,
+  Title,
+  Tooltip,
+  Legend,
+} from 'chart.js';
+ChartJS.register(
+    CategoryScale,
+    LinearScale,
+    BarElement,
+    Title,
+    Tooltip,
+    Legend
+);
+import { Bar } from 'react-chartjs-2';
+import css from './ActivitiesBarChart.module.scss';
+import Loader from '../../../components/Loader/Loader';
+
+
+function ActivitiesBarChart({statistics, isLoading, error}) {
+    const chartData = statistics
+        ? {
+            labels: ['Виробники', 'Імпортери', 'Роздрібніки', 'HORECA', 'Інші'],
+            datasets: [
+                {
+                    label: 'Типи компаній',
+                    data: [
+                        statistics.manufacturers_count,
+                        statistics.importers_count,
+                        statistics.retail_networks_count,
+                        statistics.horeca_count,
+                        statistics.others_count
+                    ],
+                    backgroundColor: [
+                        '#87f3b0',
+                    ]
+                },
+            ]
+        } : {labels: [], datasets: []};
+    const options = {
+        responsive: true,
+        plugins: {
+            legend: {
+                position: 'top',
+            },
+            title: {
+                display: true,
+                text: 'Статистика по типам компаній',
+            },
+            scales: {
+            y: {
+                ticks: {
+                    stepSize: 1,
+                },
+            },
+    },
+        },
+    };
+    return (
+        <div className={css['chart-container']}>
+            {isLoading && (
+                <div className={css['loader-container']}>
+                    <Loader/>
+                </div>
+            )
+            }
+            {error && (
+                <div className={css['error']}>Не вдалося отримати статистику компаній</div>
+            )
+            }
+            {!isLoading && !error && (
+                <Bar data={chartData} options={options}/>
+            )
+            }
+        </div>
+    );
+}
+
+export default ActivitiesBarChart;

FrontEnd/src/pages/AdminPage/Charts/ActivitiesBarChart.module.scss

@@ -0,0 +1,18 @@
+.chart-container {
+  width: 400px;
+}
+
+.error {
+  color: #f5222d;
+  background-color: #fff1f0;
+  border: 1px solid #ffa39e;
+  padding: 10px;
+  border-radius: 4px;
+  margin-top: 10px;
+
+}
+
+.loader-container {
+  width: 200px;
+  height: 300px;
+}