trex-model 1.6.8__tar.gz → 1.6.10__tar.gz

{trex_model-1.6.8 → trex_model-1.6.10}/PKG-INFO

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

{trex_model-1.6.8 → trex_model-1.6.10}/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.8',
+     version='1.6.10',
      author="Jack Lok",
      author_email="sglok77@gmail.com",
      description="TRex database module package",

{trex_model-1.6.8 → trex_model-1.6.10}/trex_model.egg-info/PKG-INFO

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

{trex_model-1.6.8 → trex_model-1.6.10}/trexmodel/models/datastore/customer_model_helpers.py

@@ -399,6 +399,32 @@ def update_customer_entiteld_voucher_summary_after_removed_voucher(customer_enti
                 customer_entitled_voucher_summary[merchant_voucher_key]['amount']           = len(new_redeem_info_list)
                 
     return customer_entitled_voucher_summary
+
+def update_customer_entiteld_voucher_summary_after_removed_voucher_by_redeem_code(customer_entitled_voucher_summary, redeem_code):
+    '''
+    removed entitled voucher from customer entitled voucher summary 
+    '''
+    logger.debug('redeem_code=%s', redeem_code)
+    
+    new_customer_entitled_voucher_summary = {}
+    
+    if customer_entitled_voucher_summary:
+        
+        for merchant_voucher_key, voucher_summary in customer_entitled_voucher_summary.items():
+            new_redeem_info_list = []
+            redeem_info_list     = voucher_summary.get('redeem_info_list')
+            for redeem_info in redeem_info_list:
+                if redeem_info.get('redeem_code')!=redeem_code:
+                    new_redeem_info_list.append(redeem_info)
+            
+            new_customer_entitled_voucher_summary[merchant_voucher_key] = {}
+            new_customer_entitled_voucher_summary[merchant_voucher_key]['redeem_info_list'] = new_redeem_info_list
+            new_customer_entitled_voucher_summary[merchant_voucher_key]['count']            = len(new_redeem_info_list)
+            new_customer_entitled_voucher_summary[merchant_voucher_key]['amount']           = len(new_redeem_info_list)
+            
+        
+                
+    return new_customer_entitled_voucher_summary
     
 
 def update_customer_entiteld_voucher_summary_after_reverted_voucher(entitled_voucher_summary, reverted_customer_voucher):

{trex_model-1.6.8 → trex_model-1.6.10}/trexmodel/models/datastore/customer_models.py

@@ -19,7 +19,8 @@ from datetime import datetime, timedelta
 from trexmodel.models.datastore.membership_models import MerchantTierMembership,\
     MerchantMembership
 from trexmodel.models.datastore.customer_model_helpers import update_customer_entiteld_voucher_summary_after_removed_voucher,\
-    update_customer_entiteld_voucher_summary_with_customer_new_voucher
+    update_customer_entiteld_voucher_summary_with_customer_new_voucher,\
+    update_customer_entiteld_voucher_summary_after_removed_voucher_by_redeem_code
     
 
 logger = logging.getLogger('model')
@@ -758,6 +759,10 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
         update_customer_entiteld_voucher_summary_after_removed_voucher(entitled_voucher_summary, removed_voucher)
         self.put()
         
+    def update_after_removed_voucher_by_redeem_code(self, redeem_code):
+        self.entitled_voucher_summary = update_customer_entiteld_voucher_summary_after_removed_voucher_by_redeem_code(self.entitled_voucher_summary, redeem_code)
+        self.put()    
+        
     def update_after_added_voucher(self, added_voucher):
         entitled_voucher_summary = self.entitled_voucher_summary
         update_customer_entiteld_voucher_summary_with_customer_new_voucher(entitled_voucher_summary, added_voucher)

{trex_model-1.6.8 → trex_model-1.6.10}/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.8 → trex_model-1.6.10}/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 = {
@@ -144,6 +171,8 @@ class MerchantAcct(MerchantMin):
                 'currency_code'     : self.currency_code,
                 'country'           : self.country,
                 'account_plan'      : self.account_plan,
+                'gmt_hour'          : self.gmt_hour,
+                'account_plan'      : self.account_plan,
                 }
     
     @property

{trex_model-1.6.8 → trex_model-1.6.10}/trexmodel/models/datastore/ndb_models.py

@@ -139,8 +139,13 @@ class DictObject(object):
     def properties(self):
         return self.__dict__
 
