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

{trex-model-1.3.6 → trex-model-1.4.0}/PKG-INFO

@@ -1,15 +1,20 @@
 Metadata-Version: 2.1
 Name: trex-model
-Version: 1.3.6
+Version: 1.4.0
 Summary: TRex database module package
 Home-page: https://bitbucket.org/lokjac/trex-model
 Author: Jack Lok
 Author-email: sglok77@gmail.com
-License: UNKNOWN
-Description: This is database modelusing google datastore mode module
-        
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: google-cloud-firestore
+Requires-Dist: google_cloud_datastore
+Requires-Dist: google-cloud-ndb
+Requires-Dist: six
+Requires-Dist: trex-lib
+Requires-Dist: flask-login==0.6.2
+
+This is database modelusing google datastore mode module

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

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

@@ -1,15 +1,20 @@
 Metadata-Version: 2.1
 Name: trex-model
-Version: 1.3.6
+Version: 1.4.0
 Summary: TRex database module package
 Home-page: https://bitbucket.org/lokjac/trex-model
 Author: Jack Lok
 Author-email: sglok77@gmail.com
-License: UNKNOWN
-Description: This is database modelusing google datastore mode module
-        
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: google-cloud-firestore
+Requires-Dist: google_cloud_datastore
+Requires-Dist: google-cloud-ndb
+Requires-Dist: six
+Requires-Dist: trex-lib
+Requires-Dist: flask-login==0.6.2
+
+This is database modelusing google datastore mode module

{trex-model-1.3.6 → trex-model-1.4.0}/trex_model.egg-info/SOURCES.txt

@@ -40,8 +40,10 @@ trexmodel/models/datastore/prepaid_models.py
 trexmodel/models/datastore/product_models.py
 trexmodel/models/datastore/program_models.py
 trexmodel/models/datastore/rating_models.py
+trexmodel/models/datastore/recruit_models.py
 trexmodel/models/datastore/redeem_models.py
 trexmodel/models/datastore/redemption_catalogue_models.py
+trexmodel/models/datastore/referral_program_model.py
 trexmodel/models/datastore/reward_model_helpers.py
 trexmodel/models/datastore/reward_models.py
 trexmodel/models/datastore/spending_base_program_model.py

{trex-model-1.3.6 → trex-model-1.4.0}/trexmodel/models/datastore/admin_models.py

@@ -9,7 +9,7 @@ from trexlib.utils.security_util import generate_user_id, hash_password
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 from trexlib.utils.string_util import random_string
 from trexlib.utils.common.common_util import logger
-from trexlib import conf
+from trexconf import conf
 
 
 class SuperUser(UserMin):

{trex-model-1.3.6 → trex-model-1.4.0}/trexmodel/models/datastore/analytic_models.py

@@ -3,7 +3,7 @@ Created on 25 Jan 2021
 
 @author: jacklok
 '''
-from trexmodel import conf as model_conf
+from trexconf import conf as model_conf
 from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 from datetime import timedelta

{trex-model-1.3.6 → trex-model-1.4.0}/trexmodel/models/datastore/coporate_models.py

@@ -5,17 +5,7 @@ Created on 19 Feb 2021
 '''
 from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel, FullTextSearchable
-from trexmodel.models.datastore.system_models import SentEmail
-from trexmodel.models.datastore.user_models import UserMin
-import trexmodel.conf as model_conf
-from trexlib.utils.security_util import generate_user_id, hash_password
-from trexlib.utils.string_util import random_number
 import logging
-from datetime import datetime, timedelta
-from trexlib.utils.common.date_util import parse_datetime
-from trexmodel import conf
-from google.auth._default import default
-from trexmodel.models.datastore.system_models import Tagging
 
 
 logger = logging.getLogger('model')

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

@@ -13,7 +13,7 @@ from trexlib.utils.string_util import is_not_empty, is_empty
 import logging
 from trexlib.utils.common.date_util import convert_date_to_datetime,\
     to_day_of_year
