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

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

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

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

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

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

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

@@ -28,13 +28,14 @@ DATASTORE_CREDENTIAL_PATH                       = os.path.abspath(os.path.dirnam
 
 MERCHANT_STAT_FIGURE_UPDATE_INTERVAL_IN_MINUTES = os.environ.get('MERCHANT_STAT_FIGURE_UPDATE_INTERVAL_IN_MINUTES') or 60
 
-MESSAGE_CATEGORY_ANNOUNCEMENT       = 'announcement'
-MESSAGE_CATEGORY_ALERT              = 'alert'
-MESSAGE_CATEGORY_PROMOTION          = 'promotion'
-MESSAGE_CATEGORY_SURVEY             = 'survey'
-MESSAGE_CATEGORY_SYSTEM             = 'system'
-MESSAGE_CATEGORY_REWARD             = 'reward'
-MESSAGE_CATEGORY_REDEEM             = 'redeem'
+MESSAGE_CATEGORY_ANNOUNCEMENT           = 'announcement'
+MESSAGE_CATEGORY_ALERT                  = 'alert'
+MESSAGE_CATEGORY_PROMOTION              = 'promotion'
+MESSAGE_CATEGORY_SURVEY                 = 'survey'
+MESSAGE_CATEGORY_SYSTEM                 = 'system'
+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)
 

{trex-model-1.4.4 → trex-model-1.4.6}/trexmodel/models/datastore/marketing_models.py

@@ -9,9 +9,11 @@ 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 trexconf import conf
+from trexconf import conf, program_conf
 import trexmodel.conf as model_conf
 import logging
+from _datetime import timedelta
+from trexconf.program_conf import MERCHANT_NEWS_STATUS_PUBLISH
 
 logger = logging.getLogger('model')
 
@@ -271,4 +273,244 @@ class ScheduledPushNotificationHistory(BaseNModel, DictModel):
                     ndb.AND(
                             ScheduledPushNotificationHistory.scheduled_datetime<=scheduled_datetime)).count(limit=conf.MAX_FETCH_RECORD)
             
