From c7ab793ca8d4edb61d5e5fd030f5aec8261ab808 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Wed, 31 Jul 2024 13:43:59 +0200
Subject: [PATCH] Fix uuid handling

---
 isimip_publisher/models.py           | 7 +------
 isimip_publisher/utils/validation.py | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/isimip_publisher/models.py b/isimip_publisher/models.py
index 25bc9b6..b7ba9ba 100644
--- a/isimip_publisher/models.py
+++ b/isimip_publisher/models.py
@@ -57,11 +57,6 @@ def __init__(self, dataset=None, name=None, path=None, abspath=None, specifiers=
         self.checksum_type = get_checksum_type()
         self.clean = False
 
-        self._uuid = None
-        self._size = None
-        self._checksum = None
-        self._netcdf_header = None
-
     @cached_property
     def uuid(self):
         if self.netcdf_header:
@@ -97,7 +92,7 @@ def checksum(self):
     @cached_property
     def json(self):
         return {
-            'id': self._uuid,
+            'id': self.uuid,
             'path': self.path,
             'size': self.size,
             'checksum': self.checksum,
diff --git a/isimip_publisher/utils/validation.py b/isimip_publisher/utils/validation.py
index ea1cb45..1f5f088 100644
--- a/isimip_publisher/utils/validation.py
+++ b/isimip_publisher/utils/validation.py
@@ -42,7 +42,7 @@ def check_datasets(datasets, db_datasets):
 
                 # check file uuid consitency
                 if file.uuid:
-                    if str(file.uuid) != db_file.id:
+                    if str(file.uuid) != str(db_file.id):
                         logger.error(f'UUID mismatch {file.uuid} != {db_file.id} for file {db_file.path}')
 
                 # check file specifiers consitency