trex-model 1.3.3__tar.gz → 1.3.5__tar.gz

{trex-model-1.3.3/trex_model.egg-info → trex-model-1.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trex-model
-Version: 1.3.3
+Version: 1.3.5
 Summary: TRex database module package
 Home-page: https://bitbucket.org/lokjac/trex-model
 Author: Jack Lok

{trex-model-1.3.3 → trex-model-1.3.5}/setup.py

@@ -3,7 +3,7 @@ with open("README.md", "r") as fh:
     long_description = fh.read()
 setuptools.setup(
      name='trex-model',  
-     version='1.3.3',
+     version='1.3.5',
      author="Jack Lok",
      author_email="sglok77@gmail.com",
      description="TRex database module package",

{trex-model-1.3.3 → trex-model-1.3.5/trex_model.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trex-model
-Version: 1.3.3
+Version: 1.3.5
 Summary: TRex database module package
 Home-page: https://bitbucket.org/lokjac/trex-model
 Author: Jack Lok

{trex-model-1.3.3 → trex-model-1.3.5}/trexmodel/models/datastore/loyalty_models.py

@@ -35,8 +35,10 @@ class LoyaltyDeviceSetting(BaseNModel,DictModel):
     
     @property
     def device_tokens_list(self):
+        _tokens_list = []
+        
         if self.device_details:
-            _tokens_list = []
+            
             for k,v in self.device_details.items():
                 for dd in v:
                     _tokens_list.append(dd.get('device_token'))

{trex-model-1.3.3 → trex-model-1.3.5}/trexmodel/models/datastore/marketing_models.py

@@ -138,11 +138,41 @@ class PushNotificationSetup(BaseNModel, DictModel):
         return PushNotificationSetup.query(ndb.AND(PushNotificationSetup.is_archived==True), ancestor=merchant_acct.create_ndb_key()).fetch(limit=model_conf.MAX_FETCH_RECORD)
     
     @staticmethod
-    def list(schedule_datetime=datetime.utcnow()):
-        result = PushNotificationSetup.query(
+    def list(start_datetime=datetime.utcnow(), end_datetime=datetime.utcnow(), send=False):
+        if send==False:
+            result = PushNotificationSetup.query(
                     ndb.AND(
                             PushNotificationSetup.send==False, 
-                            PushNotificationSetup.schedule_datetime<=schedule_datetime)).fetch(offset=0, limit=conf.MAX_FETCH_RECORD)
+                            PushNotificationSetup.schedule_datetime>start_datetime,
+                            PushNotificationSetup.schedule_datetime<=end_datetime,
+                            )
+                    ).fetch(offset=0, limit=conf.MAX_FETCH_RECORD)
+        else:
+            result = PushNotificationSetup.query(
+                    ndb.AND(
+                            PushNotificationSetup.schedule_datetime>start_datetime,
+                            PushNotificationSetup.schedule_datetime<=end_datetime,
+                            )
+                    ).fetch(offset=0, limit=conf.MAX_FETCH_RECORD)
+        return result
+    
+    @staticmethod
+    def cound(start_datetime=datetime.utcnow(), end_datetime=datetime.utcnow(), send=False):
+        if send==False:
+            result = PushNotificationSetup.query(
+                    ndb.AND(
+                            PushNotificationSetup.send==False, 
+                            PushNotificationSetup.schedule_datetime>start_datetime,
+                            PushNotificationSetup.schedule_datetime<=end_datetime,
+                            )
+                    ).fetch(offset=0, limit=conf.MAX_FETCH_RECORD)
+        else:
+            result = PushNotificationSetup.query(
+                    ndb.AND(
+                            PushNotificationSetup.schedule_datetime>start_datetime,
+                            PushNotificationSetup.schedule_datetime<=end_datetime,
+                            )
+                    ).fetch(offset=0, limit=conf.MAX_FETCH_RECORD)
         return result
     
 class MarketingImage(BaseNModel, DictModel):
@@ -217,10 +247,28 @@ class ScheduledPushNotificationHistory(BaseNModel, DictModel):
                                     
     
     @staticmethod
-    def list(scheduled_datetime=datetime.utcnow()):
-        result = ScheduledPushNotificationHistory.query(
+    def list(scheduled_datetime=datetime.utcnow(), send=False):
+        if send==False:
+            result = ScheduledPushNotificationHistory.query(
                     ndb.AND(
                             ScheduledPushNotificationHistory.send==False, 
                             ScheduledPushNotificationHistory.scheduled_datetime<=scheduled_datetime)).fetch(offset=0, limit=conf.MAX_FETCH_RECORD)
+        else:
+            result = ScheduledPushNotificationHistory.query(
+                    ndb.AND(
+                            ScheduledPushNotificationHistory.scheduled_datetime<=scheduled_datetime)).fetch(offset=0, limit=conf.MAX_FETCH_RECORD)
         return result
+    
+    @staticmethod
+    def count(scheduled_datetime=datetime.utcnow(), send=False):
+        if send==False:
+            return ScheduledPushNotificationHistory.query(
+                    ndb.AND(
+                            ScheduledPushNotificationHistory.send==False, 
+                            ScheduledPushNotificationHistory.scheduled_datetime<=scheduled_datetime)).count(limit=conf.MAX_FETCH_RECORD)
+        else:
+            return ScheduledPushNotificationHistory.query(
+                    ndb.AND(
+                            ScheduledPushNotificationHistory.scheduled_datetime<=scheduled_datetime)).count(limit=conf.MAX_FETCH_RECORD)
+