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

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

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

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

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

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

{trex-model-1.5.20 → trex-model-1.5.21}/trex_model.egg-info/SOURCES.txt

@@ -31,6 +31,7 @@ trexmodel/models/datastore/lucky_draw_models.py
 trexmodel/models/datastore/marketing_models.py
 trexmodel/models/datastore/membership_models.py
 trexmodel/models/datastore/merchant_models.py
+trexmodel/models/datastore/merchant_promotion_models.py
 trexmodel/models/datastore/message_model_helper.py
 trexmodel/models/datastore/message_models.py
 trexmodel/models/datastore/model_decorators.py

{trex-model-1.5.20 → trex-model-1.5.21}/trexmodel/models/datastore/customer_model_helpers.py

@@ -4,14 +4,70 @@ Created on 29 Apr 2021
 @author: jacklok
 '''
 from trexlib.utils.string_util import is_empty, is_not_empty
-from datetime import datetime
+from datetime import datetime, timedelta
 from dateutil.relativedelta import relativedelta
 import logging
+from trexconf.program_conf import REWARD_FORMAT_STAMP, REWARD_FORMAT_POINT
 
 logger = logging.getLogger('helper')
 #logger = logging.getLogger('debug')
 
 
+'''
+def update_customer_nearest_expiry_stamp_reward_summary(customer, start_datetime, end_datetime):
+    nearest_expiry_details = {
+                            'expiry_date': start_datetime.date()
+                            }
+    transactions_list       = []
+    total_stamp_balance     = .0
+    today                   = datetime.utcnow().date()
+    
+    (result, next_cursor) = CustomerStampReward.list_by_valid_with_cursor(customer, limit=100, start_datetime=start_datetime, end_datetime=end_datetime)
+    logger.debug('next_cursor=%s', next_cursor)
+    logger.debug('transaction count=%s', len(result))
+    
+    while is_not_empty(next_cursor):
+            
+        if result:
+            (nearest_expiry_details, transactions_list, total_stamp_balance) = __update_customer_nearest_expiry_reward_summary(result, nearest_expiry_details, transactions_list)
+            
+        (result, next_cursor) = CustomerStampReward.list_by_valid_with_cursor(customer, limit=100, start_cursor=next_cursor, start_datetime=start_datetime, end_datetime=end_datetime)
+        
+        logger.debug('result=%s, type of is %s', result, type(result))
+        logger.debug('next_cursor=%s, type of is %s', next_cursor, type(next_cursor))
+    
+    if result:
+        (nearest_expiry_details, transactions_list, total_stamp_balance) = __update_customer_nearest_expiry_reward_summary(result, nearest_expiry_details, transactions_list)
+    
+
+
+def __update_customer_nearest_expiry_reward_summary(result, nearest_expiry_details, transactions_list, total_reward_balance):
+        
+    for r in result:
+        reward_balance              = r.reward_balance
+        transaction_reward_summary  = r.to_reward_summary()
+        customer_reward_summary     = update_reward_summary_with_new_reward(nearest_expiry_details)
+        
+        total_reward_balance    +=reward_balance
+    
+        transactions_list.append({
+            'transaction_id'    : r.transaction_id,
+            'reward_balance'    : reward_balance,
+            'expiry_date'       : datetime.strftime(r.expiry_date, '%d-%m-%Y'),
+            'transact_datetime' : datetime.strftime(r.rewarded_datetime, '%d-%m-%Y %H:%M:%s'),
+            'reward_format'     : r.reward_format,
+            'is_expired'        : r.expiry_date<today,
+            })
+    return (customer_reward_summary, transactions_list, total_reward_balance)
+
+def update_nearest_expiry_reward_summary(customer, reward_format):
+    if reward_format==REWARD_FORMAT_POINT:
+        pass
+    elif reward_format==REWARD_FORMAT_STAMP:
+        pass
+    
+'''
+
 '''
 Customer Reward Summary format is
 {
@@ -24,31 +80,54 @@ Customer Reward Summary format is
 
 '''
 ''' --------------- Start: Update reward summary for point and stamp--------------'''
-def update_reward_summary_with_new_reward(existing_reward_summary, new_reward_details):
+def update_reward_summary_with_new_reward(existing_reward_summary, new_reward_details, checking_date=None, max_days_ahead=1800, n_latest_nearest_expiry_entries=10):
     reward_format               = new_reward_details.get('reward_format')
     reward_amount               = new_reward_details.get('amount')
     used_reward_amount          = new_reward_details.get('used_amount')
+    reward_balance              = reward_amount - used_reward_amount
+    new_reward_amount           = .0
+    rewarded_date               = datetime.strptime(new_reward_details.get('rewarded_date'), '%d-%m-%Y').date()
+    
     program_key                 = new_reward_details.get('program_key')
     is_reach_reward_limit       = new_reward_details.get('is_reach_reward_limit')
-    latest_expiry_date          = datetime.strptime(new_reward_details.get('expiry_date'), '%d-%m-%Y').date()
+    checking_date               = checking_date if checking_date is not None else datetime.today().date()
+    new_reward_expiry_date      = datetime.strptime(new_reward_details.get('expiry_date'), '%d-%m-%Y').date()
+    last_rewarded_date          = new_reward_details.get('last_rewarded_date')
+    last_rewarded_date          = datetime.strptime(last_rewarded_date, '%d-%m-%Y').date() if last_rewarded_date else rewarded_date
+    
+    if new_reward_expiry_date<=checking_date:
+        return
+    
+    latest_expiry_date          = new_reward_expiry_date
     existing_latest_expiry_date = None
-    new_latest_expiry_date      = latest_expiry_date
-    reward_balance              = reward_amount - used_reward_amount
+    nearest_expiry_date         = None
+    
+    
     
     logger.debug('reward_amount=%s', reward_amount)
     logger.debug('used_reward_amount=%s', used_reward_amount)
     logger.debug('reward_balance=%s', reward_balance)
     
+    logger.debug('checking_date=%s', checking_date)
+    
     if reward_balance<0:
         reward_balance=0
     
     if is_empty(existing_reward_summary):
+        nearest_expiry_date     = new_reward_expiry_date
         
         existing_reward_summary = {
                             reward_format:{
-                                            'latest_expiry_date'    : new_latest_expiry_date.strftime('%d-%m-%Y'),
+                                            'latest_expiry_date'    : latest_expiry_date.strftime('%d-%m-%Y'),
+                                            'last_rewarded_date'    : last_rewarded_date.strftime('%d-%m-%Y'),
+                                            'checking_date'         : checking_date.strftime('%d-%m-%Y'),
                                             'amount'                : reward_balance,
-                                            
+                                            'nearest_expiry_list' : [
+                                                                        {
+                                                                        'expiry_date'   : nearest_expiry_date.strftime('%d-%m-%Y'),
+                                                                        'amount'        : reward_balance,
+                                                                        },
+                                            ],
                                             'sources'                : [
                                                                         {
                                                                         'amount'                : reward_balance,
@@ -59,30 +138,39 @@ def update_reward_summary_with_new_reward(existing_reward_summary, new_reward_de
                                             }
                                         
                             }
+        
+            
     else:
-        reward_summary_by_reward_format = existing_reward_summary.get(reward_format)
+        reward_summary_by_reward_format = existing_reward_summary.get(reward_format,{})
+        reward_source_list              = reward_summary_by_reward_format.get('sources') or []
+        nearest_expiry_list             = reward_summary_by_reward_format.get('nearest_expiry_list', [])
         
-        if reward_summary_by_reward_format is None:
-            reward_summary_by_reward_format = {
-                                                'amount': 0,
-                                                }
-            new_latest_expiry_date = latest_expiry_date
-        else:
+        existing_last_rewarded_date     = reward_summary_by_reward_format.get('last_rewarded_date')
         
-            existing_latest_expiry_date = reward_summary_by_reward_format.get('latest_expiry_date')
-            existing_latest_expiry_date = datetime.strptime(existing_latest_expiry_date, '%d-%m-%Y').date()
-            
-            new_latest_expiry_date      = latest_expiry_date
+        if is_empty(existing_last_rewarded_date):
+            existing_last_rewarded_date =  last_rewarded_date
+        
+        if rewarded_date>last_rewarded_date:
+            last_rewarded_date = rewarded_date
             
-            if latest_expiry_date > existing_latest_expiry_date:  
-                new_latest_expiry_date = existing_latest_expiry_date
-                
-                
-        reward_summary_by_reward_format['latest_expiry_date']   = new_latest_expiry_date.strftime('%d-%m-%Y')
-        reward_summary_by_reward_format['amount']               = reward_summary_by_reward_format['amount'] + reward_balance
         
-        reward_source_list = reward_summary_by_reward_format.get('sources') or []
+        if is_not_empty(nearest_expiry_list):
+            nearest_expiry_list = __remove_expired_reward(nearest_expiry_list, checking_date)
+        
+        new_record = {
+                        'amount'        : reward_balance, 
+                        'expiry_date'   : datetime.strftime(new_reward_expiry_date, '%d-%m-%Y')
+                        }
+        #nearest_expiry_list = __add_record_or_update_if_within_max_day_range(nearest_expiry_list, new_record, today_date, max_days_ahead)
+        
+        __add_record_or_update_if_within_max_day_range(nearest_expiry_list, new_record, checking_date, max_days_ahead)
+        
+        nearest_expiry_list = __maintain_latest_n_entries(nearest_expiry_list, n_latest_nearest_expiry_entries)
+        
+        nearest_expiry_list = sorted(nearest_expiry_list, key=lambda x: __string_to_date(x['expiry_date']))
+        
         found_program_reward_source = False
+        
         for reward_source in reward_source_list:
             existing_reward_source_program_key = reward_source.get('program_key')
             if existing_reward_source_program_key== program_key:
@@ -102,12 +190,57 @@ def update_reward_summary_with_new_reward(existing_reward_summary, new_reward_de
                                 }
                             )
         
-        reward_summary_by_reward_format['sources'] = reward_source_list
+        if is_empty(reward_summary_by_reward_format):
+            new_reward_amount = reward_balance
+            
+        else:
+        
+            existing_latest_expiry_date = reward_summary_by_reward_format.get('latest_expiry_date')
+            existing_latest_expiry_date = datetime.strptime(existing_latest_expiry_date, '%d-%m-%Y').date()
+            existing_reward_amount      = reward_summary_by_reward_format.get('amount', .0) 
+            new_reward_amount           = existing_reward_amount + reward_balance
+            
+            if existing_latest_expiry_date > latest_expiry_date:  
+                latest_expiry_date = existing_latest_expiry_date
+                
+        reward_summary_by_reward_format = {
+                                        'amount'                    : new_reward_amount,
+                                        'latest_expiry_date'        : latest_expiry_date.strftime('%d-%m-%Y'),
+                                        'last_rewarded_date'        : last_rewarded_date.strftime('%d-%m-%Y'),
+                                        'checking_date'             : checking_date.strftime('%d-%m-%Y'),
+                                        'nearest_expiry_list'       : nearest_expiry_list or [],
+                                        'sources'                   : reward_source_list,
+                                        }
+        
+        
+        
         
-        existing_reward_summary[reward_format]                  = reward_summary_by_reward_format
+        existing_reward_summary[reward_format] = reward_summary_by_reward_format
         
     return existing_reward_summary
 
+def __string_to_date(date_str):
+    return datetime.strptime(date_str, '%d-%m-%Y').date()
+
+def __remove_expired_reward(data, current_date):
+    return [record for record in data if __string_to_date(record['expiry_date']) >= current_date]
+
+def __add_record_or_update_if_within_max_day_range(data_list, new_record, current_date, max_days_ahead):
+    expiry_date = __string_to_date(new_record['expiry_date'])
+    if current_date <= expiry_date <= current_date + timedelta(days=max_days_ahead):
+        for record in data_list:
+            if record['expiry_date'] == new_record['expiry_date']:
+                record['amount'] += new_record['amount']
+                break
+        else:
+            data_list.append(new_record)
+    else:
+        logger.debug(f"Record with expiry date {new_record['expiry_date']} is out of the allowed range and was not added.")
+
+def __maintain_latest_n_entries(data, n):
+    data.sort(key=lambda x: __string_to_date(x['expiry_date']), reverse=True)
+    return data[:n]
+
 def update_reward_summary_with_reverted_reward(existing_reward_summary, reverting_reward_details):
     reward_summary              = existing_reward_summary
     reward_format               = reverting_reward_details.get('reward_format')