Fancy graph tests

src/statistics/FancyGraphCard.tsx

@@ -68,27 +68,6 @@ const FancyGraphCard: React.FC = () => {
     setDateFrom(getFirstOfMonth(dateFromOnPageLoad));
   }, []);
 
-  useEffect(() => {
-    if (!dateFrom || !dateTo) return;
-
-    let currentDate = new Date(dateFrom);
-    const dates = [];
-    while (currentDate <= dateTo) {
-      dates.push(currentDate);
-      currentDate = new Date(currentDate);
-      currentDate.setDate(currentDate.getDate() + 32);
-      currentDate.setDate(1);
-    }
-    dates.push(currentDate);
-
-    const tomorrow = new Date();
-    tomorrow.setDate(tomorrow.getDate() + 1);
-    dates.push(tomorrow);
-
-    setDates(dates);
-    setGraphLabels(dates.map((date) => formatDate(date)));
-  }, [dateFrom, dateTo]);
-
   useEffect(() => {
     fillCachedData();
     buildAndSetGraphData();
@@ -253,12 +232,14 @@ const FancyGraphCard: React.FC = () => {
               <h5>
                 {gettext("Graph")} {fetching && <Spinner size={"sm"} />}
               </h5>
-              <span className={"d-flex gap-2"}>
+              <span className={"d-flex gap-2 align-items-center"}>
                 <DateRangePicker
                   dateFrom={dateFrom}
                   setDateFrom={setDateFrom}
                   dateTo={dateTo}
                   setDateTo={setDateTo}
+                  setDates={setDates}
+                  setGraphLabels={setGraphLabels}
                 />
                 <TapirButton
                   variant={"outline-secondary"}

src/statistics/components/DateRangePicker.tsx

@@ -1,6 +1,7 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
 import { FloatingLabel, Form } from "react-bootstrap";
-import { getFirstOfMonth } from "../utils.tsx";
+import { getFirstOfMonth, getLastOfMonth } from "../utils.tsx";
+import { formatDate } from "../../utils/formatDate.ts";
 
 declare let gettext: (english_text: string) => string;
 
@@ -9,42 +10,114 @@ interface DateRangePickerProps {
   setDateFrom: (date: Date) => void;
   dateTo: Date;
   setDateTo: (date: Date) => void;
+  setDates: (dates: Date[]) => void;
+  setGraphLabels: (graphLabels: string[]) => void;
 }
 
 const DateRangePicker: React.FC<DateRangePickerProps> = ({
   dateFrom,
   setDateFrom,
   dateTo,
   setDateTo,
+  setDates,
+  setGraphLabels,
 }) => {
+  const [includeToday, setIncludeToday] = useState(true);
+  const [startOfMonth, setStartOfMonth] = useState(true);
+
+  useEffect(() => {
+    if (!dateFrom || !dateTo) return;
+
+    let currentDate = new Date(dateFrom);
+    const dates = [];
+    while (currentDate <= dateTo) {
+      dates.push(currentDate);
+      currentDate = new Date(currentDate);
+      currentDate.setDate(currentDate.getDate() + (startOfMonth ? 32 : 1));
+      currentDate.setDate(1);
+      currentDate = adaptDate(currentDate);
+    }
+    dates.push(currentDate);
+
+    if (includeToday) {
+      const today = new Date();
+      let todayAlreadyInArray = false;
+      for (const date of dates) {
+        if (
+          date.getDate() === today.getDate() &&
+          date.getMonth() === today.getMonth() &&
+          date.getFullYear() === today.getFullYear()
+        ) {
+          todayAlreadyInArray = true;
+          break;
+        }
+      }
+      if (!todayAlreadyInArray) {
+        dates.push(today);
+      }
+    }
+
+    dates.sort((date1, date2) => date1.getTime() - date2.getTime());
+
+    setDates(dates);
+    setGraphLabels(dates.map((date) => formatDate(date)));
+  }, [dateFrom, dateTo, includeToday, startOfMonth]);
+
+  function adaptDate(date: Date) {
+    let dateAdapter = getFirstOfMonth;
+    if (!startOfMonth) {
+      dateAdapter = getLastOfMonth;
+    }
+    return dateAdapter(date);
+  }
+
+  function getDateInputValue(date: Date) {
+    if (isNaN(date.getTime())) {
+      return undefined;
+    }
+    return date.toISOString().substring(0, 10);
+  }
+
   return (
     <>
+      <Form.Group>
+        <Form.Check
+          type={"switch"}
+          checked={includeToday}
+          onChange={(e) => {
+            setIncludeToday(e.target.checked);
+          }}
+          label={"Include today"}
+        />
+      </Form.Group>
+      <Form.Group>
+        <Form.Select
+          onChange={(event) => {
+            setStartOfMonth(event.target.value === "startOfMonth");
+          }}
+        >
+          <option value={"startOfMonth"}>{gettext("First of month")}</option>
+          <option value={"lastOfMonth"}>{gettext("Last of month")}</option>
+        </Form.Select>
+      </Form.Group>
       <Form.Group>
         <FloatingLabel label={"Date from"}>
           <Form.Control
             type={"date"}
-            value={
-              !isNaN(dateFrom.getTime())
-                ? dateFrom.toISOString().substring(0, 10)
-                : undefined
-            }
+            value={getDateInputValue(dateFrom)}
             onChange={(event) => {
-              setDateFrom(getFirstOfMonth(new Date(event.target.value)));
+              setDateFrom(adaptDate(new Date(event.target.value)));
             }}
           />
         </FloatingLabel>
       </Form.Group>
       <Form.Group>
-        <FloatingLabel label={"Date from"}>
+        <FloatingLabel label={"Date to"}>
           <Form.Control
             type={"date"}
-            value={
-              !isNaN(dateTo.getTime())
-                ? dateTo.toISOString().substring(0, 10)
-                : undefined
-            }
+            value={getDateInputValue(dateTo)}
             onChange={(event) => {
-              setDateTo(getFirstOfMonth(new Date(event.target.value)));
+              setDateTo(adaptDate(new Date(event.target.value)));
             }}
           />
         </FloatingLabel>

src/statistics/datasets.tsx

@@ -109,6 +109,9 @@ export const datasets: { [key: string]: Dataset } = {
   },
   [datasetNumberOfLongTermFrozenMembers]: {
     display_name: gettext("Long-term frozen members"),
+    description: gettext(
+      "Members that are frozen since more than 180 days (roughly 6 month)",
+    ),
     apiCall: api.statisticsNumberOfLongTermFrozenMembersAtDateRetrieve,
     chart_type: "line",
     relative: false,

src/statistics/utils.tsx

@@ -2,3 +2,7 @@ export function getFirstOfMonth(date: Date) {
   date.setDate(1);
   return date;
 }
+
+export function getLastOfMonth(date: Date) {
+  return new Date(date.getFullYear(), date.getMonth() + 1, 0);
+}

tapir/accounts/services/co_purchaser_history_service.py

@@ -2,7 +2,17 @@
 
 import datetime
 
-from django.db.models import Value, OuterRef, Case, When, QuerySet, Q
+from django.db.models import (
+    Value,
+    OuterRef,
+    Case,
+    When,
+    QuerySet,
+    Q,
+    CharField,
+    Subquery,
+)
+from django.db.models.functions import Coalesce
 from django.utils import timezone
 
 from tapir.accounts.models import TapirUser, UpdateTapirUserLogEntry
@@ -12,26 +22,6 @@ class CoPurchaserHistoryService:
     ANNOTATION_HAS_CO_PURCHASER = "has_co_purchaser"
     ANNOTATION_HAS_CO_PURCHASER_DATE_CHECK = "has_co_purchaser_date_check"
 
-    @classmethod
-    def has_co_purchaser(
-        cls, tapir_user: TapirUser, at_datetime: datetime.datetime = None
-    ):
-        if at_datetime is None:
-            at_datetime = timezone.now()
-
-        if not hasattr(tapir_user, cls.ANNOTATION_HAS_CO_PURCHASER):
-            tapir_user = cls.annotate_tapir_user_queryset_with_has_co_purchaser_at_date(
-                TapirUser.objects.filter(id=tapir_user.id), at_datetime
-            ).first()
-
-        annotated_date = getattr(tapir_user, cls.ANNOTATION_HAS_CO_PURCHASER_DATE_CHECK)
-        if annotated_date != at_datetime:
-            raise ValueError(
-                f"Trying to get 'has co purchaser' at date {at_datetime}, but the queryset has been "
-                f"annotated relative to {annotated_date}"
-            )
-        return getattr(tapir_user, cls.ANNOTATION_HAS_CO_PURCHASER)
-
     @classmethod
     def annotate_tapir_user_queryset_with_has_co_purchaser_at_date(
         cls,
@@ -42,13 +32,20 @@ def annotate_tapir_user_queryset_with_has_co_purchaser_at_date(
             at_datetime = timezone.now()
 
         queryset = queryset.annotate(
-            co_purchaser_at_date=UpdateTapirUserLogEntry.objects.filter(
-                user_id=OuterRef("id"),
-                created_date__lte=at_datetime,
-                new_values__co_purchaser__isnull=False,
+            co_purchaser_from_log_entry=Subquery(
+                UpdateTapirUserLogEntry.objects.filter(
+                    user_id=OuterRef("id"),
+                    created_date__gte=at_datetime,
+                    old_values__has_key="co_purchaser",
+                )
+                .order_by("created_date")
+                .values("old_values__co_purchaser")[:1],
+                output_field=CharField(),
             )
-            .order_by("-created_date")
-            .values("new_values__co_purchaser")[:1]
+        )
+
+        queryset = queryset.annotate(
+            co_purchaser_at_date=Coalesce("co_purchaser_from_log_entry", "co_purchaser")
         )
 
         return queryset.annotate(

tapir/accounts/tests/factories/factories.py

@@ -7,7 +7,7 @@
 from tapir.utils.shortcuts import set_group_membership
 
 
-class TapirUserFactory(UserDataFactory):
+class TapirUserFactory(UserDataFactory[TapirUser]):
     class Meta:
         model = TapirUser
         skip_postgeneration_save = True

tapir/accounts/tests/factories/user_data_factory.py

@@ -1,3 +1,5 @@
+from typing import TypeVar
+
 import factory
 import phonenumbers
 from faker import Faker
@@ -27,8 +29,10 @@ def phone_number(self):
 fake = Faker()
 fake.add_provider(CustomPhoneProvider)
 
+T = TypeVar("T")
+
 
-class UserDataFactory(factory.django.DjangoModelFactory):
+class UserDataFactory(factory.django.DjangoModelFactory[T]):
     class Meta:
         abstract = True
         exclude = ("ATTRIBUTES",)