-    
+class MerchantNewsFile(BaseNModel, DictModel):
+    '''
+    Merchant Account as ancestor
+    '''
+    label                         = ndb.StringProperty(required=True)
+    desc                          = ndb.StringProperty(required=False)
+    news_text                     = ndb.StringProperty(required=False)
+    
+    news_file_type                = ndb.StringProperty(required=False)
+    news_file_public_url          = ndb.StringProperty(required=False)
+    news_file_storage_filename    = ndb.StringProperty(required=False)
+    
+    completed_status                = ndb.StringProperty(required=True, choices=set(program_conf.MERCHANT_NEWS_STATUS))
+    
+    start_date                    = ndb.DateProperty(required=True)
+    end_date                      = ndb.DateProperty(required=True)
+    
+    enabled                       = ndb.BooleanProperty(default=True)
+    
+    is_archived                   = ndb.BooleanProperty(default=False)
+    
+    created_datetime        = ndb.DateTimeProperty(required=True, auto_now_add=True)
+    modified_datetime       = ndb.DateTimeProperty(required=False)
+    published_datetime      = ndb.DateTimeProperty(required=False)
+    archived_datetime       = ndb.DateTimeProperty(required=False)
+    
+    created_by              = ndb.KeyProperty(name="created_by", kind=MerchantUser)
+    created_by_username     = ndb.StringProperty(required=False)
+    
+    modified_by              = ndb.KeyProperty(name="modified_by", kind=MerchantUser)
+    modified_by_username     = ndb.StringProperty(required=False)
+    
+    published_by            = ndb.KeyProperty(name="published_by", kind=MerchantUser)
+    published_by_username   = ndb.StringProperty(required=False)
+    
+    archived_by             = ndb.KeyProperty(name="archived_by", kind=MerchantUser)
+    archived_by_username    = ndb.StringProperty(required=False)
+    
+    
+    dict_properties = ['image_url', 'completed_progress_in_percentage','is_published', 'is_enabled',
+                       'label', 'desc', 'news_text', 'start_date', 'end_date', 'enabled', 'is_archived', 
+                       'completed_status']
+    
+    @property
+    def merchant_acct(self):
+        return MerchantAcct.fetch(self.key.parent().urlsafe())
+    
+    @property
+    def image_url(self):
+        if self.news_file_public_url:
+            return self.news_file_public_url
+        else:
+            return conf.MERCHANT_NEWS_DEFAULT_IMAGE
+    
+    @property
+    def completed_progress_in_percentage(self):
+        
+        return program_conf.merchant_news_completed_progress_percentage(self.completed_status)
+    
+    @property
+    def is_published(self):
+        return self.completed_status == MERCHANT_NEWS_STATUS_PUBLISH
+    
+    @property
+    def is_enabled(self):
+        return self.enabled
+    
+    @staticmethod
+    def list_by_merchant_acct(merchant_acct):
+        result = MerchantNewsFile.query(ndb.AND(MerchantNewsFile.is_archived==False), ancestor=merchant_acct.create_ndb_key()).fetch(limit=conf.MAX_FETCH_RECORD)
+        return result
+    
+    @staticmethod
+    def list_archived_by_merchant_acct(merchant_acct):
+        return MerchantNewsFile.query(ndb.AND(MerchantNewsFile.is_archived==True), ancestor=merchant_acct.create_ndb_key()).fetch(limit=model_conf.MAX_FETCH_RECORD)
+    
+    @staticmethod
+    def create(merchant_acct, label=None, desc=None, news_text=None, 
+               start_date=None, end_date=None, created_by=None):
+        
+        created_by_username = None
+        if is_not_empty(created_by):
+            if isinstance(created_by, MerchantUser):
+                created_by_username = created_by.username
+                
+        news_file = MerchantNewsFile(
+                            parent                  = merchant_acct.create_ndb_key(),
+                            label                   = label,
+                            desc                    = desc,
+                            news_text               = news_text,
+                            start_date              = start_date,
+                            end_date                = end_date,
+                            created_by              = created_by.create_ndb_key(),
+                            created_by_username     = created_by_username,
+                            created_datetime        = datetime.utcnow(),
+                            completed_status        = program_conf.MERCHANT_NEWS_STATUS_BASE,
+                            )
+        
+        news_file.put()
+        
+        return news_file
+    
+    @staticmethod
+    def update(merchant_news, label=None, desc=None, news_text=None, 
+               start_date=None, end_date=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
+                
+        merchant_news.label                 = label
+        merchant_news.desc                  = desc
+        merchant_news.news_text             = news_text
+        merchant_news.start_date            = start_date
+        merchant_news.end_date              = end_date
+        merchant_news.completed_status      = program_conf.MERCHANT_NEWS_STATUS_BASE
+        merchant_news.modified_by           = modified_by
+        merchant_news.modified_by_username  = modified_by_username
+        merchant_news.modified_datetime     = datetime.utcnow()
+        
+        
+        merchant_news.put()
+    
+    @staticmethod
+    def upload_file(merchant_news, uploading_file, merchant_acct, bucket, news_file_type=None):
+        file_prefix                         = random_string(8)
+        news_file_storage_filename          = 'merchant/'+merchant_acct.key_in_str+'/news/'+file_prefix+'-'+uploading_file.filename
+        blob                                = bucket.blob(news_file_storage_filename)
+        
+        logger.debug('news_file_storage_filename=%s', news_file_storage_filename)
+        
+        blob.upload_from_string(
+                uploading_file.read(),
+                content_type=uploading_file.content_type
+            )
+        
+        uploaded_url        = blob.public_url
+        
+        logger.debug('uploaded_url=%s', uploaded_url)
+        logger.debug('news_file_type=%s', news_file_type)
+        
+        if is_not_empty(merchant_news.news_file_storage_filename):
+            old_logo_blob = bucket.get_blob(merchant_news.news_file_storage_filename)
+            if old_logo_blob:
+                old_logo_blob.delete()
+            
+        
+        merchant_news.news_file_public_url          = uploaded_url
+        merchant_news.news_file_storage_filename    = news_file_storage_filename
+        merchant_news.news_file_type                = news_file_type
+        
+        
+        merchant_news.put()
+        
+        return merchant_news
+    
+    @staticmethod
+    def update_news_material_uploaded(merchant_news, modified_by=None):
+        
+        modified_by_username = None
+        
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+        
+        merchant_news.completed_status          = program_conf.MERCHANT_NEWS_STATUS_UPLOAD_MATERIAL
+        merchant_news.modified_by               = modified_by.create_ndb_key()
+        merchant_news.modified_by_username      = modified_by_username
+        merchant_news.modified_datetime         = datetime.utcnow()
+        
+        merchant_news.put()
+        
+        return merchant_news
+    
+    @staticmethod
+    def remove_file(news_file, bucket):
+        
+        old_logo_blob = bucket.get_blob(news_file.news_file_storage_filename) 
+        if old_logo_blob:
+            old_logo_blob.delete()
+            news_file.delete()    
+            
+    def archived(self, archived_by=None):
+        
+        archived_by_username = None
+        if is_not_empty(archived_by):
+            if isinstance(archived_by, MerchantUser):
+                archived_by_username = archived_by.username
+        
+        self.is_archived                = True
+        self.archived_datetime          = datetime.utcnow()
+        self.archived_by                = archived_by.create_ndb_key()
+        self.archived_by_username       = archived_by_username
+        self.put()
+        
+        merchant_acct = self.merchant_acct
+        merchant_acct.remove_merchant_news(self.key_in_str)
+    
+    def to_configuration(self):
+        return {
+                'merchant_news_key'     : self.key_in_str,
+                'image_url'             : self.image_url,
+                'label'                 : self.label,
+                'content'               : self.news_text,
+                'start_datetime'        : self.start_date.strftime('%d-%m-%Y %H:%M:%S'),
+                'end_datetime'          : self.end_date.strftime('%d-%m-%Y %H:%M:%S'),
+                }
+        
+    def publish(self, published_by=None):
+        
+        published_by_username = None
+        if is_not_empty(published_by):
+            if isinstance(published_by, MerchantUser):
+                published_by_username = published_by.username
+        
+        self.completed_status           = program_conf.MERCHANT_NEWS_STATUS_PUBLISH
+        self.published_by               = published_by.create_ndb_key()
+        self.published_by_username      = published_by_username
+        self.published_datetime         = datetime.utcnow()
+        self.put()    
+        
+        merchant_acct = self.merchant_acct
+        merchant_acct.add_merchant_news(self.to_configuration())
+        
+    @staticmethod
+    def disable_news(merchant_news):
+        merchant_news.enabled = False
+        merchant_news.put()
+        
+        merchant_acct = merchant_news.merchant_acct
+        merchant_acct.remove_merchant_news(merchant_news.key_in_str)
+        
+        
+    @staticmethod
+    def enable_news(merchant_news):
+        merchant_news.enabled = True
+        merchant_news.put()
+        
+        merchant_acct = merchant_news.merchant_acct
+        merchant_acct.add_merchant_news(merchant_news.to_configuration())        

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

@@ -69,6 +69,7 @@ class MerchantAcct(MerchantMin):
     published_referral_program_configuration        = ndb.JsonProperty()
     published_voucher_configuration                 = ndb.JsonProperty()
     published_redemption_catalogue_configuration    = ndb.JsonProperty()
+    published_news_configuration                    = ndb.JsonProperty()
     
     membership_configuration                        = ndb.JsonProperty()
     tier_membership_configuration                   = ndb.JsonProperty()
@@ -91,11 +92,11 @@ class MerchantAcct(MerchantMin):
                        '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_voucher_configuration', 'membership_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', 
                        'product_package', 'loyalty_package','account_plan','outlet_count', 'outlet_limit',
-                       'published_redemption_catalogue_configuration',
+                       'published_redemption_catalogue_configuration','logo_public_url'
                        ]
     
     
