django-restit 4.2.135__py3-none-any.whl → 4.2.136__py3-none-any.whl

account/models/group.py

@@ -134,6 +134,7 @@ class Group(models.Model, RestModel, MetaDataModel):
 
     _tz_long = None
     _tz_short = None
+    _eod_hour = None
 
     @property
     def timezone(self):
@@ -147,6 +148,12 @@ class Group(models.Model, RestModel, MetaDataModel):
             self._tz_short = rh.getShortTZ(self.timezone)
         return self._tz_short
 
+    @property
+    def end_of_day_hour(self):
+        if self._eod_hour is None:
+            self._eod_hour = self.getParentProperty("eod", 0, field_type=int)
+        return self._eod_hour
+
     @property
     def file_safe_name(self):
         return re.sub("[^0-9a-zA-Z]+", "_", self.name.lower())
@@ -361,34 +368,27 @@ class Group(models.Model, RestModel, MetaDataModel):
         return default
 
     def getLocalTime(self, when=None, tz_aware=False):
-        zone = self.getParentProperty("timezone", "America/Los_Angeles")
-        return rh.convertToLocalTime(zone, when, tz_aware)
+        return rh.convertToLocalTime(self.timezone, when, tz_aware)
 
     def getUTC(self, when):
-        zone = self.getParentProperty("timezone", "America/Los_Angeles")
-        return rh.convertToUTC(zone, when)
+        return rh.convertToUTC(self.timezone, when)
 
     def getBusinessDay(self, start=None, end=None, kind="day"):
-        zone = self.getParentProperty("timezone", "America/Los_Angeles")
-        eod = self.getParentProperty("eod", 0, field_type=int)
-        return rh.getDateRange(start, end, kind, zone, hour=eod)
+        return rh.getDateRange(start, end, kind, self.timezone, hour=self.end_of_day_hour)
 
     def getOperatingHours(self, start=None, end=None, kind="day"):
         # deprecate this, operating hours is deceptive
-        zone = self.getParentProperty("timezone", "America/Los_Angeles")
-        eod = self.getParentProperty("eod", 0, field_type=int)
-        return rh.getDateRange(start, end, kind, zone, hour=eod)
+        return rh.getDateRange(start, end, kind, self.timezone, hour=self.end_of_day_hour)
 
     def getTimeZoneOffset(self, when=None, hour=None):
-        zone = self.getParentProperty("timezone", "America/Los_Angeles")
-        return rh.getTimeZoneOffset(zone, when, hour=hour)
+        return rh.getTimeZoneOffset(self.timezone, when, hour=hour)
 
     def getEOD(self, eod=None, onday=None, in_local=False):
         if eod is None:
-            eod = self.getParentProperty("eod", 0, field_type=int)
+            eod = self.end_of_day_hour
             if in_local:
                 return eod
-        offset = self.getTimeZoneOffset(onday, hour=eod)
+        offset = self.getTimeZoneOffset(onday, hour=self.end_of_day_hour)
         return offset
 
     def updateUUID(self):

{django_restit-4.2.135.dist-info → django_restit-4.2.136.dist-info}/METADATA

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

{django_restit-4.2.135.dist-info → django_restit-4.2.136.dist-info}/RECORD

@@ -28,7 +28,7 @@ account/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 account/models/__init__.py,sha256=cV_lMnT2vL_mjiYtT4hlcIHo52ocFbGSNVkOIHHLXZY,385
 account/models/device.py,sha256=0AFeLMGk4im4KZVd3eGSyRbK4eQEXiFM2cdY8GUzihs,5934
 account/models/feeds.py,sha256=vI7fG4ASY1M0Zjke24RdnfDcuWeATl_yR_25jPmT64g,2011
-account/models/group.py,sha256=gsCze5dxTBcDayNalujAA-v8gKx3vC2cQwuUH6Jg9Tg,23100
+account/models/group.py,sha256=N9Ow7AtV4xN5zSE9E5-msthJy0G5-3DEr2MTmvFO1kU,22887
 account/models/legacy.py,sha256=zYdtv4LC0ooxPVqWM-uToPwV-lYWQLorSE6p6yn1xDw,2720
 account/models/member.py,sha256=FvVUoc_n7PgqxXduQRF-S4VJcl8aER5tMBxM5xsgswU,54682
 account/models/membership.py,sha256=90EpAhOsGaqphDAkONP6j_qQ0OWSRaQsI8H7E7fgMkE,9249
@@ -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=jvMDmcVTsAQ0iA0xPSbOztX_yr1rfxCPVRM4H93ysos,122
+rest/__init__.py,sha256=P7AsJG2-fQOZPMovCvkbEW57dyHqLdU0F4_ptZlHISg,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
@@ -513,7 +513,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=K0yBiLUuY81iDM4Yr-k8hbvjn5VVHu5zQhmMK8Dtz0s,1536
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.135.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.135.dist-info/METADATA,sha256=y5BF4iNU-96HCWsE7bLYHz9-lOK6htULuY729Hs6NwI,7663
-django_restit-4.2.135.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.135.dist-info/RECORD,,
+django_restit-4.2.136.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.136.dist-info/METADATA,sha256=0XTqwV9RSBBDL7jfrwHLJoRI-Rr122bpMowDHQbuLCA,7663
+django_restit-4.2.136.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.136.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.135"
+__version__ = "4.2.136"