From 767de67923065b5d35de755851e59fc545fa89c0 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Thu, 23 Jan 2025 15:09:44 +0100
Subject: [PATCH 01/10] FE: impl of report exporter to settings

---
 web-app/packages/admin-lib/components.d.ts    |  1 +
 .../admin-lib/src/modules/admin/adminApi.ts   | 22 ++++-
 .../admin/components/ReportDownloadDialog.vue | 90 +++++++++++++++++++
 .../admin-lib/src/modules/admin/store.ts      | 38 +++++++-
 .../admin-lib/src/modules/admin/types.ts      |  5 ++
 .../admin/views/SettingsViewTemplate.vue      | 28 +++++-
 .../components/app-settings/AppSettings.vue   |  1 +
 .../app-settings/AppSettingsItem.vue          |  4 +-
 web-app/packages/lib/src/common/date_utils.ts | 10 +++
 9 files changed, 192 insertions(+), 7 deletions(-)
 create mode 100644 web-app/packages/admin-lib/src/modules/admin/components/ReportDownloadDialog.vue

diff --git a/web-app/packages/admin-lib/components.d.ts b/web-app/packages/admin-lib/components.d.ts
index 89889c60..bf16d936 100644
--- a/web-app/packages/admin-lib/components.d.ts
+++ b/web-app/packages/admin-lib/components.d.ts
@@ -9,6 +9,7 @@ declare module 'vue' {
   export interface GlobalComponents {
     PAvatar: typeof import('primevue/avatar')['default']
     PButton: typeof import('primevue/button')['default']
+    PCalendar: typeof import('primevue/calendar')['default']
     PColumn: typeof import('primevue/column')['default']
     PDataTable: typeof import('primevue/datatable')['default']
     PDivider: typeof import('primevue/divider')['default']
diff --git a/web-app/packages/admin-lib/src/modules/admin/adminApi.ts b/web-app/packages/admin-lib/src/modules/admin/adminApi.ts
index 6380ef6c..08114297 100644
--- a/web-app/packages/admin-lib/src/modules/admin/adminApi.ts
+++ b/web-app/packages/admin-lib/src/modules/admin/adminApi.ts
@@ -18,7 +18,8 @@ import {
   CreateUserData,
   PaginatedAdminProjectsResponse,
   PaginatedAdminProjectsParams,
-  ServerUsageResponse
+  ServerUsageResponse,
+  DownloadReportParams
 } from '@/modules/admin/types'
 
 export const AdminApi = {
@@ -99,6 +100,23 @@ export const AdminApi = {
   },
 
   async getServerUsage(): Promise<AxiosResponse<ServerUsageResponse>> {
-    return AdminModule.httpService.get('/app/admin/usage', )
+    return AdminModule.httpService.get('/app/admin/usage')
+  },
+
+  /**
+   * Create url for csv file with server statistics
+   */
+  contructDownloadStatisticsUrl(): string {
+    return AdminModule.httpService.absUrl('/app/admin/report')
+  },
+
+  async downloadStatistics(
+    url: string,
+    params: DownloadReportParams
+  ): Promise<AxiosResponse<Blob>> {
+    return AdminModule.httpService.get(url, {
+      responseType: 'blob',
+      params
+    })
   }
 }
diff --git a/web-app/packages/admin-lib/src/modules/admin/components/ReportDownloadDialog.vue b/web-app/packages/admin-lib/src/modules/admin/components/ReportDownloadDialog.vue
new file mode 100644
index 00000000..a092d9cf
--- /dev/null
+++ b/web-app/packages/admin-lib/src/modules/admin/components/ReportDownloadDialog.vue
@@ -0,0 +1,90 @@
+<template>
+  <form @submit.prevent="download" class="flex flex-column pb-4 gap-2">
+    <span class="p-input-filled">
+      <label id="period-label">Period</label>
+      <app-dropdown
+        aria-labelledby="period-label"
+        v-model="period"
+        :options="periodOptions"
+      />
+    </span>
+
+    <span class="p-input-filled w-full">
+      <label for="range">Custom range</label>
+      <PCalendar
+        inputId="range"
+        v-model="range"
+        selectionMode="range"
+        :disabled="Number(period) > -1"
+        :max-date="maxDate"
+        class="w-full"
+        placeholder="Select date range"
+      />
+    </span>
+
+    <!-- Footer -->
+    <div
+      class="w-full flex flex-column lg:flex-row justify-content-between align-items-center mt-4"
+    >
+      <PButton
+        severity="secondary"
+        @click="close"
+        class="w-12 mb-2 lg:mb-0 lg:mr-2 lg:w-6"
+        data-cy="clone-dialog-close-btn"
+        label="Cancel"
+      />
+      <PButton
+        type="submit"
+        class="w-12 lg:w-6"
+        label="Download"
+        :disabled="range.length === 0"
+      />
+    </div>
+  </form>
+</template>
+
+<script lang="ts" setup>
+import {
+  AppDropdown,
+  dateUtils,
+  DropdownOption,
+  useDialogStore
+} from '@mergin/lib'
+import { ref, watchEffect } from 'vue'
+
+import { useAdminStore } from '@/main'
+
+const dialogStore = useDialogStore()
+const adminStore = useAdminStore()
+
+const maxDate = ref<Date>(new Date())
+const period = ref<string>('3')
+const periodOptions = ref<DropdownOption[]>([
+  { label: 'Last 3 months', value: '3' },
+  { label: 'Last 6 months', value: '6' },
+  { label: 'Last 12 months', value: '12' },
+  { label: 'Custom range', value: '-1' }
+])
+const range = ref<Array<Date>>([
+  dateUtils.getDateFromMonthsAgo(Number(period.value)),
+  new Date()
+])
+
+watchEffect(() => {
+  const periodValue = Number(period.value)
+  if (periodValue < 0) {
+    range.value = []
+    return
+  }
+  range.value = [dateUtils.getDateFromMonthsAgo(periodValue), new Date()]
+})
+
+function close() {
+  dialogStore.closeDialog()
+}
+
+function download() {
+  const [from, to] = range.value
+  adminStore.downloadReport({ from, to })
+}
+</script>
diff --git a/web-app/packages/admin-lib/src/modules/admin/store.ts b/web-app/packages/admin-lib/src/modules/admin/store.ts
index 7b9281ff..46b3e9af 100644
--- a/web-app/packages/admin-lib/src/modules/admin/store.ts
+++ b/web-app/packages/admin-lib/src/modules/admin/store.ts
@@ -13,6 +13,7 @@ import {
   useNotificationStore,
   UserResponse
 } from '@mergin/lib'
+import FileSaver from 'file-saver'
 import { defineStore, getActivePinia } from 'pinia'
 import Cookies from 'universal-cookie'
 
@@ -22,10 +23,12 @@ import { AdminApi } from '@/modules/admin/adminApi'
 import {
   LatestServerVersionResponse,
   PaginatedAdminProjectsParams,
-  PaginatedAdminProjectsResponse, ServerUsageResponse,
+  PaginatedAdminProjectsResponse,
+  ServerUsageResponse,
   UpdateUserPayload,
   UsersResponse
 } from '@/modules/admin/types'
+import axios from 'axios'
 
 export interface AdminState {
   loading: boolean
@@ -325,6 +328,39 @@ export const useAdminStore = defineStore('adminModule', {
       } catch (e) {
         notificationStore.error({ text: errorUtils.getErrorMessage(e) })
       }
+    },
+
+    async downloadReport(payload: { from: Date; to: Date }) {
+      const notificationStore = useNotificationStore()
+
+      try {
+        const { from, to } = payload
+        const url = AdminApi.contructDownloadStatisticsUrl()
+        const date = new Date()
+        // we need to sanitize hours from custom range in Calendar picker, because it's 00:00:00 by default. If you convert it to UTC -> it could be previous day, which is not what you selected.
+        from.setHours(date.getHours(), date.getMinutes(), date.getSeconds())
+        to.setHours(date.getHours(), date.getMinutes(), date.getSeconds())
+        // toISOString converts date to iso format and UTC zone
+        const date_from = payload.from.toISOString().split('T')[0]
+        const date_to = payload.to.toISOString().split('T')[0]
+        const resp = await AdminApi.downloadStatistics(url, {
+          date_from,
+          date_to
+        })
+        const fileName =
+          resp.headers['content-disposition'].split('filename=')[1]
+        FileSaver.saveAs(resp.data, fileName)
+      } catch (e) {
+        // parse error details from blob
+        if (axios.isAxiosError(e)) {
+          let resp
+          const blob = new Blob([e.response.data], { type: 'text/plain' })
+          blob.text().then((text) => {
+            resp = JSON.parse(text)
+            notificationStore.error({ text: resp.detail })
+          })
+        }
+      }
     }
   }
 })