@@ -636,7 +637,51 @@ class MerchantAcct(MerchantMin):
         self.published_voucher_configuration['vouchers']    = new_vouchers_list
         self.published_voucher_configuration['count']       = len(new_vouchers_list)
             
-        self.put()    
+        self.put()  
+        
+    def add_merchant_news(self, merchant_news_configuration):
+        if is_empty(self.published_news_configuration):
+            self.published_news_configuration = {
+                                                'news'  :[merchant_news_configuration],
+                                                'count'     : 1,
+                                                } 
+                                            
+        else:
+            existing_merchant_news_list  = self.published_news_configuration.get('news')
+            
+            merchant_news_key = merchant_news_configuration.get('merchant_news_key')
+            
+            if len(existing_merchant_news_list)>0:
+                index = 0
+                for v in existing_merchant_news_list:
+                    if v.get('merchant_news_key') == merchant_news_key:
+                        existing_merchant_news_list.pop(index)
+                    
+                    index = index+1
+            
+            existing_merchant_news_list.append(merchant_news_configuration)
+            
+            self.published_news_configuration['news']    = existing_merchant_news_list
+            self.published_news_configuration['count']   = len(existing_merchant_news_list) 
+            
+        self.put() 
+        
+    def remove_merchant_news(self, merchant_news_key):
+        existing_merchant_news_list = self.published_news_configuration['news']
+        
+        latest_news_list = []
+        #now = datetime.now()
+        for merchant_news in existing_merchant_news_list:
+            if merchant_news.get('merchant_news_key') != merchant_news_key:
+                #end_datetime = datetime.strptime('%d-%m-%Y %H:%m:%S', merchant_news.ge('end_datetime'))
+                #if end_datetime >
+                latest_news_list.append(merchant_news)
+            
+        
+        self.published_news_configuration['news']    = latest_news_list
+        self.published_news_configuration['count']   = len(latest_news_list)
+            
+        self.put()        
         
     def update_prepaid_program(self, prepaid_configuration):
         if self.prepaid_configuration is None or len(self.prepaid_configuration)==0:
