trex-model 1.5.0__tar.gz → 1.5.2__tar.gz

{trex-model-1.5.0 → trex-model-1.5.2}/PKG-INFO

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

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

{trex-model-1.5.0 → trex-model-1.5.2}/trex_model.egg-info/PKG-INFO

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

{trex-model-1.5.0 → trex-model-1.5.2}/trexmodel/models/datastore/redemption_catalogue_models.py

@@ -76,16 +76,22 @@ class RedemptionCatalogue(BaseNModel, DictModel):
     def exclusive_tags_list(self):
         if self.catalogue_settings.get('exclusivity') and self.catalogue_settings.get('exclusivity').get('tags'):
             return self.catalogue_settings.get('exclusivity').get('tags') or []
+        else:
+            return []
         
     @property
     def exclusive_memberships_list(self):
         if self.catalogue_settings.get('exclusivity') and self.catalogue_settings.get('exclusivity').get('memberships'):
             return self.catalogue_settings.get('exclusivity').get('memberships') or []
+        else:
+            return []
         
     @property
     def exclusive_tier_memberships_list(self):
         if self.catalogue_settings.get('exclusivity') and self.catalogue_settings.get('exclusivity').get('tier_memberships'):
             return self.catalogue_settings.get('exclusivity').get('tier_memberships') or []
+        else:
+            return []
     
     @property
     def catalogue_items(self):
@@ -355,7 +361,11 @@ class RedemptionCatalogue(BaseNModel, DictModel):
                                 'start_date'                        : self.start_date.strftime('%d-%m-%Y'),
                                 'end_date'                          : self.end_date.strftime('%d-%m-%Y'),    
                                 'items'                             : self.catalogue_settings.get('items'),
-                                'exclusivity'                       : self.catalogue_settings.get('exclusivity'),
+                                'exclusivity'                       : {
+                                                                        'tags'              : self.exclusive_tags_list,
+                                                                        'memberships'       : self.exclusive_memberships_list,
+                                                                        'tier_memberships'  : self.exclusive_tier_memberships_list,
+                                                                        },
                                 }
         
         return catalogue_configuration    

{trex-model-1.5.0 → trex-model-1.5.2}/trexmodel/models/datastore/user_models.py

@@ -515,6 +515,7 @@ class DeletedUser(User):
                         birth_date_date_str = user.birth_date_date_str,  
                         birth_day_in_year   = user.birth_day_in_year,
                         reference_code      = user.reference_code,
+                        referral_code       = user.referral_code,
                         active              = False,
                         )
         

{trex-model-1.5.0 → trex-model-1.5.2}/trexmodel/models/merchant_helpers.py

@@ -4,6 +4,10 @@ from trexmodel.models.datastore.merchant_models import ReceiptSetup, Outlet,\
     BannerFile
 from trexlib.utils.string_util import is_not_empty
 from trexconf import conf