diff --git a/web-app/packages/admin-lib/src/modules/admin/types.ts b/web-app/packages/admin-lib/src/modules/admin/types.ts
index 2c3bc54d..e443b0a7 100644
--- a/web-app/packages/admin-lib/src/modules/admin/types.ts
+++ b/web-app/packages/admin-lib/src/modules/admin/types.ts
@@ -80,4 +80,9 @@ export interface ServerUsage {
   editors: number
 }
 
+export interface DownloadReportParams {
+  date_from: string
+  date_to: string
+}
+
 /* eslint-enable camelcase */
diff --git a/web-app/packages/admin-lib/src/modules/admin/views/SettingsViewTemplate.vue b/web-app/packages/admin-lib/src/modules/admin/views/SettingsViewTemplate.vue
index ee4880c7..5ef98bf2 100644
--- a/web-app/packages/admin-lib/src/modules/admin/views/SettingsViewTemplate.vue
+++ b/web-app/packages/admin-lib/src/modules/admin/views/SettingsViewTemplate.vue
@@ -16,12 +16,19 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
       <app-section>
         <template #title>Advanced</template>
         <app-settings :items="settingsItems">
-          <slot />
+          <template #items-start><slot /></template>
+
           <template #checkForUpdates
             ><PInputSwitch
               :modelValue="adminStore.checkForUpdates"
               @change="switchCheckForUpdates"
           /></template>
+          <template #downloadReport
+            ><PButton
+              severity="secondary"
+              @click="downloadReport"
+              label="Download"
+          /></template>
         </app-settings>
       </app-section>
     </app-container>
@@ -33,9 +40,11 @@ import {
   AppContainer,
   AppSection,
   AppSettings,
-  AppSettingsItemConfig
+  AppSettingsItemConfig,
+  useDialogStore
 } from '@mergin/lib'
 
+import ReportDownloadDialog from '../components/ReportDownloadDialog.vue'
 import { useAdminStore } from '../store'
 
 import AdminLayout from '@/modules/admin/components/AdminLayout.vue'
@@ -46,16 +55,31 @@ withDefaults(defineProps<{ settingsItems?: AppSettingsItemConfig[] }>(), {
       title: 'Check for updates',
       description: 'Let Mergin Maps automatically check for new updates',
       key: 'checkForUpdates'
+    },
+    {
+      title: 'Server usage report',
+      description: 'Download usage statistics for your server deployment.',
+      key: 'downloadReport'
     }
   ]
 })
 
 const adminStore = useAdminStore()
+const dialogStore = useDialogStore()
 
 function switchCheckForUpdates() {
   const value = !adminStore.checkForUpdates
   adminStore.setCheckUpdatesToCookies({ value })
 }
+
+function downloadReport() {
+  dialogStore.show({
+    component: ReportDownloadDialog,
+    params: {
+      dialog: { header: 'Doownload usage report' }
+    }
+  })
+}
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/web-app/packages/lib/src/common/components/app-settings/AppSettings.vue b/web-app/packages/lib/src/common/components/app-settings/AppSettings.vue
index 4627492d..29cd1800 100644
--- a/web-app/packages/lib/src/common/components/app-settings/AppSettings.vue
+++ b/web-app/packages/lib/src/common/components/app-settings/AppSettings.vue
@@ -5,6 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 -->
 <template>
   <div class="flex flex-column row-gap-3 px-4 pb-4">
+    <slot name="items-start"></slot>
     <app-settings-item v-for="(item, index) in items" :key="index">
       <template #title>{{ item.title }}</template>
       <template #description>{{ item.description }}</template>
diff --git a/web-app/packages/lib/src/common/components/app-settings/AppSettingsItem.vue b/web-app/packages/lib/src/common/components/app-settings/AppSettingsItem.vue
index 5c5c6128..493a1aae 100644
--- a/web-app/packages/lib/src/common/components/app-settings/AppSettingsItem.vue
+++ b/web-app/packages/lib/src/common/components/app-settings/AppSettingsItem.vue
@@ -11,11 +11,11 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
       'md:align-items-center md:flex-row'
     ]"
   >
-    <div class="flex-grow-1">
+    <div class="flex-grow-1 mr-2">
       <p class="title-t3">
         <slot name="title"></slot>
       </p>
-      <span class="paragraph-p6 opacity-80">
+      <span class="paragraph-p6 opacity-80 mr-2">
         <slot name="description"></slot>
       </span>
     </div>
diff --git a/web-app/packages/lib/src/common/date_utils.ts b/web-app/packages/lib/src/common/date_utils.ts
index 1dc40a2f..68f368cf 100644
--- a/web-app/packages/lib/src/common/date_utils.ts
+++ b/web-app/packages/lib/src/common/date_utils.ts
@@ -102,3 +102,13 @@ export function formatRemainingTime(t2, t1 = new Date()) {
       return remainingFormatDuration(days, 'days')
   }
 }
+
+/**
+ * Calculates date from today to given months number in past.
+ * Doest not convert to UTC.
+ */
+export function getDateFromMonthsAgo(months) {
+  const date = new Date()
+  date.setMonth(date.getMonth() - months)
+  return date
+}

From 2523854fdf35050d833c1fcdc08d4f059c6640f6 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Thu, 23 Jan 2025 15:10:11 +0100
Subject: [PATCH 02/10] BE: migration to export mergin_statistics

---
 server/mergin/stats/api.yaml                  | 31 ++++++++++
 server/mergin/stats/controller.py             | 60 +++++++++++++++++-
 server/mergin/stats/models.py                 | 12 ++++
 server/mergin/stats/tasks.py                  |  6 +-
 server/mergin/sync/permissions.py             |  2 +-
 server/mergin/tests/test_statistics.py        | 61 ++++++++++++++++++-
 ...7cf462d76ed_add_mergin_statistics_table.py | 35 +++++++++++
 7 files changed, 202 insertions(+), 5 deletions(-)
 create mode 100644 server/migrations/community/37cf462d76ed_add_mergin_statistics_table.py