@@ -1895,74 +1940,4 @@ class BannerFile(BaseNModel, DictModel):
             old_logo_blob.delete()
             banner_file.delete()   
             
-class MerchantNewsFile(BaseNModel, DictModel):
-    '''
-    Merchant Account as ancestor
-    '''
-    label                         = ndb.StringProperty(required=False)
-    desc                          = ndb.StringProperty(required=False)
-    news_text                     = ndb.StringProperty(required=False)
-    
-    news_file_type                = ndb.StringProperty(required=True)
-    news_file_public_url          = ndb.StringProperty(required=True)
-    news_file_storage_filename    = ndb.StringProperty(required=True)
-    start_date                    = ndb.DateProperty(required=True)
-    end_date                      = ndb.DateProperty(required=True)
-    
-    
-    dict_properties = ['news_file_public_url', 'news_file_storage_filename', 'news_file_type', 'label', 'desc', 'news_text', 'start_date', 'end_date']
-    
-    @staticmethod
-    def list_by_merchant_acct(merchant_acct):
-        result = MerchantNewsFile.query(ancestor=merchant_acct.create_ndb_key()).fetch(limit=conf.MAX_FETCH_RECORD)
-        return result
-    
-    @staticmethod
-    def create(merchant_acct, label=None, desc=None, news_text=None):
-        news_file = MerchantNewsFile(
-                            parent      = merchant_acct.create_ndb_key(),
-                            label       = label,
-                            desc        = desc,
-                            news_text   = news_text,
-                            )
-        
-        news_file.put()
-    
-    @staticmethod
-    def upload_file(merchant_news, uploading_file, merchant_acct, bucket, news_file_type=None):
-        file_prefix                         = random_string(8)
-        news_file_storage_filename          = 'merchant/'+merchant_acct.key_in_str+'/news/'+file_prefix+'-'+uploading_file.filename
-        blob                                = bucket.blob(news_file_storage_filename)
-        
-        logger.debug('news_file_storage_filename=%s', news_file_storage_filename)
-        
-        blob.upload_from_string(
-                uploading_file.read(),
-                content_type=uploading_file.content_type
-            )
-        
-        uploaded_url        = blob.public_url
-        
-        logger.debug('uploaded_url=%s', uploaded_url)
-        logger.debug('news_file_type=%s', news_file_type)
-        
-        if is_not_empty(merchant_news.news_file_storage_filename):
-            old_logo_blob = bucket.get_blob(merchant_news.news_file_storage_filename)
-            if old_logo_blob:
-                old_logo_blob.delete()
-            
-        
-        merchant_news.news_file_public_url          = uploaded_url
-        merchant_news.news_file_storage_filename    = news_file_storage_filename
-        merchant_news.news_file_type                = news_file_type
-        
-        
-        merchant_news.put()
-    
-    @staticmethod
-    def remove_file(news_file, bucket):
-        
-        old_logo_blob = bucket.get_blob(news_file.news_file_storage_filename) 
-        if old_logo_blob:
-            old_logo_blob.delete()
-            news_file.delete()                
+             

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