+from datetime import datetime
+import logging
+
+logger = logging.getLogger('helper')
 
 def construct_merchant_acct_info(merchant_acct):
     account_settings        = {
@@ -37,28 +41,20 @@ def construct_merchant_acct_info(merchant_acct):
     
     
     
-    '''
-    merchant_news_list = [
-        {
-            'image_url': 'https://scontent.cdninstagram.com/v/t39.30808-6/395358935_817823987014226_84933362912055577_n.jpg?stp=dst-jpg_e35&efg=eyJ2ZW5jb2RlX3RhZyI6ImltYWdlX3VybGdlbi42NTF4NjUwLnNkci5mMzA4MDgifQ&_nc_ht=scontent.cdninstagram.com&_nc_cat=102&_nc_ohc=v_kSSi1t6JgQ7kNvgERj6Vi&edm=APs17CUAAAAA&ccb=7-5&ig_cache_key=MzIyMjUxMzQ0MzI0ODIyMzYzMg%3D%3D.2-ccb7-5&oh=00_AfAUoP1jFeskadyDc4xrwkZb1PuH9t5JSajL6Q5tKAwCew&oe=663DAE72&_nc_sid=10d13b',
-            'text':'',
-            },
-        {
-            'image_url': 'https://scontent.cdninstagram.com/v/t39.30808-6/422867915_881086610687963_4914358090885890823_n.jpg?stp=dst-jpg_e35&efg=eyJ2ZW5jb2RlX3RhZyI6ImltYWdlX3VybGdlbi4xMDAweDEwMDAuc2RyLmYzMDgwOCJ9&_nc_ht=scontent.cdninstagram.com&_nc_cat=111&_nc_ohc=-26XTqUwW_UQ7kNvgGzfHx3&edm=APs17CUAAAAA&ccb=7-5&ig_cache_key=MzI5MDg0MTIxNDU3MjA1Nzk3OA%3D%3D.2-ccb7-5&oh=00_AfC8Mj_E7VFXjv_lXqKRYZujgLyIzSHCIL7zM4-sVgRl_A&oe=663DC772&_nc_sid=10d13b',
-            'text':'',
-            },
-        {
-            'image_url': 'https://scontent.cdninstagram.com/v/t39.30808-6/429531381_18323200675112934_3919053740927881532_n.jpg?stp=dst-jpg_e35&efg=eyJ2ZW5jb2RlX3RhZyI6ImltYWdlX3VybGdlbi4xMDgweDEwODAuc2RyLmYzMDgwOCJ9&_nc_ht=scontent.cdninstagram.com&_nc_cat=106&_nc_ohc=xNmQi508i6sQ7kNvgEEkOg4&edm=APs17CUAAAAA&ccb=7-5&ig_cache_key=MzMxMzI2NDY1NDg3NDQxNDI1Mw%3D%3D.2-ccb7-5&oh=00_AfApkzmZjDGPJB1Vnf49is-ZpqqYYL5nKgmB9jXmDGpUGQ&oe=663FD578&_nc_sid=10d13b',
-            'text':'',
-            }
-        
-        ]
-    '''
     merchant_news_list=[]
     
     if merchant_acct.published_news_configuration:
         merchant_news_list = merchant_acct.published_news_configuration['news']
     
+    published_redemption_catalogue_configuration = merchant_acct.published_redemption_catalogue_configuration
+    catalogues_list = []    
+    if published_redemption_catalogue_configuration:
+        catalogues_list = published_redemption_catalogue_configuration.get('catalogues')
+        
+        if len(catalogues_list)>0:
+            for catalogue in catalogues_list:
+                catalogue['items'] = __resolve_catalogue_items_details(catalogue.get('items'), merchant_acct.published_voucher_configuration.get('vouchers'))
+    
     info =  {
                 'key'                               : merchant_acct.key_in_str,
                 'company_name'                      : merchant_acct.company_name,
@@ -72,6 +68,7 @@ def construct_merchant_acct_info(merchant_acct):
                 'outlets'                           : outlet_json_list,
                 'banners'                           : banner_listing,
                 'merchant_news'                     : merchant_news_list,
+                'redemption_catalogues'             : catalogues_list,
                 } 
     if is_not_empty(referral_program_settings):
         
@@ -88,6 +85,47 @@ def construct_merchant_acct_info(merchant_acct):
     
     return info
 
+def __check_is_still_active(catalogue):
+    today = datetime.utcnow().date()
+    start_date  = datetime.strptime(catalogue.get('start_date'), '%d-%m-%Y').date()
+    end_date    = datetime.strptime(catalogue.get('end_date'), '%d-%m-%Y').date()
+    
+    if today>=start_date and today<=end_date:
+        logger.info('catalogue is still valid')
+        return True
+    else:
+        logger.info('catalogue is expired')
+        return False
+    
+def __resolve_catalogue_items_details(catalogue_items_list, vouchers_list):
+    resolved_items_list = []
+    voucher_dict = __convert_vouchers_list_to_dict(vouchers_list)
+    for item in catalogue_items_list:
+        voucher = voucher_dict.get(item.get('voucher_key'))
+        if voucher:
+            resolved_items_list.append(
+                    {
+                        'voucher_key'           : item.get('voucher_key'),
+                        'amount'                : item.get('voucher_amount'),
+                        'label'                 : voucher.get('label'),
+                        'image_url'             : voucher.get('image_url'),
+                        'terms_and_conditions'  : voucher.get('terms_and_conditions'),
+                        'redeem_reward_amount'  : item.get('redeem_reward_amount'),
+                    }
+                
+                )
+        else:
+            resolved_items_list.append(item)
+        
+    return resolved_items_list    
+
+def __convert_vouchers_list_to_dict(vouchers_list):
+    voucher_dict = {}
+    for voucher in vouchers_list:
+        voucher_dict[voucher.get('voucher_key')] = voucher
+    
+    return voucher_dict
+
 def construct_outlet_info(outlet):
     geo_location = None
     if outlet.geo_location: