From 9a8fb56d196476228d37ff526c531893bfceea17 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Tue, 11 Feb 2025 08:58:29 +0100
Subject: [PATCH] Rename editors in overview - proper usage of server now

---
 server/application.py                                         | 2 +-
 server/mergin/stats/models.py                                 | 2 +-
 .../community/ba5051218de4_add_mergin_statistics_table.py     | 4 +++-
 .../admin-lib/src/modules/admin/views/OverviewView.vue        | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/application.py b/server/application.py
index db46e12e..29b7b5f7 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"),
+        crontab(hour="*/12", minute=0),
         save_statistics,
         name="Save usage statistics to database",
     )
diff --git a/server/mergin/stats/models.py b/server/mergin/stats/models.py
index 4fbc0af3..3c32e887 100644
--- a/server/mergin/stats/models.py
+++ b/server/mergin/stats/models.py
@@ -44,7 +44,7 @@ class MerginStatistics(db.Model):
 
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     created_at = db.Column(
-        db.DateTime, index=True, nullable=False, server_default="now()"
+        db.DateTime, index=True, nullable=False, default=datetime.utcnow
     )
     # data with statistics
     data = db.Column(JSONB, nullable=False)
diff --git a/server/migrations/community/ba5051218de4_add_mergin_statistics_table.py b/server/migrations/community/ba5051218de4_add_mergin_statistics_table.py
index 069bfb83..56a3778f 100644
--- a/server/migrations/community/ba5051218de4_add_mergin_statistics_table.py
+++ b/server/migrations/community/ba5051218de4_add_mergin_statistics_table.py
@@ -21,7 +21,9 @@ def upgrade():
     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(
+            "created_at", sa.DateTime(), server_default=sa.text("now()"), nullable=False
+        ),
         sa.Column("data", postgresql.JSONB(astext_type=sa.Text()), nullable=False),
         sa.PrimaryKeyConstraint("id", name=op.f("pk_mergin_statistics")),
     )
diff --git a/web-app/packages/admin-lib/src/modules/admin/views/OverviewView.vue b/web-app/packages/admin-lib/src/modules/admin/views/OverviewView.vue
index 43efb364..d90d4747 100644
--- a/web-app/packages/admin-lib/src/modules/admin/views/OverviewView.vue
+++ b/web-app/packages/admin-lib/src/modules/admin/views/OverviewView.vue
@@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
     <app-container>
       <div class="grid" v-if="usage">
         <usage-card class="col-12 sm:col-6 lg:col-3">
-          <template #heading>Editors</template>
+          <template #heading>Contributors</template>
           <div
             class="w-full"
             :style="{