-    def to_dict(self, full=True, show_key=True, dict_properties=None, excluded_dict_properties=None, gmt=lib_conf.DEFAULT_GMT, 
-                        datetime_format=lib_conf.DEFAULT_DATETIME_FORMAT, date_format=lib_conf.DEFAULT_DATE_FORMAT, time_format=lib_conf.DEFAULT_TIME_FORMAT, 
+    def to_dict(self, full=True, show_key=True, dict_properties=None, 
+                        excluded_dict_properties=None, 
+                        #gmt=lib_conf.DEFAULT_GMT,
+                        gmt=0, 
+                        datetime_format=lib_conf.DEFAULT_DATETIME_FORMAT, 
+                        date_format=lib_conf.DEFAULT_DATE_FORMAT, 
+                        time_format=lib_conf.DEFAULT_TIME_FORMAT, 
                         deep_level=99,
                         ):
         logger.info('calling DictObject.to_dict')
@@ -183,7 +188,8 @@ class DictModel(ndb.Model):
     def __str__(self):
         return '%s' % self.to_dict(deep_level=1) 
 
-    def to_dict(self, full=False, show_key=True, dict_properties=None, excluded_dict_properties=None, gmt=lib_conf.DEFAULT_GMT, 
+    def to_dict(self, full=False, show_key=True, dict_properties=None, excluded_dict_properties=None, 
+                        gmt=0, 
                         datetime_format=lib_conf.DEFAULT_DATETIME_FORMAT, 
                         date_format=lib_conf.DEFAULT_DATE_FORMAT,time_format=lib_conf.DEFAULT_TIME_FORMAT,
                         deep_level=99,

{trex_model-1.6.8 → trex_model-1.6.10}/trexmodel/models/datastore/rating_models.py

@@ -12,6 +12,7 @@ from datetime import datetime, timedelta
 import logging
 from trexmodel.models.datastore.transaction_models import CustomerTransaction
 from trexmodel.models.datastore.model_decorators import model_transactional
+from trexlib.utils.common.date_util import convert_date_to_datetime
 
 #logger = logging.getLogger('model')
 logger = logging.getLogger('target_debug')
@@ -34,13 +35,34 @@ class TransactionRating(RatingBase):
     
     created_datetime                    = ndb.DateTimeProperty(required=True, auto_now_add=True)
     
-    dict_properties         = ['transaction_id','rating_result', 'remarks', 'industry', 'score',
+    dict_properties         = ['transaction_id','rating_result', 'remarks', 'industry', 'score', 'created_datetime',
                                ]
     
     @property
     def merchant_acct_entity(self):
         return self.merchant_acct.get()
     
+    @property
+    def user_acct_key(self):
+        return self.user_acct.urlsafe().decode('utf-8')
+    
+    @staticmethod
+    def list_transaction_by_date(enquiry_date, outlet=None,  offset=0, limit=conf.PAGINATION_SIZE, return_with_cursor=False, start_cursor=None):
+        start_datetime  = convert_date_to_datetime(enquiry_date)
+        end_datetime    = start_datetime + timedelta(days=1)
+        query = TransactionRating.query(
+                        ndb.AND(
+                            TransactionRating.outlet==outlet.create_ndb_key(),
+                            TransactionRating.created_datetime>=start_datetime,
+                            TransactionRating.created_datetime<end_datetime,
+                        ))
+        if return_with_cursor:
+            (result, next_cursor) = TransactionRating.list_all_with_condition_query(query, order_by=TransactionRating.created_datetime, start_cursor=start_cursor, return_with_cursor=True, limit=limit)
+        
+            return (result, next_cursor)
+        else:
+            return query.order(TransactionRating.created_datetime).fetch(offset=offset, limit=limit)
+    
     @staticmethod
     @model_transactional(desc="update rating changes")
     def create(user_acct, transaction_id, rating_result={}, 
@@ -321,7 +343,11 @@ class OutletRatingResult(RatingResult):
     outlet                  = ndb.KeyProperty(name="outlet", kind=Outlet)
     
     
-    dict_properties         = ['total_rating_count', 'rating_result', 'previous_rating_result', 'modified_datetime',]
+    dict_properties         = ['total_rating_count', 'rating_result', 'previous_rating_result', 'modified_datetime', 'outlet_key']
+    
+    @property
+    def outlet_key(self):
+        return self.outlet.urlsafe().decode('utf-8')
     
     @staticmethod
     def get_by_outlet(outlet):