diff --git a/server/mergin/stats/api.yaml b/server/mergin/stats/api.yaml
index dd67d34b..382da567 100644
--- a/server/mergin/stats/api.yaml
+++ b/server/mergin/stats/api.yaml
@@ -22,6 +22,37 @@ paths:
         "404":
           $ref: "#/components/responses/NotFoundResp"
       x-openapi-router-controller: mergin.stats.controller
+  /app/admin/report:
+    get:
+      summary: Download statistics for server
+      operationId: download_report
+      x-openapi-router-controller: mergin.stats.controller
+      parameters:
+        - name: date_from
+          in: query
+          description: Start date for statistics (YYYY-MM-DD)
+          required: true
+          schema:
+            type: string
+            format: date
+        - name: date_to
+          in: query
+          description: End date for statistics (YYYY-MM-DD)
+          required: true
+          schema:
+            type: string
+            format: date
+      responses:
+        "200":
+          description: CSV file with statistics
+          content:
+            text/csv:
+              schema:
+                type: string
+        "400":
+          $ref: "#/components/responses/BadStatusResp"
+        "404":
+          $ref: "#/components/responses/NotFoundResp"
 components:
   responses:
     UnauthorizedError:
diff --git a/server/mergin/stats/controller.py b/server/mergin/stats/controller.py
index 6fe255aa..c1f6454c 100644
--- a/server/mergin/stats/controller.py
+++ b/server/mergin/stats/controller.py
@@ -3,10 +3,27 @@
 # SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 
 import requests
-from flask import abort, current_app
+from flask import abort, current_app, make_response
+from datetime import datetime, time
+from csv import DictWriter
+
+from mergin.auth.app import auth_required
+from mergin.stats.models import MerginStatistics
 
 from .config import Configuration
-from ..app import parse_version_string
+from ..app import parse_version_string, db
+
+
+class CsvTextBuilder(object):
+    """
+    Mock csv writer that writes to text buffer
+    """
+
+    def __init__(self):
+        self.data = []
+
+    def write(self, row):
+        self.data.append(row)
 
 
 def get_latest_version():
@@ -29,3 +46,42 @@ def get_latest_version():
 
     data = {**data, **parsed_version}
     return data, 200
+
+
+@auth_required(permissions=["admin"])
+def download_report(date_from: str, date_to: str):
+    """Download statistics from server instance"""
+    try:
+        # try to validate dates to prevent unhandled date formats
+        # add start of the day time and end of the day time to prevent bad filtering in db
+        parsed_from = datetime.combine(
+            datetime.strptime(date_from, "%Y-%m-%d"), time.min
+        )
+        parsed_to = datetime.combine(datetime.strptime(date_to, "%Y-%m-%d"), time.max)
+    except ValueError:
+        abort(400, "Invalid date format")
+
+    stats = (
+        db.session.query(MerginStatistics.data)
+        .filter(MerginStatistics.created_at.between(parsed_from, parsed_to))
+        .order_by(MerginStatistics.created_at.desc())
+        .all()
+    )
+    data = [stat.data for stat in stats]
+    # get columns for data, this is usefull when we will update data json format (removing columns, adding new ones)
+    columns = set()
+    for item in data:
+        columns.update(item.keys())
+
+    builder = CsvTextBuilder()
+    writer = DictWriter(
+        builder,
+        fieldnames=list(columns),
+    )
+    writer.writeheader()
+    writer.writerows(data)
+    csv_data = "".join(builder.data)
+    response = make_response(csv_data)
+    response.headers["Content-Disposition"] = f"attachment; filename=usage-report.csv"
+    response.mimetype = "text/csv"
+    return response
diff --git a/server/mergin/stats/models.py b/server/mergin/stats/models.py
index 320e0137..4c9b3ec0 100644
--- a/server/mergin/stats/models.py
+++ b/server/mergin/stats/models.py
@@ -4,6 +4,7 @@
 
 import uuid
 from sqlalchemy.dialects.postgresql import UUID
+from datetime import datetime, timezone
 
 from ..app import db
 
@@ -19,3 +20,14 @@ def __init__(self, service_id: str = None):
             self.service_id = uuid.UUID(service_id)
         else:
             self.service_id = uuid.uuid4()
+
+
+class MerginStatistics(db.Model):
+    """Information about deployment"""
+
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    created_at = db.Column(
+        db.DateTime, index=True, nullable=False, server_default="now()"
+    )
+    # data with statistics
+    data = db.Column(db.JSON)
diff --git a/server/mergin/stats/tasks.py b/server/mergin/stats/tasks.py
index da7a9cb6..a7e0deaa 100644
--- a/server/mergin/stats/tasks.py
+++ b/server/mergin/stats/tasks.py
@@ -9,7 +9,7 @@
 from flask import current_app
 from sqlalchemy.sql.operators import is_
 
-from .models import MerginInfo
+from .models import MerginInfo, MerginStatistics
 from ..celery import celery
 from ..app import db
 from ..auth.models import User
@@ -72,6 +72,10 @@ def send_statistics():
         "editors": current_app.ws_handler.server_editors_count(),
     }
 
