Fix uuid handling

ISI-MIP · Jul 31, 2024 · c7ab793 · c7ab793
1 parent 03f549f
commit c7ab793
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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