fix compare device export

eReuse · Nov 20, 2023 · fc6cfea · fc6cfea
1 parent a0f68c4
commit fc6cfea
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/ereuse_devicehub/resources/device/models.py b/ereuse_devicehub/resources/device/models.py
@@ -5,6 +5,7 @@
 import os
 import pathlib
 import uuid
+import psycopg2
 from contextlib import suppress
 from datetime import datetime
 from fractions import Fraction
@@ -1101,7 +1102,11 @@ def close_device(self, date, normalize="%Y-%m-%d_%H_%M"):
 
         if isinstance(date, str):
             try:
-                self._date_close = datetime.strptime(date, normalize)
+                self._date_close = datetime.strptime(date, normalize).replace(
+                    tzinfo=psycopg2.tz.FixedOffsetTimezone(offset=60, name=None)
+                )
+                if self._date_close < self.created:
+                    self._date_close = self.created.replace(hour=23, minute=59)
             except Exception as err:
                 logger.error(err)
                 txt = "Date: {} normalize: {}".format(date, normalize)