+    stats = MerginStatistics(data=data)
+    db.session.add(stats)
+    db.session.commit()
+
     try:
         resp = requests.post(
             current_app.config["STATISTICS_URL"] + "/usage-statistic",
diff --git a/server/mergin/sync/permissions.py b/server/mergin/sync/permissions.py
index 4e3901d5..4305a15f 100644
--- a/server/mergin/sync/permissions.py
+++ b/server/mergin/sync/permissions.py
@@ -192,7 +192,7 @@ def is_active_workspace(workspace):
     return workspace.is_active or is_admin
 
 
-def require_project(ws, project_name, permission):
+def require_project(ws, project_name, permission) -> Project:
     workspace = current_app.ws_handler.get_by_name(ws)
     if not workspace:
         abort(404)
diff --git a/server/mergin/tests/test_statistics.py b/server/mergin/tests/test_statistics.py
index b73cb042..2801fc69 100644
--- a/server/mergin/tests/test_statistics.py
+++ b/server/mergin/tests/test_statistics.py
@@ -2,6 +2,8 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 
+import csv
+from datetime import timezone, datetime
 import json
 from unittest.mock import patch
 import requests
@@ -12,7 +14,7 @@
 
 from ..app import db
 from ..stats.tasks import send_statistics
-from ..stats.models import MerginInfo
+from ..stats.models import MerginInfo, MerginStatistics
 from .utils import Response, add_user, create_project, create_workspace
 
 
@@ -35,6 +37,7 @@ def test_send_statistics(app, caplog):
         project = create_project("project", workspace, admin)
         project.set_role(user.id, ProjectRole.EDITOR)
         task = send_statistics.s().apply()
+        assert MerginStatistics.query.count() == 0
         # nothing was done
         assert task.status == "SUCCESS"
         assert not info.last_reported
@@ -69,6 +72,12 @@ def test_send_statistics(app, caplog):
         assert data["projects_count"] == 2
         assert data["contact_email"] == "test@example.com"
         assert data["editors"] == 2
+        assert MerginStatistics.query.count() == 1
+        stats = MerginStatistics.query.order_by(
+            MerginStatistics.created_at.desc()
+        ).first()
+        assert stats.created_at
+        assert stats.data == data
 
         # repeated action does not do anything
         task = send_statistics.s().apply()
@@ -87,6 +96,7 @@ def test_send_statistics(app, caplog):
         assert data["projects_count"] == 1
         assert data["users_count"] == 1
         assert data["editors"] == 1
+        assert MerginStatistics.query.count() == 2
 
         info.last_reported = None
         db.session.commit()
@@ -96,6 +106,7 @@ def test_send_statistics(app, caplog):
         assert task.status == "SUCCESS"
         assert not info.last_reported
         assert "Statistics error" in caplog.text
+        assert MerginStatistics.query.count() == 3
 
         # server does not respond
         mock.return_value = {}
@@ -152,3 +163,51 @@ def test_server_updates(client):
         mock.side_effect = requests.exceptions.RequestException("Some failure")
         resp = client.get(url)
         assert resp.status_code == 400
+
+
+def test_download_report(app, client):
+    """Test download report endpoint"""
+    url = "/app/admin/report"
+    resp = client.get(url)
+    resp.status_code == 400
+
+    # bad date format
+    resp = client.get(f"{url}?date_from=2021-01-01T00:00:00&date_to=2021-01-01")
+    assert resp.status_code == 400
+
+    app.config["COLLECT_STATISTICS"] = True
+    app.config["CONTACT_EMAIL"] = "test@example.com"
+    with patch("requests.post") as mock:
+        mock.return_value = Response(True, {})
+        send_statistics.s().apply()
+        resp = client.get(
+            f"{url}?date_from=2021-01-01&date_to={datetime.now(timezone.utc).strftime('%Y-%m-%d')}"
+        )
+        assert resp.status_code == 200
+        assert resp.mimetype == "text/csv"
+        lines = resp.data.splitlines()
+        assert len(lines) == 2
+
+        stat = MerginStatistics.query.first()
+        stat.created_at = datetime(2021, 1, 1, tzinfo=timezone.utc)
+        db.session.commit()
+
+        resp = client.get(
+            f"{url}?date_from=2021-01-01&date_to={datetime.now(timezone.utc).strftime('%Y-%m-%d')}"
+        )
+        assert resp.status_code == 200
+        assert resp.mimetype == "text/csv"
+        lines = resp.data.splitlines()
+        assert len(lines) == 2
+
+        # empty response
+        stat.created_at = datetime(2020, 1, 1, tzinfo=timezone.utc)
+        db.session.commit()
+        resp = client.get(
+            f"{url}?date_from=2021-01-01&date_to={datetime.now(timezone.utc).strftime('%Y-%m-%d')}"
+        )
+        assert resp.status_code == 200
+        assert resp.mimetype == "text/csv"
+        lines = resp.data.splitlines()
+        assert resp.data == b"\r\n"
+        assert len(lines) == 1
diff --git a/server/migrations/community/37cf462d76ed_add_mergin_statistics_table.py b/server/migrations/community/37cf462d76ed_add_mergin_statistics_table.py
new file mode 100644
index 00000000..0d1bd198
--- /dev/null
+++ b/server/migrations/community/37cf462d76ed_add_mergin_statistics_table.py
@@ -0,0 +1,35 @@
+"""add mergin statistics table
+
+Revision ID: 37cf462d76ed
+Revises: d02961c7416c
+Create Date: 2025-01-22 17:09:00.718129
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '37cf462d76ed'
+down_revision = 'd02961c7416c'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('mergin_statistics',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default='now()', nullable=False),
+    sa.Column('data', sa.JSON(), nullable=True),
+    sa.PrimaryKeyConstraint('id', name=op.f('pk_mergin_statistics'))
+    )
+    op.create_index(op.f('ix_mergin_statistics_created_at'), 'mergin_statistics', ['created_at'], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f('ix_mergin_statistics_created_at'), table_name='mergin_statistics')
+    op.drop_table('mergin_statistics')
+    # ### end Alembic commands ###

From c2de0f65b94674bf2b55afa953b0c13602b9597a Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Thu, 23 Jan 2025 15:52:43 +0100
Subject: [PATCH 03/10] Unfy name of csv + unify sorting of columns in report

---
 server/mergin/stats/controller.py                     | 5 ++++-
 server/mergin/tests/test_statistics.py                | 5 +++++
 web-app/packages/admin-lib/src/modules/admin/store.ts | 6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/server/mergin/stats/controller.py b/server/mergin/stats/controller.py
index c1f6454c..834dfd2b 100644
--- a/server/mergin/stats/controller.py
+++ b/server/mergin/stats/controller.py
@@ -73,10 +73,13 @@ def download_report(date_from: str, date_to: str):
     for item in data:
         columns.update(item.keys())
 
+    sorted_columns = list(columns)
+    sorted_columns.sort()
+
     builder = CsvTextBuilder()
     writer = DictWriter(
         builder,
-        fieldnames=list(columns),
+        fieldnames=sorted_columns,
     )
     writer.writeheader()
     writer.writerows(data)
diff --git a/server/mergin/tests/test_statistics.py b/server/mergin/tests/test_statistics.py
index 2801fc69..270c977c 100644
--- a/server/mergin/tests/test_statistics.py
+++ b/server/mergin/tests/test_statistics.py
@@ -189,6 +189,11 @@ def test_download_report(app, client):
         assert len(lines) == 2
 
         stat = MerginStatistics.query.first()
+        keys = list(stat.data.keys())
+        keys.sort()
+        assert lines[0].decode("UTF-8") == ",".join(keys)
+
+        # test same day
         stat.created_at = datetime(2021, 1, 1, tzinfo=timezone.utc)
         db.session.commit()
 
diff --git a/web-app/packages/admin-lib/src/modules/admin/store.ts b/web-app/packages/admin-lib/src/modules/admin/store.ts
index 46b3e9af..1f76d4b1 100644
--- a/web-app/packages/admin-lib/src/modules/admin/store.ts
+++ b/web-app/packages/admin-lib/src/modules/admin/store.ts
@@ -349,7 +349,11 @@ export const useAdminStore = defineStore('adminModule', {
         })
         const fileName =
           resp.headers['content-disposition'].split('filename=')[1]
-        FileSaver.saveAs(resp.data, fileName)
+        const extension = fileName.split('.')[1]
+        new FileSaver.saveAs(
+          resp.data,
+          `usage-report-${date.toISOString().split('T')[0]}.${extension}`
+        )
       } catch (e) {
         // parse error details from blob
         if (axios.isAxiosError(e)) {

From 4533b85838ccb858f44e481991e22a209bf1cb71 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Thu, 23 Jan 2025 15:59:56 +0100
Subject: [PATCH 04/10] Black

---
 ...7cf462d76ed_add_mergin_statistics_table.py | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/server/migrations/community/37cf462d76ed_add_mergin_statistics_table.py b/server/migrations/community/37cf462d76ed_add_mergin_statistics_table.py
index 0d1bd198..2927731f 100644
--- a/server/migrations/community/37cf462d76ed_add_mergin_statistics_table.py
+++ b/server/migrations/community/37cf462d76ed_add_mergin_statistics_table.py
@@ -5,31 +5,40 @@
 Create Date: 2025-01-22 17:09:00.718129
 
 """
+
 from alembic import op
 import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-revision = '37cf462d76ed'
-down_revision = 'd02961c7416c'
+revision = "37cf462d76ed"
+down_revision = "d02961c7416c"
 branch_labels = None
 depends_on = None
 
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('mergin_statistics',
-    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
-    sa.Column('created_at', sa.DateTime(), server_default='now()', nullable=False),
-    sa.Column('data', sa.JSON(), nullable=True),
-    sa.PrimaryKeyConstraint('id', name=op.f('pk_mergin_statistics'))
+    op.create_table(
+        "mergin_statistics",
+        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column("created_at", sa.DateTime(), server_default="now()", nullable=False),
+        sa.Column("data", sa.JSON(), nullable=True),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_mergin_statistics")),
+    )
+    op.create_index(
+        op.f("ix_mergin_statistics_created_at"),
+        "mergin_statistics",
+        ["created_at"],
+        unique=False,
     )
-    op.create_index(op.f('ix_mergin_statistics_created_at'), 'mergin_statistics', ['created_at'], unique=False)
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_index(op.f('ix_mergin_statistics_created_at'), table_name='mergin_statistics')
-    op.drop_table('mergin_statistics')
+    op.drop_index(
+        op.f("ix_mergin_statistics_created_at"), table_name="mergin_statistics"
+    )
+    op.drop_table("mergin_statistics")
     # ### end Alembic commands ###

From 4ffa9fa4369e2f373d8fcb05348ec890a97cd768 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Fri, 24 Jan 2025 12:29:03 +0100
Subject: [PATCH 05/10] Use dataclass for callhome data - separated task for
 save_statistics

---
 server/application.py                  |   8 +-
 server/mergin/stats/controller.py      |  26 +++---
 server/mergin/stats/models.py          |  17 ++++
 server/mergin/stats/tasks.py           |  83 +++++++++++-------
 server/mergin/tests/test_statistics.py | 113 +++++++++++++------------
 5 files changed, 151 insertions(+), 96 deletions(-)

diff --git a/server/application.py b/server/application.py
index 2a4220b6..002b0b54 100644
--- a/server/application.py
+++ b/server/application.py
@@ -26,7 +26,7 @@
 from mergin.sync.tasks import remove_temp_files, remove_projects_backups
 from mergin.celery import celery, configure_celery
 from mergin.stats.config import Configuration
-from mergin.stats.tasks import send_statistics
+from mergin.stats.tasks import save_statistics, send_statistics
 from mergin.stats.app import register as register_stats
 
 Configuration.SERVER_TYPE = "ce"
@@ -65,6 +65,11 @@ def setup_periodic_tasks(sender, **kwargs):
         remove_projects_backups,
         name="remove old project backups",
     )
+    sender.add_periodic_task(
+        crontab(hour=12, minute=0),
+        save_statistics,
+        name="Save usage statistics to database",
+    )
     if Configuration.COLLECT_STATISTICS:
         sender.add_periodic_task(
             crontab(hour=randint(0, 5), minute=randint(0, 60)),
@@ -76,3 +81,4 @@ def setup_periodic_tasks(sender, **kwargs):
 # send report after start
 if Configuration.COLLECT_STATISTICS:
     send_statistics.delay()
+save_statistics.delay()
diff --git a/server/mergin/stats/controller.py b/server/mergin/stats/controller.py
index 834dfd2b..0e99f03d 100644
--- a/server/mergin/stats/controller.py
+++ b/server/mergin/stats/controller.py
@@ -2,13 +2,14 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 
+from dataclasses import asdict
 import requests
 from flask import abort, current_app, make_response
 from datetime import datetime, time
 from csv import DictWriter
 
 from mergin.auth.app import auth_required
-from mergin.stats.models import MerginStatistics
+from mergin.stats.models import MerginStatistics, ServerCallhomeData
 
 from .config import Configuration
 from ..app import parse_version_string, db
@@ -62,25 +63,24 @@ def download_report(date_from: str, date_to: str):
         abort(400, "Invalid date format")
 
     stats = (
-        db.session.query(MerginStatistics.data)
+        db.session.query(MerginStatistics.created_at, MerginStatistics.data)
         .filter(MerginStatistics.created_at.between(parsed_from, parsed_to))
         .order_by(MerginStatistics.created_at.desc())
         .all()
     )
-    data = [stat.data for stat in stats]
+    createdColumn = "created_at"
+    data = [
+        {
+            **stat.data,
+            "created_at": datetime.isoformat(stat.created_at),
+        }
+        for stat in stats
+    ]
+    columns = list(ServerCallhomeData.__dataclass_fields__.keys()) + [createdColumn]
     # get columns for data, this is usefull when we will update data json format (removing columns, adding new ones)
-    columns = set()
-    for item in data:
-        columns.update(item.keys())
-
-    sorted_columns = list(columns)
-    sorted_columns.sort()
 
     builder = CsvTextBuilder()
-    writer = DictWriter(
-        builder,
-        fieldnames=sorted_columns,
-    )
+    writer = DictWriter(builder, fieldnames=columns, extrasaction="ignore")
     writer.writeheader()
     writer.writerows(data)
     csv_data = "".join(builder.data)
diff --git a/server/mergin/stats/models.py b/server/mergin/stats/models.py
index 4c9b3ec0..f67bd7d3 100644
--- a/server/mergin/stats/models.py
+++ b/server/mergin/stats/models.py
@@ -2,6 +2,8 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 
+from dataclasses import dataclass
+from typing import Optional
 import uuid
 from sqlalchemy.dialects.postgresql import UUID
 from datetime import datetime, timezone
@@ -9,6 +11,21 @@
 from ..app import db
 
 
+@dataclass
+class ServerCallhomeData:
+    service_uuid: Optional[str]
+    url: Optional[str]
+    contact_email: Optional[str]
+    licence: Optional[str]
+    projects_count: Optional[int]
+    users_count: Optional[int]
+    workspaces_count: Optional[int]
+    last_change: Optional[str]
+    server_version: Optional[str]
+    monthly_contributors: Optional[int]
+    editors: Optional[int]
+
+
 class MerginInfo(db.Model):
     """Information about deployment"""
 
diff --git a/server/mergin/stats/tasks.py b/server/mergin/stats/tasks.py
index a7e0deaa..53238041 100644
--- a/server/mergin/stats/tasks.py
+++ b/server/mergin/stats/tasks.py
@@ -2,20 +2,67 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 
+from dataclasses import asdict
 import requests
-import datetime
+from datetime import datetime, timedelta, timezone
 import json
 import logging
 from flask import current_app
 from sqlalchemy.sql.operators import is_
 
-from .models import MerginInfo, MerginStatistics
+from .models import MerginInfo, MerginStatistics, ServerCallhomeData
 from ..celery import celery
 from ..app import db
 from ..auth.models import User
 from ..sync.models import Project
 
 
+def get_callhome_data(info: MerginInfo | None = None) -> ServerCallhomeData:
+    """
+    Get data about server to send to callhome service
+    """
+    last_change_item = (
+        db.session.query(Project.updated).order_by(Project.updated.desc()).first()
+    )
+    service_uuid = str(info.service_id) if info else None
+    data = ServerCallhomeData(
+        service_uuid=service_uuid,
+        url=current_app.config["MERGIN_BASE_URL"],
+        contact_email=current_app.config["CONTACT_EMAIL"],
+        licence=current_app.config["SERVER_TYPE"],
+        projects_count=Project.query.filter(Project.removed_at.is_(None)).count(),
+        users_count=User.query.filter(
+            is_(User.username.ilike("deleted_%"), False)
+        ).count(),
+        workspaces_count=current_app.ws_handler.workspace_count(),
+        last_change=str(last_change_item.updated) + "Z" if last_change_item else "",
+        server_version=current_app.config["VERSION"],
+        monthly_contributors=current_app.ws_handler.monthly_contributors_count(),
+        editors=current_app.ws_handler.server_editors_count(),
+    )
+    return data
+
+
+@celery.task(ignore_result=True)
+def save_statistics():
+    """Save statistics about usage."""
+    to_date = datetime.now(timezone.utc)
+    from_date = datetime.now(timezone.utc) - timedelta(hours=12)
+    # debounce to avoid sending multiple times in short after restart of server
+    last_stat = MerginStatistics.query.filter(
+        MerginStatistics.created_at > from_date,
+        MerginStatistics.created_at < to_date,
+    ).first()
+    if last_stat:
+        return
+
+    info = MerginInfo.query.first()
+    data = get_callhome_data(info)
+    stat = MerginStatistics(data=data)
+    db.session.add(stat)
+    db.session.commit()
+
+
 @celery.task(ignore_result=True)
 def send_statistics():
     """Send statistics about usage."""
@@ -45,36 +92,12 @@ def send_statistics():
         db.session.add(info)
         db.session.commit()
 
-    if (
-        info.last_reported
-        and datetime.datetime.utcnow()
-        < info.last_reported + datetime.timedelta(hours=12)
+    if info.last_reported and datetime.utcnow() < info.last_reported + timedelta(
+        hours=12
     ):
         return
 
-    last_change_item = (
-        db.session.query(Project.updated).order_by(Project.updated.desc()).first()
-    )
-
-    data = {
-        "service_uuid": str(info.service_id),
-        "url": current_app.config["MERGIN_BASE_URL"],
-        "contact_email": current_app.config["CONTACT_EMAIL"],
-        "licence": current_app.config["SERVER_TYPE"],
-        "projects_count": Project.query.filter(Project.removed_at.is_(None)).count(),
-        "users_count": User.query.filter(
-            is_(User.username.ilike("deleted_%"), False)
-        ).count(),
-        "workspaces_count": current_app.ws_handler.workspace_count(),
-        "last_change": str(last_change_item.updated) + "Z" if last_change_item else "",
-        "server_version": current_app.config["VERSION"],
-        "monthly_contributors": current_app.ws_handler.monthly_contributors_count(),
-        "editors": current_app.ws_handler.server_editors_count(),
-    }
-
-    stats = MerginStatistics(data=data)
-    db.session.add(stats)
-    db.session.commit()
+    data = asdict(get_callhome_data(info))
 
     try:
         resp = requests.post(
@@ -82,7 +105,7 @@ def send_statistics():
             data=json.dumps(data),
         )
         if resp.ok:
-            info.last_reported = datetime.datetime.utcnow()
+            info.last_reported = datetime.utcnow()
             db.session.commit()
         else:
             logging.warning("Statistics error: " + str(resp.text))
diff --git a/server/mergin/tests/test_statistics.py b/server/mergin/tests/test_statistics.py
index 270c977c..3b7b86a9 100644
--- a/server/mergin/tests/test_statistics.py
+++ b/server/mergin/tests/test_statistics.py
@@ -3,7 +3,8 @@
 # SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 
 import csv
-from datetime import timezone, datetime
+from dataclasses import asdict
+from datetime import timedelta, timezone, datetime
 import json
 from unittest.mock import patch
 import requests
@@ -13,8 +14,8 @@
 from mergin.sync.models import Project, ProjectRole
 
 from ..app import db
-from ..stats.tasks import send_statistics
-from ..stats.models import MerginInfo, MerginStatistics
+from ..stats.tasks import get_callhome_data, save_statistics, send_statistics
+from ..stats.models import MerginInfo, MerginStatistics, ServerCallhomeData
 from .utils import Response, add_user, create_project, create_workspace
 
 
@@ -37,7 +38,6 @@ def test_send_statistics(app, caplog):
         project = create_project("project", workspace, admin)
         project.set_role(user.id, ProjectRole.EDITOR)
         task = send_statistics.s().apply()
-        assert MerginStatistics.query.count() == 0
         # nothing was done
         assert task.status == "SUCCESS"
         assert not info.last_reported
@@ -72,12 +72,6 @@ def test_send_statistics(app, caplog):
         assert data["projects_count"] == 2
         assert data["contact_email"] == "test@example.com"
         assert data["editors"] == 2
-        assert MerginStatistics.query.count() == 1
-        stats = MerginStatistics.query.order_by(
-            MerginStatistics.created_at.desc()
-        ).first()
-        assert stats.created_at
-        assert stats.data == data
 
         # repeated action does not do anything
         task = send_statistics.s().apply()
@@ -96,7 +90,6 @@ def test_send_statistics(app, caplog):
         assert data["projects_count"] == 1
         assert data["users_count"] == 1
         assert data["editors"] == 1
-        assert MerginStatistics.query.count() == 2
 
         info.last_reported = None
         db.session.commit()
@@ -106,7 +99,6 @@ def test_send_statistics(app, caplog):
         assert task.status == "SUCCESS"
         assert not info.last_reported
         assert "Statistics error" in caplog.text
-        assert MerginStatistics.query.count() == 3
 
         # server does not respond
         mock.return_value = {}
@@ -165,6 +157,26 @@ def test_server_updates(client):
         assert resp.status_code == 400
 
 
+def test_save_statistics(app, client):
+    """Test save statistics celery job"""
+    info = MerginInfo.query.first()
+    app.config["CONTACT_EMAIL"] = "test@example.com"
+    assert MerginStatistics.query.count() == 0
+    save_statistics.s().apply()
+    assert MerginStatistics.query.count() == 1
+    stats = MerginStatistics.query.order_by(MerginStatistics.created_at.desc()).first()
+    stats_json_data = get_callhome_data(info)
+    assert stats.created_at
+    assert stats.data == asdict(stats_json_data)
+
+    # debouncing
+    save_statistics.s().apply()
+    assert MerginStatistics.query.count() == 1
+    stats.created_at = datetime.now(timezone.utc) - timedelta(hours=12)
+    save_statistics.s().apply()
+    assert MerginStatistics.query.count() == 2
+
+
 def test_download_report(app, client):
     """Test download report endpoint"""
     url = "/app/admin/report"
@@ -175,44 +187,41 @@ def test_download_report(app, client):
     resp = client.get(f"{url}?date_from=2021-01-01T00:00:00&date_to=2021-01-01")
     assert resp.status_code == 400
 
-    app.config["COLLECT_STATISTICS"] = True
     app.config["CONTACT_EMAIL"] = "test@example.com"
-    with patch("requests.post") as mock:
-        mock.return_value = Response(True, {})
-        send_statistics.s().apply()
-        resp = client.get(
-            f"{url}?date_from=2021-01-01&date_to={datetime.now(timezone.utc).strftime('%Y-%m-%d')}"
-        )
-        assert resp.status_code == 200
-        assert resp.mimetype == "text/csv"
-        lines = resp.data.splitlines()
-        assert len(lines) == 2
-
-        stat = MerginStatistics.query.first()
-        keys = list(stat.data.keys())
-        keys.sort()
-        assert lines[0].decode("UTF-8") == ",".join(keys)
-
-        # test same day
-        stat.created_at = datetime(2021, 1, 1, tzinfo=timezone.utc)
-        db.session.commit()
-
-        resp = client.get(
-            f"{url}?date_from=2021-01-01&date_to={datetime.now(timezone.utc).strftime('%Y-%m-%d')}"
-        )
-        assert resp.status_code == 200
-        assert resp.mimetype == "text/csv"
-        lines = resp.data.splitlines()
-        assert len(lines) == 2
-
-        # empty response
-        stat.created_at = datetime(2020, 1, 1, tzinfo=timezone.utc)
-        db.session.commit()
-        resp = client.get(
-            f"{url}?date_from=2021-01-01&date_to={datetime.now(timezone.utc).strftime('%Y-%m-%d')}"
-        )
-        assert resp.status_code == 200
-        assert resp.mimetype == "text/csv"
-        lines = resp.data.splitlines()
-        assert resp.data == b"\r\n"
-        assert len(lines) == 1
+    save_statistics.s().apply()
+    resp = client.get(
+        f"{url}?date_from=2021-01-01&date_to={datetime.now(timezone.utc).strftime('%Y-%m-%d')}"
+    )
+    assert resp.status_code == 200
+    assert resp.mimetype == "text/csv"
+    lines = resp.data.splitlines()
+    assert len(lines) == 2
+
+    stat = MerginStatistics.query.first()
+    keys = list(asdict(ServerCallhomeData(**stat.data)).keys()) + ["created_at"]
+    assert lines[0].decode("UTF-8") == ",".join(keys)
+
+    # test same day
+    stat.created_at = datetime(2021, 1, 1, tzinfo=timezone.utc)
+    db.session.commit()
+
+    resp = client.get(
+        f"{url}?date_from=2021-01-01&date_to={datetime.now(timezone.utc).strftime('%Y-%m-%d')}"
+    )
+    assert resp.status_code == 200
+    assert resp.mimetype == "text/csv"
+    lines = resp.data.splitlines()
+    assert len(lines) == 2
+
+    # empty response
+    stat.created_at = datetime(2020, 1, 1, tzinfo=timezone.utc)
+    db.session.commit()
+    resp = client.get(
+        f"{url}?date_from=2021-01-01&date_to={datetime.now(timezone.utc).strftime('%Y-%m-%d')}"
+    )
+    assert resp.status_code == 200
+    assert resp.mimetype == "text/csv"
+    lines = resp.data.splitlines()
+    empty_file = f"{','.join(keys)}\r\n"
+    assert resp.data.decode("UTF-8") == empty_file
+    assert len(lines) == 1

From 5a30f1072ff6a7e860eea1121a4d20c308e8bda8 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Fri, 24 Jan 2025 12:56:07 +0100
Subject: [PATCH 06/10] Sanitize download button + typo indialog

---
 .../src/modules/admin/components/ReportDownloadDialog.vue       | 2 +-
 .../admin-lib/src/modules/admin/views/SettingsViewTemplate.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web-app/packages/admin-lib/src/modules/admin/components/ReportDownloadDialog.vue b/web-app/packages/admin-lib/src/modules/admin/components/ReportDownloadDialog.vue
index a092d9cf..acece047 100644
--- a/web-app/packages/admin-lib/src/modules/admin/components/ReportDownloadDialog.vue
+++ b/web-app/packages/admin-lib/src/modules/admin/components/ReportDownloadDialog.vue
@@ -37,7 +37,7 @@
         type="submit"
         class="w-12 lg:w-6"
         label="Download"
-        :disabled="range.length === 0"
+        :disabled="range.filter(Boolean).length < 2"
       />
     </div>
   </form>
diff --git a/web-app/packages/admin-lib/src/modules/admin/views/SettingsViewTemplate.vue b/web-app/packages/admin-lib/src/modules/admin/views/SettingsViewTemplate.vue
index 5ef98bf2..3956ffbc 100644
--- a/web-app/packages/admin-lib/src/modules/admin/views/SettingsViewTemplate.vue
+++ b/web-app/packages/admin-lib/src/modules/admin/views/SettingsViewTemplate.vue
@@ -76,7 +76,7 @@ function downloadReport() {
   dialogStore.show({
     component: ReportDownloadDialog,
     params: {
-      dialog: { header: 'Doownload usage report' }
+      dialog: { header: 'Download report' }
     }
   })
 }

From c2fb39846a66ec68b1b17a3ebaf350db49783472 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Fri, 24 Jan 2025 12:56:18 +0100
Subject: [PATCH 07/10] Address commnets about jsonb @varmar05

---
 server/mergin/stats/models.py                       |  4 ++--
 ... => ba5051218de4_add_mergin_statistics_table.py} | 13 +++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)
 rename server/migrations/community/{37cf462d76ed_add_mergin_statistics_table.py => ba5051218de4_add_mergin_statistics_table.py} (73%)

diff --git a/server/mergin/stats/models.py b/server/mergin/stats/models.py
index f67bd7d3..4fbc0af3 100644
--- a/server/mergin/stats/models.py
+++ b/server/mergin/stats/models.py
@@ -5,7 +5,7 @@
 from dataclasses import dataclass
 from typing import Optional
 import uuid
-from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy.dialects.postgresql import UUID, JSONB
 from datetime import datetime, timezone
 
 from ..app import db
@@ -47,4 +47,4 @@ class MerginStatistics(db.Model):
         db.DateTime, index=True, nullable=False, server_default="now()"
     )
     # data with statistics
