Fix datetime/timezone issues

src/django_firebase_cache/firestore.py

@@ -6,9 +6,7 @@
 from datetime import datetime
 from typing import Iterable
 
-from django.conf import settings
 from django.core.cache.backends.base import DEFAULT_TIMEOUT, BaseCache, CacheKeyWarning
-from django.utils import timezone
 from google.cloud import firestore
 from google.cloud.firestore import (
     CollectionReference,
@@ -35,12 +33,11 @@ def db(self) -> CollectionReference:
         return self._db
 
     def _base_set(self, mode, key, value, timeout=DEFAULT_TIMEOUT):
+        timeout = self.get_backend_timeout(timeout)
         if timeout is None:
             exp = datetime.max
-        elif settings.USE_TZ:
-            exp = datetime.utcfromtimestamp(timeout)
         else:
-            exp = datetime.fromtimestamp(timeout)
+            exp = datetime.utcfromtimestamp(timeout)
         exp = exp.replace(microsecond=0)
 
         pickled = pickle.dumps(value, self.pickle_protocol)
@@ -87,7 +84,7 @@ def get(self, key, default=None, version=None):
             return default
         data = doc.to_dict()
         expires = data.get("expires")
-        if expires >= timezone.now():
+        if expires >= datetime.utcnow():
             value = data.get("value")
             value = pickle.loads(base64.b64decode(value.encode()))
             return value

src/django_firebase_cache/realtime_database.py

@@ -7,9 +7,7 @@
 from datetime import datetime
 
 import firebase_admin
-from django.conf import settings
 from django.core.cache.backends.base import DEFAULT_TIMEOUT, BaseCache, CacheKeyWarning
-from django.utils import timezone
 from firebase_admin import db
 from firebase_admin.db import Reference
 
@@ -40,20 +38,19 @@ def db(self) -> Reference:
         return self._db
 
     def _set_data(self, mode, key, value, timeout=DEFAULT_TIMEOUT):
+        timeout = self.get_backend_timeout(timeout)
         if timeout is None:
             exp = datetime.max
-        elif settings.USE_TZ:
-            exp = datetime.utcfromtimestamp(timeout)
         else:
-            exp = datetime.fromtimestamp(timeout)
+            exp = datetime.utcfromtimestamp(timeout)
         exp = exp.replace(microsecond=0)
 
         pickled = pickle.dumps(value, self.pickle_protocol)
         b64encoded = base64.b64encode(pickled).decode("utf-8")
         if mode == "touch":
             data = {"expires": exp}
         else:
-            data = {"key": key, "value": b64encoded, "expires": exp.timestamp()}
+            data = {"cache_key": key, "value": b64encoded, "expires": exp.timestamp()}
         return data
 
     def make_key(self, key, version=None):
@@ -85,7 +82,7 @@ def get(self, key, default=None, version=None):
         data = self.db.child(key).get()
         if data:
             expires = datetime.utcfromtimestamp(data.get("expires", 0))
-            if expires >= timezone.now():
+            if expires >= datetime.utcnow():
                 value = data.get("value")
                 return pickle.loads(base64.b64decode(value.encode()))
             else: