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

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

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

{trex-model-1.4.6 → trex-model-1.5.0}/setup.py

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

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

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

{trex-model-1.4.6 → trex-model-1.5.0}/trexmodel/conf.py

@@ -37,7 +37,16 @@ MESSAGE_CATEGORY_REWARD                 = 'reward'
 MESSAGE_CATEGORY_REDEEM                 = 'redeem'
 MESSAGE_CATEGORY_REDEMPTION_CATALOGUE   = 'redemption_catalogue'
 
-MESSAGE_CATEGORIES = (MESSAGE_CATEGORY_ANNOUNCEMENT, MESSAGE_CATEGORY_ALERT, MESSAGE_CATEGORY_PROMOTION, MESSAGE_CATEGORY_SURVEY, MESSAGE_CATEGORY_SYSTEM, MESSAGE_CATEGORY_REWARD, MESSAGE_CATEGORY_REDEEM)
+MESSAGE_CATEGORIES = (
+                        MESSAGE_CATEGORY_ANNOUNCEMENT, 
+                        MESSAGE_CATEGORY_ALERT, 
+                        MESSAGE_CATEGORY_PROMOTION, 
+                        MESSAGE_CATEGORY_SURVEY, 
+                        MESSAGE_CATEGORY_SYSTEM, 
+                        MESSAGE_CATEGORY_REWARD, 
+                        MESSAGE_CATEGORY_REDEEM,
+                        MESSAGE_CATEGORY_REDEMPTION_CATALOGUE,
+                        )
 
 MESSAGE_STATUS_NEW      = 'n'
 MESSAGE_STATUS_READ     = 'r'

{trex-model-1.4.6 → trex-model-1.5.0}/trexmodel/models/datastore/merchant_models.py

@@ -70,6 +70,7 @@ class MerchantAcct(MerchantMin):
     published_voucher_configuration                 = ndb.JsonProperty()
     published_redemption_catalogue_configuration    = ndb.JsonProperty()
     published_news_configuration                    = ndb.JsonProperty()
+    published_tier_program_configuration            = ndb.JsonProperty()
     
     membership_configuration                        = ndb.JsonProperty()
     tier_membership_configuration                   = ndb.JsonProperty()
@@ -91,7 +92,7 @@ class MerchantAcct(MerchantMin):
                        'office_phone', 'fax_phone', 'email', 'account_code', 'country',
                        'registered_datetime', 'modified_datetime', 'plan_start_date', 'plan_end_date', 'currency_code', 
                        'timezone', 'effective_referral_program_count',
-                       'published_program_configuration', 'published_referral_program_configuration', 
+                       'published_program_configuration', 'published_tier_program_configuration', 'published_referral_program_configuration', 
                        'published_voucher_configuration', 'published_news_configuration', 'membership_configuration', 
                        'tier_membership_configuration', 'prepaid_configuration', 'lucky_draw_configuration', 'product_modifier_configuration',
                        'dashboard_stat_figure', 'program_settings', 'is_tier_membership_configured', 'website', 
@@ -573,6 +574,32 @@ class MerchantAcct(MerchantMin):
             
         self.put()
         