-    data = db.Column(db.JSON)
+    data = db.Column(JSONB, nullable=False)
diff --git a/server/migrations/community/37cf462d76ed_add_mergin_statistics_table.py b/server/migrations/community/ba5051218de4_add_mergin_statistics_table.py
similarity index 73%
rename from server/migrations/community/37cf462d76ed_add_mergin_statistics_table.py
rename to server/migrations/community/ba5051218de4_add_mergin_statistics_table.py
index 2927731f..069bfb83 100644
--- a/server/migrations/community/37cf462d76ed_add_mergin_statistics_table.py
+++ b/server/migrations/community/ba5051218de4_add_mergin_statistics_table.py
@@ -1,29 +1,28 @@
 """add mergin statistics table
 
-Revision ID: 37cf462d76ed
+Revision ID: ba5051218de4
 Revises: d02961c7416c
-Create Date: 2025-01-22 17:09:00.718129
+Create Date: 2025-01-24 12:41:23.714579
 
 """
 
 from alembic import op
 import sqlalchemy as sa
-
+from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
-revision = "37cf462d76ed"
+revision = "ba5051218de4"
 down_revision = "d02961c7416c"
 branch_labels = None
 depends_on = None
 
 
 def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
         "mergin_statistics",
         sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
         sa.Column("created_at", sa.DateTime(), server_default="now()", nullable=False),
