trex-model 1.3.4__tar.gz → 1.3.6__tar.gz

{trex-model-1.3.4/trex_model.egg-info → trex-model-1.3.6}/PKG-INFO

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

{trex-model-1.3.4 → trex-model-1.3.6}/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.4',
+     version='1.3.6',
      author="Jack Lok",
      author_email="sglok77@gmail.com",
      description="TRex database module package",

{trex-model-1.3.4 → trex-model-1.3.6/trex_model.egg-info}/PKG-INFO

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

{trex-model-1.3.4 → trex-model-1.3.6}/trexmodel/models/datastore/customer_model_helpers.py

@@ -186,14 +186,19 @@ def update_customer_entiteld_voucher_summary_with_new_voucher_info(customer_enti
     voucher_summary         = customer_entitled_voucher_summary.get(merchant_voucher_key)
     latest_expiry_date_str  = None
     if redeem_info_list and len(redeem_info_list)>0:
-        latest_expiry_date  = get_latest_expiry_date(redeem_info_list)
-        latest_expiry_date_str = datetime.strftime(latest_expiry_date, '%d-%m-%Y')
+        
+        latest_expiry_date      = get_latest_expiry_date(redeem_info_list)
+        latest_expiry_date_str  = datetime.strftime(latest_expiry_date, '%d-%m-%Y')
+    
+    logger.debug('New entitled voucher latest_expiry_date_str=%s', latest_expiry_date_str)
     
     if voucher_summary:
+        logger.debug('Found voucher summary, thus going to add new redeem info')
         customer_entitled_voucher_summary[merchant_voucher_key]['redeem_info_list'].extend(redeem_info_list)
         customer_entitled_voucher_summary[merchant_voucher_key]['amount'] = len(customer_entitled_voucher_summary[merchant_voucher_key]['redeem_info_list'])
           
     else:
+        logger.debug('Not found voucher summary, thus going to create it')
         voucher_summary = {
                             'key'               : merchant_voucher_key,
                             'label'             : voucher_label,

{trex-model-1.3.4 → trex-model-1.3.6}/trexmodel/models/datastore/customer_models.py

@@ -242,7 +242,9 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
         
     @staticmethod
     def remove_ticket_from_lucky_draw_ticket_summary(customer_acct, removed_draw_ticket):
+        logger.debug('removed_draw_ticket=%s', removed_draw_ticket)
         entitled_lucky_draw_ticket_summary = {}
+        
         if customer_acct.entitled_lucky_draw_ticket_summary:
             entitled_lucky_draw_ticket_summary = customer_acct.entitled_lucky_draw_ticket_summary
         

{trex-model-1.3.4 → trex-model-1.3.6}/trexmodel/models/datastore/marketing_models.py

@@ -138,25 +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(start_datetime=datetime.utcnow(), end_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>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()):
-        result = PushNotificationSetup.query(
+    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):
@@ -231,18 +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()):
-        return ScheduledPushNotificationHistory.query(
+    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)
+