+    def update_published_tier_program(self, program_configuration):
+        if is_empty(self.published_tier_program_configuration):
+            self.published_program_configuration = {
+                                                'programs'  :[program_configuration],
+                                                'count'     : 1,
+                                                } 
+                                            
+        else:
+            self.flush_dirty_program_configuration()
+            existing_programs_list  = self.published_tier_program_configuration.get('programs')
+            
+            program_key = program_configuration.get('program_key')
+            index = 0
+            for p in existing_programs_list:
+                if p.get('program_key') == program_key:
+                    existing_programs_list.pop(index)
+                
+                index = index+1
+            
+            existing_programs_list.append(program_configuration)
+            
+            self.published_tier_program_configuration['programs']    = existing_programs_list
+            self.published_tier_program_configuration['count']       = len(existing_programs_list) 
+            
+        self.put()    
+        
     def update_published_referral_program(self, program_configuration):
         if is_empty(self.published_referral_program_configuration):
             self.published_referral_program_configuration = {
@@ -912,6 +939,49 @@ class MerchantAcct(MerchantMin):
         self.published_program_configuration['count']       = program_count
             
         self.put() 
+    
+    def remove_tier_program_from_published_tier_program_configuration(self, program_key_to_remove):
+        
+        logger.debug('remove_tier_program_from_published_tier_program_configuration: program_key_to_remove=%s', program_key_to_remove)
+        
+        #self.flush_dirty_program_configuration()
+        if self.published_tier_program_configuration:
+            existing_programs_list  = self.published_tier_program_configuration['programs']
+            program_count           = len(existing_programs_list)
+            
+        else:
+            self.published_tier_program_configuration = {}
+            existing_programs_list  = []
+            program_count           = 0
+            
+        
+        logger.debug('program_count before remove=%s', program_count)
+        
+        index = 0
+        
+        for program in existing_programs_list:
+            
+            logger.debug('program_key=%s', program.get('program_key'))
+            
+            is_same_program_key = program.get('program_key') == program_key_to_remove
+            
+            logger.debug('is_same_program_key=%s', is_same_program_key)
+            
+            if is_same_program_key:
+                existing_programs_list.pop(index)
+                
+                logger.debug('Found program to be remove')
+                
+            index = index+1
+        
+        program_count = len(existing_programs_list)
+        
+        logger.debug('program_count after remove=%s', program_count)
+        
+        self.published_tier_program_configuration['programs']    = existing_programs_list
+        self.published_tier_program_configuration['count']       = program_count
+            
+        self.put() 
         
     def remove_program_from_published_referral_program_configuration(self, program_key_to_remove):
         

{trex-model-1.4.6 → trex-model-1.5.0}/trexmodel/models/datastore/message_model_helper.py

@@ -10,6 +10,7 @@ from trexmodel.conf import MESSAGE_CATEGORY_REWARD, MESSAGE_STATUS_NEW,\
 from trexconf import program_conf
 from babel.numbers import format_currency
 import logging
+from flask_babel import gettext
 
 
 logger = logging.getLogger('helper')
@@ -198,7 +199,7 @@ def create_redeem_catalogue_item_message(customer, entitled_vouchers_summary, re
         message = Message(
                     parent              = user_acct.create_ndb_key(),
                     message_to          = user_acct.create_ndb_key(),
-                    title               = 'Redemption Catalogue Reward',
+                    title               = gettext('Redemption Catalogue Reward'),
                     message_category    = MESSAGE_CATEGORY_REDEMPTION_CATALOGUE,
                     message_content     = __create_message_from_redeem_catalogue_transaction(customer, entitled_vouchers_summary),
                     message_data        = __create_message_data_from_redemption_catalogue(redemption_catalogue_transaction),

{trex-model-1.4.6 → trex-model-1.5.0}/trexmodel/models/datastore/program_models.py

@@ -19,6 +19,26 @@ from trexlib.utils.common.common_util import sort_list, sort_dict_list
 #logger = logging.getLogger('model')
 logger = logging.getLogger('debug')
 
+def create_schedule_program(merchant_acct, program):
+    if program.reward_base in (program_conf.SCHEDULE_BASED_PROGRAM):
+        
+        if program.reward_base == program_conf.REWARD_BASE_ON_BIRTHDAY:
+            if program.giveaway_reward_when == program_conf.PROGRAM_SCHEDULE_TYPE_MONTH_START:
+                MerchantScheduleProgram.create_first_day_of_month_schedule_program(merchant_acct, program)
+            
+            elif program.giveaway_reward_when == program_conf.ADVANCE_IN_DAY:
+                MerchantScheduleProgram.create_daily_schedule_program(merchant_acct, program)
+                
+        elif program.reward_base == program_conf.REWARD_BASE_ON_GIVEAWAY:
+            if program.giveaway_system_condition == program_conf.GIVEAWAY_SYSTEM_CONDITION_MEMBERSHIP_YEAR:
+                MerchantScheduleProgram.create_daily_schedule_program(merchant_acct, program)
+                        
+    
+
+def remove_schedule_program(program):
+    if program.reward_base in (program_conf.SCHEDULE_BASED_PROGRAM):
+        MerchantScheduleProgram.remove_by_merchant_program(program)
+
 class BaseProgram(BaseNModel, DictModel):
     reward_base                         = ndb.StringProperty(required=True, choices=set(program_conf.REWARD_BASE_SET))
     reward_format                       = ndb.StringProperty(required=False, choices=set(program_conf.REWARD_FORMAT_SET))
@@ -164,9 +184,9 @@ class BaseProgram(BaseNModel, DictModel):
         program.put()
         
         return program
-    
+    '''
     @classmethod
-    def __create_schedule_program(cls, merchant_acct, program):
+    def create_schedule_program(cls, merchant_acct, program):
         if program.reward_base in (program_conf.SCHEDULE_BASED_PROGRAM):
             
             if program.reward_base == program_conf.REWARD_BASE_ON_BIRTHDAY:
@@ -182,9 +202,10 @@ class BaseProgram(BaseNModel, DictModel):
                         
     
     @classmethod
-    def __remove_schedule_program(cls, program):
+    def remove_schedule_program(cls, program):
         if program.reward_base in (program_conf.SCHEDULE_BASED_PROGRAM):
             MerchantScheduleProgram.remove_by_merchant_program(program)
+    '''
         
     @classmethod
     @model_transactional(desc="publish_program")
@@ -196,7 +217,7 @@ class BaseProgram(BaseNModel, DictModel):
         merchant_acct = program.merchant_acct
         merchant_acct.update_published_program(program.to_configuration())
         
-        cls.__create_schedule_program(merchant_acct, program)
+        create_schedule_program(merchant_acct, program)
         
     @classmethod
     @model_transactional(desc="archive_program")
@@ -208,7 +229,7 @@ class BaseProgram(BaseNModel, DictModel):
         merchant_acct = program.merchant_acct
         merchant_acct.remove_program_from_published_program_configuration(program.key_in_str) 
         
-        cls.__remove_schedule_program(program)
+        remove_schedule_program(program)
         
     
     @classmethod
@@ -231,7 +252,7 @@ class BaseProgram(BaseNModel, DictModel):
             merchant_acct = program.merchant_acct
             merchant_acct.update_published_program(program.to_configuration())
             
-            cls.__create_schedule_program(merchant_acct, program)
+            create_schedule_program(merchant_acct, program)
             
         
     @classmethod
@@ -254,7 +275,7 @@ class BaseProgram(BaseNModel, DictModel):
             merchant_acct = program.merchant_acct
             merchant_acct.remove_program_from_published_program_configuration(program.key_in_str)
             
-            cls.__remove_schedule_program(program)
+            remove_schedule_program(program)
         
     def to_configuration(self):
         program_configuration = {
@@ -698,6 +719,78 @@ class MerchantTierRewardProgram(MerchantProgram):
         
         return reward_settings_list
     
+    @staticmethod
+    @model_transactional(desc="publish_program")
+    def publish_program(program):
+        program.completed_status = program_conf.PROGRAM_STATUS_PUBLISH
+        program.published_datetime = datetime.now()
+        program.put()
+        
+        merchant_acct = program.merchant_acct
+        merchant_acct.update_published_program(program.to_configuration())
+        
+        create_schedule_program(merchant_acct, program)
+    
+    @staticmethod
+    @model_transactional(desc="archive_program")
+    def archive_program(program):
+        program.archived = True
+        program.archived_datetime = datetime.now()
+        program.put()
+        
+        merchant_acct = program.merchant_acct
+        #merchant_acct.remove_tier_program_from_published_tier_program_configuration(program.key_in_str)
+        merchant_acct.remove_program_from_published_program_configuration(program.key_in_str) 
+        
+        remove_schedule_program(program)
+    
+    @staticmethod
+    @model_transactional(desc="enable program")
+    def enable(program, modified_by=None):
+        program.enabled = True
+        
+        modified_by_username = None
+        
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+        
+        program.modified_by            = modified_by.create_ndb_key()
+        program.modified_by_username   = modified_by_username
+        
+        program.put()
+        
+        if program.is_published:
+            merchant_acct = program.merchant_acct
+            #merchant_acct.update_published_tier_program(program.to_configuration())
+            merchant_acct.update_published_program(program.to_configuration())
+            
+            create_schedule_program(merchant_acct, program)
+            
+        
+    @classmethod
+    @model_transactional(desc="disable program")
+    def disable(cls, program, modified_by=None):
+        program.enabled = False
+        
+        modified_by_username = None
+        
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+                program.modified_by            = modified_by.create_ndb_key()
+                
+        program.modified_by_username   = modified_by_username
+        
+        program.put()  
+        
+        if program.is_published:
+            merchant_acct = program.merchant_acct
+            #merchant_acct.remove_tier_program_from_published_tier_program_configuration(program.key_in_str)
+            merchant_acct.remove_program_from_published_program_configuration(program.key_in_str)
+            
+            remove_schedule_program(program)
+    
     @staticmethod
     def create(merchant_acct, label=None, is_tier_recycle=True, is_show_progress=True, reward_format=None,
                desc=None, start_date=None, end_date=None, created_by=None):