-        sa.Column("data", sa.JSON(), nullable=True),
+        sa.Column("data", postgresql.JSONB(astext_type=sa.Text()), nullable=False),
         sa.PrimaryKeyConstraint("id", name=op.f("pk_mergin_statistics")),
     )
     op.create_index(
@@ -36,9 +35,7 @@ def upgrade():
 
 
 def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
     op.drop_index(
         op.f("ix_mergin_statistics_created_at"), table_name="mergin_statistics"
     )
     op.drop_table("mergin_statistics")
-    # ### end Alembic commands ###

From a90504c0c1adcf589e5f262000e40b2d96bdfa77 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Fri, 24 Jan 2025 13:29:56 +0100
Subject: [PATCH 08/10] use date-fns for the same like new Date :)

---
 server/mergin/stats/controller.py                    |  4 ++--
 .../admin/components/ReportDownloadDialog.vue        | 12 ++++--------
 web-app/packages/lib/src/common/date_utils.ts        | 10 ----------
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/server/mergin/stats/controller.py b/server/mergin/stats/controller.py
index 0e99f03d..4606f1e5 100644
--- a/server/mergin/stats/controller.py
+++ b/server/mergin/stats/controller.py
@@ -68,7 +68,7 @@ def download_report(date_from: str, date_to: str):
         .order_by(MerginStatistics.created_at.desc())
         .all()
     )