@@ -6,7 +6,7 @@ Created on 9 Nov 2023
 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
+    MESSAGE_CATEGORY_REDEEM, MESSAGE_CATEGORY_REDEMPTION_CATALOGUE
 from trexconf import program_conf
 from babel.numbers import format_currency
 import logging
@@ -140,23 +140,26 @@ message_logo_image_template = '''
 
 
 def create_transaction_message(customer_transaction):
-    user_acct   = customer_transaction.transact_user_acct
-    source_key  = customer_transaction.key_in_str
+    user_acct       = customer_transaction.transact_user_acct
+    source_key      = customer_transaction.key_in_str
+    customer        = customer_transaction.transact_customer_acct
+    merchant_acct   = customer.registered_merchant_acct
     message     = Message.get_by_source_key(source_key)
     
     if message is None:
         message = Message(
+                    parent              = user_acct.create_ndb_key(),
                     message_to          = user_acct.create_ndb_key(),
                     title               = 'Transaction Reward',
                     message_category    = MESSAGE_CATEGORY_REWARD,
                     message_content     = __create_entiled_message_from_customer_transaction(customer_transaction),
                     message_data        = __create_message_data_from_transaction(customer_transaction),
                     status              = MESSAGE_STATUS_NEW,
-                    
+                    message_from        = merchant_acct.brand_name, 
                     )
         message.put()
-        user_acct.new_message_count+=1
-        user_acct.put()
+        #user_acct.new_message_count+=1
+        #user_acct.put()
         
     return message
     
@@ -168,46 +171,50 @@ def create_redemption_message(customer_redemption):
     
     if message is None:
         message = Message(
+                    parent              = user_acct.create_ndb_key(),
                     source_key          = source_key,
                     message_to          = user_acct.create_ndb_key(),
                     title               = 'Redemption',
                     message_category    = MESSAGE_CATEGORY_REDEEM,
                     message_content     = __create_message_from_redeem_transaction(merchant_acct, customer_redemption),
-                    message_data        = __create_message_data_from_transaction(customer_redemption),
+                    message_data        = __create_message_data_from_redemption(customer_redemption),
                     status              = MESSAGE_STATUS_NEW,
-                    
+                    message_from        = merchant_acct.brand_name, 
                     )
         message.put()
-        user_acct.new_message_count+=1
-        user_acct.put()
+        #user_acct.new_message_count+=1
+        #user_acct.put()
             
     return message
+
     
 def create_redeem_catalogue_item_message(customer, entitled_vouchers_summary, redemption_catalogue_transaction):
-    user_acct   = customer.registered_user_acct
-    source_key  = redemption_catalogue_transaction.key_in_str
-    message     = Message.get_by_source_key(source_key)
+    user_acct       = customer.registered_user_acct
+    merchant_acct   = customer.registered_merchant_acct
+    source_key      = redemption_catalogue_transaction.key_in_str
+    message         = Message.get_by_source_key(source_key)
     
     if message is None:
         message = Message(
-                    
+                    parent              = user_acct.create_ndb_key(),
                     message_to          = user_acct.create_ndb_key(),
                     title               = 'Redemption Catalogue Reward',
-                    message_category    = MESSAGE_CATEGORY_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),
                     status              = MESSAGE_STATUS_NEW,
+                    message_from        = merchant_acct.brand_name,    
                     
                     )
         message.put()
-        user_acct.new_message_count+=1
-        user_acct.put()  
+        #user_acct.new_message_count+=1
+        #user_acct.put()  
     
     return message  
 
 def __create_message_data_from_transaction(customer_transaction):
     return {
-            'transaction_key'   : customer_transaction.key_in_str,
+            'reward_transaction_key'   : customer_transaction.key_in_str,
             
             }
     
@@ -215,7 +222,13 @@ def __create_message_data_from_redemption_catalogue(redemption_catalogue_transac
     return {
             'redemption_catalogue_transaction_key'   : redemption_catalogue_transaction.key_in_str,
             
-            }    
+            }
+    
+def __create_message_data_from_redemption(redemption_transaction):
+    return {
+            'redemption_transaction_key'   : redemption_transaction.key_in_str,
+            
+            }        
 
 def __create_entiled_message_from_customer_transaction(customer_transaction):
 

{trex-model-1.4.4 → trex-model-1.4.6}/trexmodel/models/datastore/message_models.py

@@ -13,6 +13,9 @@ from trexmodel import conf
 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
+from trexmodel.models.datastore.redeem_models import RedemptionCatalogueTransaction,\
+    CustomerRedemption
+from trexmodel.models.datastore.customer_models import Customer
 
 
 logger = logging.getLogger('model')
@@ -29,12 +32,16 @@ content_body=[text in html]
 '''
 
 class Message(BaseNModel, DictModel):
