From 8e69e3b93312b4ed1bf42480885b23b5a06b6e4a Mon Sep 17 00:00:00 2001
From: Dobromir Popov <dobromir.popov@gateway.one>
Date: Sun, 12 May 2024 12:13:12 +0300
Subject: [PATCH] fix stats calculation - include repeating avs.

---
 pages/cart/publishers/stats.tsx | 18 +++++++++++-------
 src/helpers/data.js             | 16 +++++++++++++++-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/pages/cart/publishers/stats.tsx b/pages/cart/publishers/stats.tsx
index 9b91629..18ee50e 100644
--- a/pages/cart/publishers/stats.tsx
+++ b/pages/cart/publishers/stats.tsx
@@ -22,11 +22,11 @@ function ContactsPage({ allPublishers }) {
     const [pubWithAssignmentsCount, setPubWithAssignmentsCount] = useState(0);
     const [filteredPublishers, setFilteredPublishers] = useState(allPublishers);
 
-    const [sortField, setSortField] = useState('firstName');
+    const [sortField, setSortField] = useState('name');
     const [sortOrder, setSortOrder] = useState('asc');
 
     const months = common.getMonthNames();
-    const subsetMonths = Array.from({ length: 7 }, (_, i) => {
+    const subsetMonths = Array.from({ length: 9 }, (_, i) => {
         const monthIndex = (currentMonth - 3 + i + 12) % 12; // Adjust for year wrap-around
         return {
             name: months[monthIndex],
@@ -104,7 +104,7 @@ function ContactsPage({ allPublishers }) {
                     <h1 className="text-xl font-semibold mb-4">Статистика </h1>
                     <h5 className="text-lg font-semibold mb-4">{pubWithAssignmentsCount} участника с предпочитания за месеца (от {filteredPublishers.length} )</h5>
                     <div className="mb-4 flex justify-between items-center">
-                        <input
+                        <input name="filterText"
                             type="text"
                             placeholder="Търси по име, имейл или телефон..."
                             value={searchQuery}
@@ -112,7 +112,7 @@ function ContactsPage({ allPublishers }) {
                             className="border border-gray-300 rounded-md px-2 py-2 text-base md:text-sm flex-grow mr-2"
                         />
                         {/* Month dropdown */}
-                        <select
+                        <select name="filterMonth"
                             className="border border-gray-300 rounded-md px-2 py-2 text-base md:text-sm"
                             value={selectedMonth}
                             onChange={(e) => setSelectedMonth(e.target.value)}
@@ -123,7 +123,7 @@ function ContactsPage({ allPublishers }) {
                             ))}
                         </select>
                         {/* Publisher type dropdown */}
-                        <select
+                        <select name="filterType"
                             className="border border-gray-300 rounded-md px-2 py-2 text-base md:text-sm"
                             value={publisherType}
                             onChange={(e) => setPublisherType(e.target.value)}
@@ -138,8 +138,8 @@ function ContactsPage({ allPublishers }) {
                         <table className="w-full text-left border-collapse">
                             <thead>
                                 <tr>
-                                    <th className="border-b font-medium p-4 pl-8 pt-0 pb-3 cursor-pointer" onClick={() => handleSort('firstName')}>
-                                        Име{renderSortArrow('firstName')}
+                                    <th className="border-b font-medium p-4 pl-8 pt-0 pb-3 cursor-pointer" onClick={() => handleSort('name')}>
+                                        Име{renderSortArrow('name')}
                                     </th>
                                     <th className="border-b font-medium p-4 pt-0 pb-3 cursor-pointer" onClick={() => handleSort('currentMonthAvailabilityDaysCount')}>
                                         Възможности{renderSortArrow('currentMonthAvailabilityDaysCount')}
@@ -217,6 +217,10 @@ export default ContactsPage;
 
 export const getServerSideProps = async (context) => {
     const allPublishers = await data.getAllPublishersWithStatistics(new Date());
+    //merge first and last name
+    allPublishers.forEach(publisher => {
+        publisher.name = `${publisher.firstName} ${publisher.lastName}`;
+    });
     return {
         props: {
             allPublishers
diff --git a/src/helpers/data.js b/src/helpers/data.js
index 49de741..3f4c350 100644
--- a/src/helpers/data.js
+++ b/src/helpers/data.js
@@ -420,7 +420,8 @@ async function filterPublishersNew(selectFields, filterDate, isExactTime = false
         if (isWithStats) {
             pub.currentMonthAvailability = pub.availabilities?.filter(avail => {
                 // return avail.dayOfMonth != null && avail.startTime >= currentMonthStart && avail.startTime <= monthInfo.lastSunday;
-                return avail.startTime >= monthInfo.firstMonday && (noEndDateFilter || avail.startTime <= monthInfo.lastSunday);
+                return (avail.startTime >= monthInfo.firstMonday && (noEndDateFilter || avail.startTime <= monthInfo.lastSunday))
+                    || (avail.dayOfMonth == null); // include repeating availabilities
             })
             pub.currentMonthAvailabilityDaysCount = pub.currentMonthAvailability.length;
             // pub.currentMonthAvailabilityDaysCount += pub.availabilities.filter(avail => {
@@ -557,6 +558,14 @@ async function getAllPublishersWithStatistics(filterDate, noEndDateFilter = fals
 
             },
         },
+        orderBy: [
+            {
+                firstName: 'asc', // or 'desc' if you want descending order
+            },
+            {
+                lastName: 'asc', // or 'desc' if you want descending order
+            }
+        ],
     });
 
 
@@ -577,6 +586,11 @@ async function getAllPublishersWithStatistics(filterDate, noEndDateFilter = fals
         // common.convertDatesToISOStrings(publisher.availabilities); //ToDo fix the function to work with this sctucture and use it
     });
 
+    //debug
+    const pubsWithAvailabilities = allPublishers.filter(publisher => publisher.availabilities.length > 0);
+    const pubsWithAvailabilities2 = publishers.filter(publisher => publisher.currentMonthAvailabilityHoursCount > 0);
+    console.log(`publishers: ${allPublishers.length}, publishers with availabilities: ${pubsWithAvailabilities.length}, publishers with availabilities2: ${pubsWithAvailabilities2.length}`);
+
 
     //merge allPublishers with publishers
     allPublishers = allPublishers.map(pub => {