-    createdColumn = "created_at"
+    created_column = "created_at"
     data = [
         {
             **stat.data,
@@ -76,7 +76,7 @@ def download_report(date_from: str, date_to: str):
         }
         for stat in stats
     ]
-    columns = list(ServerCallhomeData.__dataclass_fields__.keys()) + [createdColumn]
+    columns = list(ServerCallhomeData.__dataclass_fields__.keys()) + [created_column]
     # get columns for data, this is usefull when we will update data json format (removing columns, adding new ones)
 
     builder = CsvTextBuilder()
diff --git a/web-app/packages/admin-lib/src/modules/admin/components/ReportDownloadDialog.vue b/web-app/packages/admin-lib/src/modules/admin/components/ReportDownloadDialog.vue
index acece047..6ba72cc8 100644
--- a/web-app/packages/admin-lib/src/modules/admin/components/ReportDownloadDialog.vue
+++ b/web-app/packages/admin-lib/src/modules/admin/components/ReportDownloadDialog.vue
@@ -44,12 +44,8 @@
 </template>
 
 <script lang="ts" setup>
-import {
-  AppDropdown,
-  dateUtils,
-  DropdownOption,
-  useDialogStore
-} from '@mergin/lib'
+import { AppDropdown, DropdownOption, useDialogStore } from '@mergin/lib'
+import subMonths from 'date-fns/subMonths'
 import { ref, watchEffect } from 'vue'
 
 import { useAdminStore } from '@/main'