+    '''
+    User as ancestor
+    '''
     message_to              = ndb.KeyProperty(name="message_to", kind=User)
     source_key              = ndb.StringProperty(required=False)
     title                   = ndb.StringProperty(required=True)
     message_category        = ndb.StringProperty(required=True, default=MESSAGE_CATEGORY_SYSTEM, choices=MESSAGE_CATEGORIES)
     message_content         = ndb.JsonProperty(required=True, indexed=False)
     message_data            = ndb.JsonProperty(required=True, indexed=False)
+    message_from            = ndb.StringProperty(required=False)
     status                  = ndb.StringProperty(required=True, default=MESSAGE_STATUS_NEW, choices=MESSAGE_STATUS_SET)    
     created_datetime        = ndb.DateTimeProperty(required=True, auto_now_add=True)
     read_datetime           = ndb.DateTimeProperty(required=False)
@@ -51,13 +58,27 @@ class Message(BaseNModel, DictModel):
     
     @property
     def customer_transaction_entity(self):
-        customer_transaction_key = self.message_data.get('transaction_key')
+        customer_transaction_key = self.message_data.get('reward_transaction_key')
         if customer_transaction_key:
-            return  CustomerTransaction.fetch(customer_transaction_key) 
+            return  CustomerTransaction.fetch(customer_transaction_key)
+        
+    @property
+    def customer_redemption_catalogue_entity(self):
+        customer_redemption_key = self.message_data.get('redemption_catalogue_transaction_key')
+        if customer_redemption_key:
+            return  RedemptionCatalogueTransaction.fetch(customer_redemption_key)
+        
+    @property
+    def customer_redemption_entity(self):
+        customer_redemption_key = self.message_data.get('redemption_transaction_key')
+        if customer_redemption_key:
+            return  CustomerRedemption.fetch(customer_redemption_key)
+        
     
     @staticmethod