-from trexmodel import conf, program_conf
+from trexconf import conf, program_conf
 from six import string_types
 from datetime import datetime, timedelta
 from trexmodel.models.datastore.membership_models import MerchantTierMembership,\
@@ -46,6 +46,7 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
     birth_day_in_year           = ndb.IntegerProperty(required=False)
     gender                      = ndb.StringProperty(required=False)
     reference_code              = ndb.StringProperty(required=True)
+    referral_code               = ndb.StringProperty(required=False)
     
     mobile_app_installed        = ndb.BooleanProperty(required=False, default=False)
     
@@ -68,6 +69,8 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
     entitled_membership_reward_summary          = ndb.JsonProperty()
     entitled_lucky_draw_ticket_summary          = ndb.JsonProperty(required=False)
     
+    referrer_code                               = ndb.StringProperty(required=False)
+    
     kpi_summary                                 = ndb.JsonProperty()
     
     device_details                              = ndb.JsonProperty()
@@ -79,7 +82,7 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
                            'reward_summary', 'entitled_voucher_summary', 'prepaid_summary', 'kpi_summary', 'entitled_lucky_draw_ticket_summary',
                            'entitled_birthday_reward_summary', 'tier_membership_key',
                            'registered_outlet_key', 'registered_merchant_acct_key', 'registered_datetime', 'modified_datetime',
-                           'registered_user_acct',
+                           'registered_user_acct','referral_code',
                            
                            ]
     
@@ -267,6 +270,7 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
         for ticket in tickets_list:
             ticket.patch_prize_image_base_url()
             Customer.update_ticket_into_lucky_draw_ticket_summary(customer_acct, ticket.to_configuration())
+    
     @classmethod
     def get_by_reference_code(cls, reference_code, merchant_acct):
         return cls.query(ndb.AND(cls.reference_code==reference_code, cls.merchant_acct==merchant_acct.create_ndb_key())).get()
@@ -353,6 +357,7 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
                                mobile_phone             = user_acct.mobile_phone, 
                                gender                   = user_acct.gender, 
                                reference_code           = user_acct.reference_code, 
+                               referral_code            = user_acct.referral_code,
                                birth_date               = user_acct.birth_date, 
                                birth_date_date_str      = user_acct.birth_date_date_str, 
                                birth_day_in_year        = user_acct.birth_day_in_year,

{trex-model-1.3.6 → trex-model-1.4.0}/trexmodel/models/datastore/fb_subsriber_models.py

@@ -7,13 +7,6 @@ Created on 23 Oct 2020
 from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 
-import logging  
-from trexlib.utils.security_util import generate_user_id, hash_password
-
-from trexlib import conf as lib_conf
-from trexmodel import conf as model_conf
-import json
-from json import JSONEncoder
 from datetime import datetime
 
 class FacebookSubscriber(BaseNModel, DictModel):

{trex-model-1.3.6 → trex-model-1.4.0}/trexmodel/models/datastore/import_models.py

@@ -5,17 +5,13 @@ Created on 26 Sep 2023
 '''
 
 from google.cloud import ndb
-from trexmodel.models.datastore.user_models import UserMin
-from trexlib.utils.security_util import generate_user_id, hash_password
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 from trexlib.utils.string_util import random_string
-from trexlib.utils.common.common_util import logger
-from trexlib import conf
 from trexmodel.models.datastore.merchant_models import MerchantAcct
 import logging
 import csv, io
 
-from trexmodel import program_conf
+from trexconf import program_conf
 
 logger = logging.getLogger('model')
 

{trex-model-1.3.6 → trex-model-1.4.0}/trexmodel/models/datastore/inventory_model.py

@@ -5,17 +5,9 @@ Created on 19 Aug 2021
 '''
 
 from google.cloud import ndb