@@ -66,7 +62,7 @@ const periodOptions = ref<DropdownOption[]>([
   { label: 'Custom range', value: '-1' }
 ])
 const range = ref<Array<Date>>([
-  dateUtils.getDateFromMonthsAgo(Number(period.value)),
+  subMonths(new Date(), Number(period.value)),
   new Date()
 ])
 
@@ -76,7 +72,7 @@ watchEffect(() => {
     range.value = []
     return
   }
-  range.value = [dateUtils.getDateFromMonthsAgo(periodValue), new Date()]
+  range.value = [subMonths(new Date(), periodValue), new Date()]
 })
 
 function close() {
diff --git a/web-app/packages/lib/src/common/date_utils.ts b/web-app/packages/lib/src/common/date_utils.ts
index 68f368cf..1dc40a2f 100644
--- a/web-app/packages/lib/src/common/date_utils.ts
+++ b/web-app/packages/lib/src/common/date_utils.ts
@@ -102,13 +102,3 @@ export function formatRemainingTime(t2, t1 = new Date()) {
       return remainingFormatDuration(days, 'days')
   }
 }
-
-/**
- * Calculates date from today to given months number in past.
- * Doest not convert to UTC.
- */
-export function getDateFromMonthsAgo(months) {
-  const date = new Date()
-  date.setMonth(date.getMonth() - months)
-  return date
-}

From d42962398a74bd9b9a2ead90e6ceb7137b6a03be Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Fri, 24 Jan 2025 13:53:40 +0100
Subject: [PATCH 09/10] remove store stats on server startup

---
 server/application.py                  |  1 -
 server/mergin/stats/tasks.py           | 10 ----------
 server/mergin/tests/test_statistics.py |  7 -------
 3 files changed, 18 deletions(-)

diff --git a/server/application.py b/server/application.py
index 002b0b54..96574f28 100644
--- a/server/application.py
+++ b/server/application.py
@@ -81,4 +81,3 @@ def setup_periodic_tasks(sender, **kwargs):
 # send report after start
 if Configuration.COLLECT_STATISTICS:
     send_statistics.delay()
-save_statistics.delay()
diff --git a/server/mergin/stats/tasks.py b/server/mergin/stats/tasks.py
index 53238041..9812340d 100644
--- a/server/mergin/stats/tasks.py
+++ b/server/mergin/stats/tasks.py
@@ -46,16 +46,6 @@ def get_callhome_data(info: MerginInfo | None = None) -> ServerCallhomeData:
 @celery.task(ignore_result=True)
 def save_statistics():
     """Save statistics about usage."""
-    to_date = datetime.now(timezone.utc)
-    from_date = datetime.now(timezone.utc) - timedelta(hours=12)
-    # debounce to avoid sending multiple times in short after restart of server
-    last_stat = MerginStatistics.query.filter(
-        MerginStatistics.created_at > from_date,
-        MerginStatistics.created_at < to_date,
-    ).first()
-    if last_stat:
-        return
-
     info = MerginInfo.query.first()
     data = get_callhome_data(info)
     stat = MerginStatistics(data=data)
diff --git a/server/mergin/tests/test_statistics.py b/server/mergin/tests/test_statistics.py
index 3b7b86a9..a87ba08c 100644
--- a/server/mergin/tests/test_statistics.py
+++ b/server/mergin/tests/test_statistics.py
@@ -169,13 +169,6 @@ def test_save_statistics(app, client):
     assert stats.created_at
     assert stats.data == asdict(stats_json_data)
 
-    # debouncing
-    save_statistics.s().apply()
-    assert MerginStatistics.query.count() == 1
-    stats.created_at = datetime.now(timezone.utc) - timedelta(hours=12)
-    save_statistics.s().apply()
-    assert MerginStatistics.query.count() == 2
-
 
 def test_download_report(app, client):
     """Test download report endpoint"""

From 389f0f5a505a166173100111c7ec93c8bb80ff37 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Fri, 24 Jan 2025 14:07:10 +0100
Subject: [PATCH 10/10] Run save stats every 12 hours

---
 server/application.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/application.py b/server/application.py
index 96574f28..db46e12e 100644
--- a/server/application.py
+++ b/server/application.py
@@ -66,7 +66,7 @@ def setup_periodic_tasks(sender, **kwargs):
         name="remove old project backups",
     )
     sender.add_periodic_task(
-        crontab(hour=12, minute=0),
+        crontab(hour="*/12"),
         save_statistics,
         name="Save usage statistics to database",
     )