django-restit 4.2.138__py3-none-any.whl → 4.2.140__py3-none-any.whl

{django_restit-4.2.138.dist-info → django_restit-4.2.140.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-restit
-Version: 4.2.138
+Version: 4.2.140
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes

{django_restit-4.2.138.dist-info → django_restit-4.2.140.dist-info}/RECORD

@@ -377,7 +377,7 @@ pushit/utils.py,sha256=IeTCGa-164nmB1jIsK1lu1O1QzUhS3BKfuXHGjCW-ck,2121
 rest/.gitignore,sha256=TbEvWRMnAiajCTOdhiNrd9eeCAaIjRp9PRjE_VkMM5g,118
 rest/README.md,sha256=V3ETc-cJu8PZIbKr9xSe_pA4JEUpC8Dhw4bQeVCDJPw,5460
 rest/RemoteEvents.py,sha256=nL46U7AuxIrlw2JunphR1tsXyqi-ep_gD9CYGpYbNgE,72
-rest/__init__.py,sha256=JUtEuNqc7n7slOQOEm9TZVqe9zNOKgxUmepHVFPIeJc,122
+rest/__init__.py,sha256=yQq_7suWzN5e9qoX3OzN7p2okHfUo9n0Rp3W6ZvVR0s,122
 rest/arc4.py,sha256=y644IbF1ec--e4cUJ3KEYsewTCITK0gmlwa5mJruFC0,1967
 rest/cache.py,sha256=1Qg0rkaCJCaVP0-l5hZg2CIblTdeBSlj_0fP6vlKUpU,83
 rest/crypto/__init__.py,sha256=Tl0U11rgj1eBYqd6OXJ2_XSdNLumW_JkBZnaJqI6Ldw,72
@@ -410,7 +410,7 @@ rest/middleware/request.py,sha256=JchRNy5L-bGd-7h-KFYekGRvREe2eCkZXKOYqIkP2hI,41
 rest/middleware/session.py,sha256=zHSoQpIzRLmpqr_JvW406wzpvU3W3gDbm5JhtzLAMlE,10240
 rest/middleware/session_store.py,sha256=1nSdeXK8PyuYgGgIufqrS6j6QpIrQ7zbMNT0ol75e6U,1901
 rest/models/__init__.py,sha256=M8pvFDq-WCF-QcM58X7pMufYYe0aaQ3U0PwGe9TKbbY,130
-rest/models/base.py,sha256=soIYiW71wZdUPmYf-JPPcnHx79CrA9B-hGNFt_WlRCI,71609
+rest/models/base.py,sha256=NTw7IHJu4wpJ3CwIDbYZnoDe8mbJ5B6quocAmyzzJ2c,71787
 rest/models/cacher.py,sha256=eKz8TINVhWEqKhJGMsRkKZTtBUIv5rN3NHbZwOC56Uk,578
 rest/models/metadata.py,sha256=1nQ7CYo9bJHoaXE_hVNaj1-Y7yqhHlf2ZlaD1IfTzic,12904
 rest/net.py,sha256=LcB2QV6VNRtsSdmiQvYZgwQUDwOPMn_VBdRiZ6OpI-I,2974
@@ -513,7 +513,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=KKq00EwoGnz1yLwCZr5Dfoq2izivmAdsNEEM4EhZwN4,1610
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.138.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.138.dist-info/METADATA,sha256=f8SLDPTRNX35L0cWaSmKyOK6ccRD2-Ex2itkf00QD20,7663
-django_restit-4.2.138.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.138.dist-info/RECORD,,
+django_restit-4.2.140.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.140.dist-info/METADATA,sha256=GQO5bs9dpHrS_uY2j0m8maJ6xr5TiAKkn3F4Nh7A2eI,7663
+django_restit-4.2.140.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.140.dist-info/RECORD,,

rest/__init__.py

@@ -1,4 +1,4 @@
 from .uberdict import UberDict  # noqa: F401
 from .settings_helper import settings  # noqa: F401
 
-__version__ = "4.2.138"
+__version__ = "4.2.140"

rest/models/base.py

@@ -1004,37 +1004,48 @@ class RestModel(object):
     def on_rest_date_filter(cls, request, qset=None):
         dr_start = request.DATA.get("dr_start", field_type=datetime)
         dr_end = request.DATA.get("dr_end", field_type=datetime)
-        if dr_start is not None:
-            if dr_end is None:
-                dr_end = datetime.now() + timedelta(hours=5)
-                # # now lets make dr_end the end of day of dr end
-                # dr_end = dr_end + timedelta(hours=24)
-            elif dr_end == dr_start:
-                dr_end = dr_start + timedelta(days=1)
-            dr_tz = request.DATA.get("dr_timezone")
-            if dr_tz is not None:
-                dr_eod = request.DATA.get("dr_eod", 0, field_type=int)
-                dr_granularity = request.DATA.get("granularity", "day")
-                dr_start, dr_end = rh.getDateRange(dr_start, dr_end, dr_granularity, dr_tz, hour=dr_eod)
-            else:
-                dr_offset = request.DATA.get("dr_offset", 0, field_type=int)
-                if dr_offset > 0:
-                    dr_start = dr_start + timedelta(minutes=dr_offset)
-                    dr_end = dr_end + timedelta(minutes=dr_offset)
-            tr_start = request.DATA.get("tr_start")
+        dr_end_str = request.DATA.get("dr_end")
+        tr_start = request.DATA.get("tr_start")
+        tr_end = request.DATA.get("tr_end")
+        dr_offset = request.DATA.get("dr_offset", 0, field_type=int)
+        dr_tz = request.DATA.get("dr_timezone")
+
+        # if we only specify timerange lets set the start to today
+        if dr_start is None:
             if tr_start is not None:
-                tr_start = rh.updateTimeFromString(dr_start, tr_start)
-            tr_end = request.DATA.get("tr_end")
-            if tr_end is not None:
-                tr_end = rh.updateTimeFromString(dr_end, tr_end)
-            dr_field = request.DATA.get("dr_field", getattr(cls.RestMeta, "DATE_RANGE_FIELD", "created"))
-            q = dict()
-            q["{}__gte".format(dr_field)] = dr_start
-            q["{}__lte".format(dr_field)] = dr_end
-            qset = qset.filter(**q)
-            request.response_extra = dict(
-                dr_start=rh.convertToEpoch(dr_start),
-                dr_end=rh.convertToEpoch(dr_end))
+                dr_start = datetime.now()
+
+        if dr_start is None:
+            return qset
+
+        if dr_end is None:
+            dr_end = datetime.now() + timedelta(hours=5)
+        elif dr_end == dr_start and not tr_end:
+            dr_end = dr_start + timedelta(days=1)
+        elif "-" in dr_end_str or "/" in dr_end_str:
+            dr_end = dr_end + timedelta(days=1)
+
+        if tr_start is not None:
+            dr_start = rh.updateTimeFromString(dr_start, tr_start)
+        if tr_end is not None:
+            dr_end = rh.updateTimeFromString(dr_end, tr_end)
+
+        if dr_tz is not None:
+            dr_start = request.DATA.get("dr_start", field_type=datetime)
+            dr_end = request.DATA.get("dr_end", field_type=datetime)
+            dr_eod = request.DATA.get("dr_eod", 0, field_type=int)
+            dr_granularity = request.DATA.get("granularity", "day")
+            dr_start, dr_end = rh.getDateRange(dr_start, dr_end, dr_granularity, dr_tz, hour=dr_eod)
+        elif dr_offset > 0:
+            dr_start = dr_start + timedelta(minutes=dr_offset)
+            dr_end = dr_end + timedelta(minutes=dr_offset)
+    
+        rh.debug("tr_end changing", str(dr_start), str(dr_end))
+        dr_field = request.DATA.get("dr_field", getattr(cls.RestMeta, "DATE_RANGE_FIELD", "created"))
+        q = dict()
+        q["{}__gte".format(dr_field)] = dr_start
+        q["{}__lte".format(dr_field)] = dr_end
+        qset = qset.filter(**q)
         return qset
 
     @classmethod