trex-model 1.6.7__tar.gz → 1.6.9__tar.gz

{trex_model-1.6.7 → trex_model-1.6.9}/PKG-INFO

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

{trex_model-1.6.7 → trex_model-1.6.9}/setup.py

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

{trex_model-1.6.7 → trex_model-1.6.9}/trex_model.egg-info/PKG-INFO

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

{trex_model-1.6.7 → trex_model-1.6.9}/trexmodel/models/datastore/marketing_models.py

@@ -15,6 +15,7 @@ import logging
 from _datetime import timedelta
 from trexconf.program_conf import MERCHANT_NEWS_STATUS_PUBLISH
 from trexconf.conf import MERCHANT_NEWS_BASE_URL
+from trexlib.utils.common.common_util import sort_list
 
 logger = logging.getLogger('model')
 
@@ -182,17 +183,19 @@ class MarketingImage(BaseNModel, DictModel):
     '''
     Merchant Account as ancestor
     '''
-    image_label                    = ndb.StringProperty(required=True)
-    image_file_type                = ndb.StringProperty(required=True)
-    image_file_public_url          = ndb.StringProperty(required=True)
-    image_file_storage_filename    = ndb.StringProperty(required=True)
+    image_label                     = ndb.StringProperty(required=True)
+    image_file_type                 = ndb.StringProperty(required=True)
+    image_file_public_url           = ndb.StringProperty(required=True)
+    image_file_storage_filename     = ndb.StringProperty(required=True)
+    created_datetime                = ndb.DateTimeProperty(required=False, auto_now=True, default=datetime.min)
     
     dict_properties = ['image_label', 'image_file_public_url', 'image_file_storage_filename', 'image_file_type']
     
     @staticmethod
     def list_by_merchant_acct(merchant_acct):
         result = MarketingImage.query(ancestor=merchant_acct.create_ndb_key()).fetch(limit=conf.MAX_FETCH_RECORD)
-        return result
+        sorted_result = sort_list(result,'created_datetime', reverse_order=True, default_value=datetime.min)
+        return sorted_result
     
     @staticmethod
     def upload_file(uploading_file, image_label, merchant_acct, bucket, image_file_type=None):

{trex_model-1.6.7 → trex_model-1.6.9}/trexmodel/models/datastore/merchant_models.py

@@ -130,6 +130,33 @@ class MerchantAcct(MerchantMin):
             return timezone.utcoffset(now).total_seconds() / 3600
         return conf.DEFAULT_GMT_HOURS
     
+    def upload_logo(self, uploading_file, bucket, logo_file_type=None):
+        file_prefix                         = random_string(8)
+        logo_file_storage_filename          = 'merchant/'+self.key_in_str+'/logo/'+file_prefix+'-'+uploading_file.filename
+        blob                                = bucket.blob(logo_file_storage_filename)
+        
+        logger.debug('logo_file_storage_filename=%s', logo_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('logo_file_type=%s', logo_file_type)
+        
+        if is_not_empty(self.logo_storage_filename):
+            old_logo_blob = bucket.get_blob(self.logo_storage_filename) 
+            if old_logo_blob:
+                old_logo_blob.delete()
+        
+        self.logo_public_url        = uploaded_url
+        self.logo_storage_filename  = logo_file_storage_filename 
+        self.put()
+        deleteFromCache(self.key_in_str)
+    
     def update_setup_progress(self, setup_step):
         if self.setup_progress is None:
             self.setup_progress = {

{trex_model-1.6.7 → trex_model-1.6.9}/trexmodel/models/merchant_helpers.py

@@ -130,7 +130,9 @@ def construct_merchant_acct_info(merchant_acct, referrer_code=None):
         logger.debug('refer_a_friend_url after=%s', refer_a_friend_url)
         
         refer_a_friend_deep_link = conf.REFER_A_FRIEND_DEEP_LINK.format(
-                                    referrer_data = encrypted_referrer_data
+                                    #referrer_data = encrypted_referrer_data
+                                    merchant_acct_code  = merchant_acct.account_code,
+                                    referrer_code       = referrer_code,
                                     )
         
         logger.debug('refer_a_friend_deep_link=%s', refer_a_friend_deep_link)