-from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel, FullTextSearchable
-from trexmodel.models.datastore.user_models import User
-from trexmodel.models.datastore.merchant_models import MerchantAcct, Outlet, MerchantUser
-from trexlib.utils.string_util import is_empty, is_not_empty
-import logging, json
-from trexmodel import conf, program_conf
-from trexlib.utils.string_util import random_string
-from datetime import datetime, timedelta
-from trexmodel.models.datastore.customer_models import Customer
-import trexmodel.conf as model_conf
-from trexmodel.models.datastore.model_decorators import model_transactional
+from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
+from trexmodel.models.datastore.merchant_models import MerchantUser
+import logging
 
 logger = logging.getLogger('model')
 

{trex-model-1.3.6 → trex-model-1.4.0}/trexmodel/models/datastore/loyalty_models.py

@@ -8,10 +8,10 @@ from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 from trexmodel.models.datastore.merchant_models import Outlet
 from trexlib.utils.string_util import random_number
-import logging, json
-from trexmodel import conf, program_conf
+import logging
+from trexconf import conf
 from datetime import datetime
-from google.api_core.operations_v1.operations_client_config import config
+#from google.api_core.operations_v1.operations_client_config import config
 
 logger = logging.getLogger('debug')
 

{trex-model-1.3.6 → trex-model-1.4.0}/trexmodel/models/datastore/lucky_draw_models.py