-    def create(source_key=None, message_to=None, title=None, message_type=MESSAGE_CATEGORY_ANNOUNCEMENT,message_content={}):
+    def create(user_acct, source_key=None, message_to=None, title=None, message_type=MESSAGE_CATEGORY_ANNOUNCEMENT,message_content={}):
         Message(
+            parent          = user_acct.create_ndb_key(),
             source_key      = source_key,
             message_to      = message_to.create_ndb_key(),
             title           = title,
@@ -75,12 +96,13 @@ class Message(BaseNModel, DictModel):
             message.status = MESSAGE_STATUS_READ
             message.read_datetime = datetime.utcnow()
             message.put()
-            
+            '''
             user_acct.new_message_count-=1
             if user_acct.new_message_count<0:
                 user_acct.new_message_count=0
 
             user_acct.put()
+            '''
             
     @staticmethod        
     def update_delete(message_key):
@@ -92,10 +114,22 @@ class Message(BaseNModel, DictModel):
             
     @staticmethod
     def list_paginated_by_user_account(user_acct, limit=conf.MAX_FETCH_RECORD, start_cursor=None):
+        #query = Message.query(ancestor=user_acct.create_ndb_key()).order(-Message.created_datetime)
         query = Message.query(ndb.AND(Message.message_to==user_acct.create_ndb_key())).order(-Message.created_datetime)     
         
         return Message.list_all_with_condition_query(query, limit=limit, start_cursor=start_cursor, return_with_cursor=True, keys_only=False)
     
+    
+    @staticmethod
+    def count_new_message(user_acct):
+        return Message.count_by_status(user_acct, status=conf.MESSAGE_STATUS_NEW)
+    
+    @staticmethod
+    def count_by_status(user_acct, status=conf.MESSAGE_STATUS_NEW):
+        query = Message.query(ndb.AND(Message.status==status), ancestor=user_acct.create_ndb_key()).order(-Message.created_datetime)     
+        
+        return Message.count_with_condition_query(query, limit=conf.MAX_FETCH_RECORD)
+
 
     @staticmethod
     def get_by_source_key(source_key):

{trex-model-1.4.4 → trex-model-1.4.6}/trexmodel/models/datastore/product_models.py

@@ -382,7 +382,7 @@ class Product(ProductBase, FullTextSearchable):
     product_sku                 = ndb.StringProperty(required=True)
     product_name                = ndb.StringProperty(required=True)
     product_desc                = ndb.StringProperty(required=False)
-    category_key                = ndb.StringProperty(required=False)  
+    category_key                = ndb.StringProperty(required=False)
     
     barcode                     = ndb.StringProperty(required=False)   
     
@@ -408,7 +408,8 @@ class Product(ProductBase, FullTextSearchable):
     
     fulltextsearch_field_name   = 'product_name'
     
-    dict_properties = ['product_sku', 'product_name', 'category_key', 'price', 'cost', 'product_desc', 'barcode', 'pos_settings', 'tax_details', 'product_modifier']
+    dict_properties = ['product_sku', 'product_name', 'category_key', 'price', 'cost', 
+                       'product_desc', 'barcode', 'pos_settings', 'tax_details', 'product_modifier']
     
     @property
     def product_default_image(self):
@@ -434,6 +435,7 @@ class Product(ProductBase, FullTextSearchable):
                             'label'                 : self.product_name,
                             'desc'                  : self.product_desc,
                             'price'                 : self.price,
+                            'category_key'          : self.category_key,
                             'barcode'               : self.barcode,   
                             'modifiers'             : modifier_setting_list_for_pos, 
                             'representation_on_pos' : self.pos_settings,
@@ -780,10 +782,9 @@ class ProductCatalogue(ProductBase):
         return total_count
     
     def publish(self):
-        if self.is_publish == False:
-            self.published_menu_settings = self.setting_details_for_pos
-            self.is_publish = True
-            self.put()
+        self.published_menu_settings = self.setting_details_for_pos
+        self.is_publish = True
+        self.put()
     
     def unpublish(self):
         self.is_publish = False

{trex-model-1.4.4 → trex-model-1.4.6}/trexmodel/models/datastore/user_models.py

@@ -6,7 +6,7 @@ Created on 10 Apr 2020
 from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 from trexlib.utils.string_util import random_number, random_string,\
-    is_empty
+    is_empty, is_not_empty
 from flask_login import UserMixin
 import logging  
 from trexlib.utils.security_util import generate_user_id, hash_password
@@ -37,14 +37,14 @@ class UserMin(BaseNModel, DictModel, UserMixin):
 
     locked                      = ndb.BooleanProperty(required=False, default=False)
     lock_expiry_datetime        = ndb.DateTimeProperty(required=False)
-    active                      = ndb.BooleanProperty(required=True, default=True)
+    active                      = ndb.BooleanProperty(required=True, default=True) 
     try_count                   = ndb.IntegerProperty(required=False)
     demo_account                = ndb.BooleanProperty(required=False, default=False)
     deleted                     = ndb.BooleanProperty(required=False, default=False)
+    signin_device_session       = ndb.JsonProperty()
     
     
-    
-    dict_properties             = ['user_id', 'name', 'email', 'gravatar_url', 'active', 'locked', 'lock_expiry_datetime']
+    dict_properties             = ['user_id', 'name', 'email', 'signin_device_session', 'gravatar_url', 'active', 'locked', 'lock_expiry_datetime']
     
     @classmethod
     #@cache.memoize(timeout=60)
@@ -63,6 +63,18 @@ class UserMin(BaseNModel, DictModel, UserMixin):
     def is_admin_user(self):
         return False
     
+    @property
+    def signin_device_id(self):
+        if is_not_empty(self.signin_device_session):
+            return self.signin_device_session.get('device_id')
+    
+    @property
+    def signin_expiry_datetime(self):
+        if is_not_empty(self.signin_device_session):
+            expiry_datetime_str =  self.signin_device_session.get('expiry_datetime')
+            if is_not_empty(expiry_datetime_str):
+                return datetime.strptime(expiry_datetime_str, '%d-%m-%Y %H:%M:%S')
+    
     def is_valid_password(self, checking_password):
         hashed_signin_password = hash_password(self.user_id, checking_password)
         
@@ -266,11 +278,11 @@ class UserBase(UserMin):
         
         if is_email_verified==False:
             created_user.email_vc                               = random_number(6)
-            created_user.email_vc_expiry_datetime               = datetime.now() + timedelta(minutes=10)
+            created_user.email_vc_expiry_datetime               = datetime.utcnow()() + timedelta(minutes=10)
         
         if is_mobile_phone_verified==False:
             created_user.mobile_phone_vc                        = random_number(6)
-            created_user.mobile_phone_vc_expiry_datetime        = datetime.now() + timedelta(minutes=10)
+            created_user.mobile_phone_vc_expiry_datetime        = datetime.utcnow() + timedelta(minutes=10)
         
         created_user.put()
         
@@ -379,7 +391,8 @@ class User(UserBase):
                                     'mobile_phone', 'email', 'password', 'name', 'birth_date', 'gender',
                                     'reference_code', 'country', 'state', 'city', 'postcode', 
                                     'address', 'redeem_pin', 'new_message_count', 'status',
-                                    'device_details',
+                                    'device_details', 'signin_device_session', 'referral_code',
+                                    'last_login_datetime',
                                     ]
 
     #unique_attributes = 'email,username'
