trex-model 1.5.21__tar.gz → 1.5.24__tar.gz

{trex-model-1.5.21 → trex-model-1.5.24}/PKG-INFO

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

{trex-model-1.5.21 → trex-model-1.5.24}/setup.py

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

{trex-model-1.5.21 → trex-model-1.5.24}/trex_model.egg-info/PKG-INFO

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

{trex-model-1.5.21 → trex-model-1.5.24}/trexmodel/models/datastore/helper/reward_transaction_helper.py

@@ -51,40 +51,45 @@ logger = logging.getLogger('helper')
 
 @model_transactional(desc='check_user_joined_merchant_birthday_reward')
 def check_user_joined_merchant_birthday_reward(user_acct):
+    user_this_year_birth_date   = None
     transact_datetime           = datetime.utcnow()
-    customer_acct_list          = Customer.list_by_user_account(user_acct)
-    
     current_year                = transact_datetime.year
-    today                       = transact_datetime.today()
+    #today                       = transact_datetime.today()
     
-    user_this_year_birth_date   = datetime(year=current_year, month=user_acct.birth_date.month, day=user_acct.birth_date.day)
+    if user_acct.birth_date is not None:
+        user_this_year_birth_date   = datetime(year=current_year, month=user_acct.birth_date.month, day=user_acct.birth_date.day)
     
     logger.debug('user_this_year_birth_date=%s', user_this_year_birth_date)
     
-    for customer_acct in customer_acct_list:
-        merchant_acct = customer_acct.registered_merchant_acct
-        birthday_program_configurations_list = list_merchant_birthday_program_configuration(merchant_acct)
+    if user_this_year_birth_date:
         
-        logger.debug('merchant_acct(%s) birthday_program_configurations_list=%s', merchant_acct.brand_name, birthday_program_configurations_list)
+        customer_acct_list          = Customer.list_by_user_account(user_acct)
         
-        for program_configuration in birthday_program_configurations_list:
-             
-            #program_start_date  = datetime.strptime(program_configuration.get('start_date'), '%d-%m-%Y')
-            #program_end_date    = datetime.strptime(program_configuration.get('end_date'), '%d-%m-%Y')
-            
-            #is_program_still_valid = today>=program_start_date and today<=program_end_date
-            
-            #logger.debug('program(%s) is_program_still_valid=%s', program_configuration.get('label'), is_program_still_valid)
-            
-            #if is_program_still_valid:
-            
-            is_dob_match = _is_user_dob_match_program(user_this_year_birth_date, transact_datetime, program_configuration)
+        
+        for customer_acct in customer_acct_list:
+            merchant_acct = customer_acct.registered_merchant_acct
+            birthday_program_configurations_list = list_merchant_birthday_program_configuration(merchant_acct)
             
-            logger.debug('program(%s) is_dob_match=%s', program_configuration.get('label'), is_dob_match)
+            logger.debug('merchant_acct(%s) birthday_program_configurations_list=%s', merchant_acct.brand_name, birthday_program_configurations_list)
             
-            if is_dob_match:
-                _giveaway_birthday_reward_to_customer(
-                    customer_acct, program_configuration, transact_datetime, merchant_acct, is_test_account=user_acct.is_test_account)
+            for program_configuration in birthday_program_configurations_list:
+                 
+                #program_start_date  = datetime.strptime(program_configuration.get('start_date'), '%d-%m-%Y')
+                #program_end_date    = datetime.strptime(program_configuration.get('end_date'), '%d-%m-%Y')
+                
+                #is_program_still_valid = today>=program_start_date and today<=program_end_date
+                
+                #logger.debug('program(%s) is_program_still_valid=%s', program_configuration.get('label'), is_program_still_valid)
+                
+                #if is_program_still_valid:
+                
+                is_dob_match = _is_user_dob_match_program(user_this_year_birth_date, transact_datetime, program_configuration)
+                
+                logger.debug('program(%s) is_dob_match=%s', program_configuration.get('label'), is_dob_match)
+                
+                if is_dob_match:
+                    _giveaway_birthday_reward_to_customer(
+                        customer_acct, program_configuration, transact_datetime, merchant_acct, is_test_account=user_acct.is_test_account)
             
 
 def _is_user_dob_match_program(user_this_year_birth_date, transact_datetime, program_configuration):

{trex-model-1.5.21 → trex-model-1.5.24}/trexmodel/models/datastore/user_models.py

@@ -17,7 +17,8 @@ from trexlib.utils.common.date_util import to_day_of_year
 from datetime import datetime, timedelta
 from trexmodel.conf import USER_STATUS_ANONYMOUS, ACCOUNT_LOCKED_IN_MINUTES
 
-logger = logging.getLogger("model")
+#logger = logging.getLogger("model")
+logger = logging.getLogger("target_debug")
 
 class UserMin(BaseNModel, DictModel, UserMixin):
     
@@ -464,7 +465,8 @@ class User(UserBase):
                                                                 }
                                                             )
                         
-                    
+                else:
+                    device_details_by_platform['device_token'] = device_token
             else:
                 self.device_details[platform] = [
                                                     {