@@ -4,7 +4,7 @@ Created on 12 May 2023
 @author: jacklok
 '''
 import logging
-from trexmodel import program_conf
+from trexconf import program_conf
 import trexmodel.conf as model_conf
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 from google.cloud import ndb
@@ -58,9 +58,9 @@ class LuckyDrawProgram(LuckyDrawBase):
                                            'created_datetime', 'modified_datetime','archived_datetime', 'completed_status',
                                            'condition_settings', 'exclusivity_settings', 'prize_settings',
                                            'exclusive_tags_list', 'exclusive_memberships_list', 'exclusive_tier_memberships_list',  
-                                           'created_by_username', 'modified_by_username', 'completed_prograss_in_percentage',
+                                           'created_by_username', 'modified_by_username', 'completed_progress_in_percentage',
                                            'is_published', 'is_enabled','is_disabled', 'totalPrizePossibility',
-                                           'image_storage_filename', 'image_public_url', 'test_result', 
+                                           'image_storage_filename', 'image_public_url', 'test_result', 'is_expired',
                                            ]
     
     
@@ -95,6 +95,10 @@ class LuckyDrawProgram(LuckyDrawBase):
     def is_disabled(self):
         return self.enabled==False
     
+    @property
+    def is_expired(self):
+        return self.end_date<datetime.now().date()
+    
     @property
     def is_archived(self):
         return self.archived
@@ -119,7 +123,7 @@ class LuckyDrawProgram(LuckyDrawBase):
             return ','.join(self.exclusivity_settings.get('tier_memberships')) or ''
     
     @property
-    def completed_prograss_in_percentage(self):
+    def completed_progress_in_percentage(self):
         return program_conf.lucky_draw_program_completed_progress_percentage(self.completed_status)
     
     @property

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

@@ -9,7 +9,7 @@ from trexmodel.models.datastore.merchant_models import MerchantUser,\
     MerchantAcct
 from trexlib.utils.string_util import is_not_empty, random_string
 from datetime import datetime
-from trexmodel import program_conf, conf
+from trexconf import conf
 import trexmodel.conf as model_conf
 import logging
 

{trex-model-1.3.6 → trex-model-1.4.0}/trexmodel/models/datastore/membership_models.py

@@ -9,13 +9,12 @@ from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 import trexmodel.conf as model_conf
 from trexlib.utils.string_util import is_not_empty, random_string
 from trexmodel.models.datastore.merchant_models import MerchantAcct, \
-    MerchantUser, Outlet
+    MerchantUser
 import logging
 from dateutil.relativedelta import relativedelta
-from datetime import timedelta
 
 from datetime import datetime
-from trexmodel import program_conf
+from trexconf import program_conf
 
 logger = logging.getLogger('model')
 

{trex-model-1.3.6 → trex-model-1.4.0}/trexmodel/models/datastore/merchant_models.py

@@ -14,10 +14,9 @@ from trexlib.utils.string_util import random_number, is_empty, is_not_empty,\
     split_by_length, random_string
 import logging
 from datetime import datetime, timedelta
-from trexmodel import conf, program_conf
+from trexconf import conf, program_conf
 from trexmodel.models.datastore.system_models import Tagging
 from trexmodel.models.datastore.model_decorators import model_transactional
-from trexlib.utils.common.common_util import sort_dict_list
 from trexmodel.program_conf import LOYALTY_PACKAGE_LITE, LOYALTY_PRODUCT
 
 logger = logging.getLogger('model')
@@ -67,30 +66,32 @@ class MerchantAcct(MerchantMin):
     outlet_count                            = ndb.IntegerProperty(default=0)
     
     published_program_configuration                 = ndb.JsonProperty()
+    published_referral_program_configuration        = ndb.JsonProperty()
     published_voucher_configuration                 = ndb.JsonProperty()
     published_redemption_catalogue_configuration    = ndb.JsonProperty()
     
     membership_configuration                        = ndb.JsonProperty()
     tier_membership_configuration                   = ndb.JsonProperty()
     
-    reward_naming_configuration             = ndb.JsonProperty()
+    reward_naming_configuration                     = ndb.JsonProperty()
     
-    prepaid_configuration                   = ndb.JsonProperty()
+    prepaid_configuration                           = ndb.JsonProperty()
     
-    lucky_draw_configuration                = ndb.JsonProperty(required=False)
+    lucky_draw_configuration                        = ndb.JsonProperty(required=False)
     
-    product_modifier_configuration          = ndb.JsonProperty()
+    product_modifier_configuration                  = ndb.JsonProperty()
     
-    program_settings                        = ndb.JsonProperty()
+    program_settings                                = ndb.JsonProperty()
     
-    stat_figure_update_interval_in_minutes  = conf.MERCHANT_STAT_FIGURE_UPDATE_INTERVAL_IN_MINUTES
-    stat_figure_update_datetime_format      = '%d-%m-%Y %H:%M:%S'
+    stat_figure_update_interval_in_minutes          = conf.MERCHANT_STAT_FIGURE_UPDATE_INTERVAL_IN_MINUTES
+    stat_figure_update_datetime_format              = '%d-%m-%Y %H:%M:%S'
     
     dict_properties = ['company_name', 'brand_name', 'contact_name', 'business_reg_no', 'mobile_phone', 
                        'office_phone', 'fax_phone', 'email', 'account_code', 'country',
                        'registered_datetime', 'modified_datetime', 'plan_start_date', 'plan_end_date', 'currency_code', 
-                       'timezone',
-                       'published_program_configuration', 'published_voucher_configuration', 'membership_configuration', 
+                       'timezone', 'effective_referral_program_count',
+                       'published_program_configuration', 'published_referral_program_configuration', 
+                       'published_voucher_configuration', 'membership_configuration', 
                        'tier_membership_configuration', 'prepaid_configuration', 'lucky_draw_configuration', 'product_modifier_configuration',
                        'dashboard_stat_figure', 'program_settings', 'is_tier_membership_configured', 'website', 
                        'product_package', 'loyalty_package','account_plan','outlet_count', 'outlet_limit',
@@ -123,6 +124,31 @@ class MerchantAcct(MerchantMin):
         
         return LOYALTY_PACKAGE_LITE
     
+    @property
+    def effective_referral_program_count(self):
+        if self.published_referral_program_configuration:
+            program_count = self.published_referral_program_configuration.get('count',0)
+            if program_count>0:
+                check_effective_count = 0
+                program_list = self.published_referral_program_configuration.get('programs');
+                today_date = datetime.today()
+                for program_details in program_list:
+                    start_date_str = program_details.get('start_date')
+                    start_date = datetime.strptime(start_date_str, '%d-%m-%Y')
+                    
+                    end_date_str = program_details.get('end_date')
+                    end_date = datetime.strptime(end_date_str, '%d-%m-%Y')
+                    
+                    if start_date<=today_date and today_date<=end_date:
+                        check_effective_count+=1
+                
+                return check_effective_count
+                    
+            else:
+                return program_count
+                
+        return 0
+    
     @property
     def outlet_limit(self):
         if self.account_plan:
@@ -213,6 +239,47 @@ class MerchantAcct(MerchantMin):
         if self.lucky_draw_configuration.get('settings'):
             return self.lucky_draw_configuration['settings']['ticket_image_url']
     
+    @property
+    def referrer_promote_title(self):
+        if is_not_empty(self.program_settings):
+            if self.program_settings.get('referral_program'):
+                return self.program_settings.get('referral_program').get('referrer_promote_title', '')
+        return ''
+        
+    @property
+    def referee_promote_title(self):
+        if is_not_empty(self.program_settings):
+            if self.program_settings.get('referral_program'):
+                return self.program_settings.get('referral_program').get('referee_promote_title', '')      
+        return ''
+        
+    @property
+    def referrer_promote_desc(self):
+        if is_not_empty(self.program_settings):
+            if self.program_settings.get('referral_program'):
+                return self.program_settings.get('referral_program').get('referrer_promote_desc', '')
+        return ''
+            
+    @property
+    def referee_promote_desc(self):
+        if is_not_empty(self.program_settings):
+            if self.program_settings.get('referral_program'):
+                return self.program_settings.get('referral_program').get('referee_promote_desc', '')            
+        return ''
+        
+    @property
+    def referrer_promote_image(self):
+        if is_not_empty(self.program_settings):
+            if self.program_settings.get('referral_program'):
+                return self.program_settings.get('referral_program').get('referrer_promote_image')
+            
+    @property
+    def referee_promote_image(self):
+        if is_not_empty(self.program_settings):
+            if self.program_settings.get('referral_program'):
+                return self.program_settings.get('referral_program').get('referee_promote_image')        
+        
+    
     @staticmethod
     def default_program_settings():
         return {
@@ -222,7 +289,104 @@ class MerchantAcct(MerchantMin):
                 'membership_renew_late_day'             : 30,
                 
                 }
+    
+    def update_referrer_program_promote_text(self, 
+                                             promote_title=None, 
+                                             promote_desc=None,
+                                             modified_by=None):
+        modified_by_username = None
+        
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+        
+        if is_empty(self.program_settings):
+            self.program_settings = {
+                                    'referral_program':{}
+                                    }
+        else:
+            if is_empty(self.program_settings.get('referral_program')):
+                self.program_settings['referral_program'] = {}
         
+        self.modified_by            = modified_by.create_ndb_key()
+        self.modified_by_username   = modified_by_username
+            
+        self.program_settings['referral_program']['referrer_promote_title'] =  promote_title
+        self.program_settings['referral_program']['referrer_promote_desc']  =  promote_desc
+        self.put() 
+        
+    def update_referee_program_promote_text(self, 
+                                             promote_title=None, 
+                                             promote_desc=None, 
+                                             modified_by=None):
+        modified_by_username = None
+        
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+        
+        if is_empty(self.program_settings):
+            self.program_settings = {
+                                    'referral_program':{}
+                                    }
+        else:
+            if is_empty(self.program_settings.get('referral_program')):
+                self.program_settings['referral_program'] = {}
+        
+        self.modified_by            = modified_by.create_ndb_key()
+        self.modified_by_username   = modified_by_username
+            
+        self.program_settings['referral_program']['referee_promote_title'] =  promote_title
+        self.program_settings['referral_program']['referee_promote_desc']  =  promote_desc
+        self.put()       
+        
+    def upload_referrer_program_promote_image(self, image_public_url=None, image_storage_filename=None, modified_by=None):
+        
+        modified_by_username = None
+        
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+        
+        if is_empty(self.program_settings):
+            self.program_settings = {
+                                    'referral_program':{}
+                                    }
+        else:
+            if is_empty(self.program_settings.get('referral_program')):
+                self.program_settings['referral_program'] = {}
+        
+        self.program_settings['referral_program']['referrer_promote_image']             = image_public_url
+        self.program_settings['referral_program']['referrer_promote_image_filename']    = image_storage_filename
+        
+        self.modified_by            = modified_by.create_ndb_key()
+        self.modified_by_username   = modified_by_username
+        
+        self.put()
+        
+    def upload_referee_program_promote_image(self, image_public_url=None, image_storage_filename=None, modified_by=None):
+        
+        modified_by_username = None
+        
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+        
+        if is_empty(self.program_settings):
+            self.program_settings = {
+                                    'referral_program':{}
+                                    }
+        else:
+            if is_empty(self.program_settings.get('referral_program')):
+                self.program_settings['referral_program'] = {}
+        
+        self.program_settings['referral_program']['referee_promote_image']          = image_public_url
+        self.program_settings['referral_program']['referee_promote_image_filename'] = image_storage_filename
+        
+        self.modified_by            = modified_by.create_ndb_key()
+        self.modified_by_username   = modified_by_username
+        
+        self.put()        
     
     @staticmethod
     def update_details(merchant_acct, company_name=None, brand_name=None, business_reg_no=None, contact_name=None, 
@@ -408,6 +572,32 @@ class MerchantAcct(MerchantMin):
             
         self.put()
         
+    def update_published_referral_program(self, program_configuration):
+        if is_empty(self.published_referral_program_configuration):
+            self.published_referral_program_configuration = {
+                                                'programs'  :[program_configuration],
+                                                'count'     : 1,
+                                                } 
+                                            
+        else:
+            self.flush_dirty_program_configuration()
+            existing_programs_list  = self.published_referral_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_referral_program_configuration['programs']    = existing_programs_list
+            self.published_referral_program_configuration['count']       = len(existing_programs_list) 
+            
+        self.put()    
+        
     def add_voucher(self, voucher_configuration):
         if is_empty(self.published_voucher_configuration):
             self.published_voucher_configuration = {
@@ -678,6 +868,42 @@ class MerchantAcct(MerchantMin):
             
         self.put() 
         
+    def remove_program_from_published_referral_program_configuration(self, program_key_to_remove):
+        
+        logger.debug('remove_program_from_published_referral_program_configuration: program_key_to_remove=%s', program_key_to_remove)
+        
+        #self.flush_dirty_program_configuration()
+        existing_programs_list  = self.published_referral_program_configuration['programs']
+        program_count           = len(existing_programs_list)
+        
+        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_referral_program_configuration['programs']    = existing_programs_list
+        self.published_referral_program_configuration['count']       = program_count
+            
+        self.put()     
+        
     
         
     def remove_redeption_catalogue(self, catalogue_key):

{trex-model-1.3.6 → trex-model-1.4.0}/trexmodel/models/datastore/message_model_helper.py

@@ -7,7 +7,7 @@ from trexmodel.program_conf import REWARD_FORMAT_MAP, REWARD_FORMAT_PREPAID
 from trexmodel.models.datastore.message_models import Message
 from trexmodel.conf import MESSAGE_CATEGORY_REWARD, MESSAGE_STATUS_NEW,\
     MESSAGE_CATEGORY_REDEEM
-from trexmodel import program_conf
+from trexconf import program_conf
 from babel.numbers import format_currency
 import logging
 

{trex-model-1.3.6 → trex-model-1.4.0}/trexmodel/models/datastore/message_models.py

@@ -7,13 +7,9 @@ Created on 9 Nov 2023
 from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 from trexmodel.models.datastore.user_models import User
-import trexmodel.conf as model_conf
+from datetime import datetime
 import logging
-from datetime import datetime, timedelta
-from trexlib.utils.common.date_util import parse_datetime
 from trexmodel import conf
-from google.auth._default import default
-from trexmodel.models.datastore.system_models import Tagging
 from trexmodel.conf import MESSAGE_STATUS_SET, MESSAGE_STATUS_NEW, MESSAGE_CATEGORY_SYSTEM,\
     MESSAGE_STATUS_READ, MESSAGE_CATEGORIES, MESSAGE_CATEGORY_ANNOUNCEMENT
 from trexmodel.models.datastore.transaction_models import CustomerTransaction