@@ -387,7 +400,7 @@ class User(UserBase):
     audit_properties            = [
                                     'mobile_phone', 'email', 'password', 'name', 'birth_date', 'gender',
                                     'reference_code', 'country', 'state', 'city', 'postcode', 
-                                    'address', 'redeem_pin', 'status', 'device_details',
+                                    'address', 'redeem_pin', 'status', 'device_details', 
 
                                     ]
 

{trex-model-1.4.4 → trex-model-1.4.6}/trexmodel/models/datastore/voucher_models.py

@@ -258,10 +258,13 @@ class MerchantVoucher(VoucherBase):
         merchant_voucher.terms_and_conditions   = terms_and_conditions
         merchant_voucher.redeem_limit_type      = redeem_limit_type
         merchant_voucher.redeem_limit_count     = redeem_limit_count
-        merchant_voucher.completed_status       = program_conf.VOUCHER_STATUS_BASE
+        
         merchant_voucher.modified_by            = modified_by.create_ndb_key()
         merchant_voucher.modified_by_username   = modified_by_username
         
+        if merchant_voucher.completed_status!=program_conf.VOUCHER_STATUS_BASE:
+            merchant_voucher.completed_status       = program_conf.VOUCHER_STATUS_PUBLISH
+        
         merchant_voucher.put()
         
         return merchant_voucher

{trex-model-1.4.4 → trex-model-1.4.6}/trexmodel/models/merchant_helpers.py

@@ -36,6 +36,8 @@ def construct_merchant_acct_info(merchant_acct):
     referral_program_settings = merchant_acct.program_settings.get('referral_program', {})
     
     
+    
+    '''
     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',
@@ -51,8 +53,12 @@ def construct_merchant_acct_info(merchant_acct):
             }
         
         ]
-    
+    '''
     merchant_news_list=[]
+    
+    if merchant_acct.published_news_configuration:
+        merchant_news_list = merchant_acct.published_news_configuration['news']
+    
     info =  {
                 'key'                               : merchant_acct.key_in_str,
                 'company_name'                      : merchant_acct.company_name,