From 02ce9d343b945f7657f34b91bb2c0205b7183650 Mon Sep 17 00:00:00 2001
From: Alexander Borg <borg@servernet.se>
Date: Wed, 24 Sep 2025 04:36:22 +0200
Subject: [PATCH] Fix jwt-token

---
 data-retention-service/database.js | 24 ++++++++++++------------
 data-retention-service/index.js    |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/data-retention-service/database.js b/data-retention-service/database.js
index 6bf2459..5a01892 100644
--- a/data-retention-service/database.js
+++ b/data-retention-service/database.js
@@ -46,9 +46,9 @@ function defineModels() {
   // Tenant model
   models.Tenant = sequelize.define('Tenant', {
     id: {
-      type: DataTypes.INTEGER,
+      type: DataTypes.UUID,
       primaryKey: true,
-      autoIncrement: true
+      defaultValue: DataTypes.UUIDV4
     },
     slug: {
       type: DataTypes.STRING(50),
@@ -77,19 +77,19 @@ function defineModels() {
   // DroneDetection model
   models.DroneDetection = sequelize.define('DroneDetection', {
     id: {
-      type: DataTypes.INTEGER,
+      type: DataTypes.UUID,
       primaryKey: true,
-      autoIncrement: true
+      defaultValue: DataTypes.UUIDV4
     },
     tenant_id: {
-      type: DataTypes.INTEGER,
+      type: DataTypes.UUID,
       allowNull: false
     },
     device_id: {
       type: DataTypes.STRING(50),
       allowNull: false
     },
-    timestamp: {
+    server_timestamp: {
       type: DataTypes.DATE,
       allowNull: false
     },
@@ -110,10 +110,10 @@ function defineModels() {
     timestamps: false,
     indexes: [
       {
-        fields: ['tenant_id', 'timestamp']
+        fields: ['tenant_id', 'server_timestamp']
       },
       {
-        fields: ['timestamp']
+        fields: ['server_timestamp']
       }
     ]
   });
@@ -121,12 +121,12 @@ function defineModels() {
   // Heartbeat model
   models.Heartbeat = sequelize.define('Heartbeat', {
     id: {
-      type: DataTypes.INTEGER,
+      type: DataTypes.UUID,
       primaryKey: true,
-      autoIncrement: true
+      defaultValue: DataTypes.UUIDV4
     },
     tenant_id: {
-      type: DataTypes.INTEGER,
+      type: DataTypes.UUID,
       allowNull: false
     },
     device_id: {
@@ -162,7 +162,7 @@ function defineModels() {
       autoIncrement: true
     },
     tenant_id: {
-      type: DataTypes.INTEGER,
+      type: DataTypes.UUID,
       allowNull: true
     },
     timestamp: {
diff --git a/data-retention-service/index.js b/data-retention-service/index.js
index 78fd072..02721aa 100644
--- a/data-retention-service/index.js
+++ b/data-retention-service/index.js
@@ -173,7 +173,7 @@ class DataRetentionService {
     const deletedDetections = await DroneDetection.destroy({
       where: {
         tenant_id: tenant.id,
-        timestamp: {
+        server_timestamp: {
           [Op.lt]: cutoffDate
         }
       }