trex-model 1.5.24__tar.gz → 1.5.26__tar.gz

{trex-model-1.5.24 → trex-model-1.5.26}/PKG-INFO

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

{trex-model-1.5.24 → trex-model-1.5.26}/setup.py

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

{trex-model-1.5.24 → trex-model-1.5.26}/trex_model.egg-info/PKG-INFO

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

{trex-model-1.5.24 → trex-model-1.5.26}/trexmodel/models/datastore/customer_models.py

@@ -314,7 +314,21 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
                password=None, reference_code=None,
                is_email_verified=False, is_mobile_phone_verified=False):
         
-        created_user = User.create(name=name, email=email, mobile_phone=mobile_phone, 
+        if is_not_empty(email):
+            checking_user = User.get_by_email(email)
+        elif is_not_empty(mobile_phone):
+            checking_user = User.get_by_email(mobile_phone)
+        
+        if checking_user is not None:
+            created_user = checking_user
+            created_user.name           = name
+            created_user.email          = email
+            created_user.mobile_phone   = mobile_phone
+            created_user.gender         = gender
+            created_user.password       = password
+            created_user.birth_date     = birth_date
+        else:
+            created_user = User.create(name=name, email=email, mobile_phone=mobile_phone, 
                                    gender=gender, birth_date=birth_date, 
                                    password=password, reference_code=reference_code,
                                    is_email_verified=is_email_verified, 
@@ -910,11 +924,11 @@ class CustomerMembership(BaseNModel, DictModel):
                     
             
     @staticmethod
-    def create(customer, merchant_membership, entitled_datetime=None, assigned_outlet=None, assigned_by=None):
+    def create(customer, merchant_membership, entitled_datetime=None, assigned_outlet=None, assigned_by=None, number_of_year=None):
         if entitled_datetime is None:
             entitled_datetime = datetime.utcnow()
             
-        expiry_date = merchant_membership.calc_expiry_date(start_date=entitled_datetime)
+        expiry_date = merchant_membership.calc_expiry_date(start_date=entitled_datetime, number_of_year=number_of_year)
         logger.debug('expiry_date=%s', expiry_date)
         merchant_acct = merchant_membership.merchant_acct
         customer_membership = CustomerMembership(

{trex-model-1.5.24 → trex-model-1.5.26}/trexmodel/models/datastore/marketing_models.py

@@ -14,6 +14,7 @@ import trexmodel.conf as model_conf
 import logging
 from _datetime import timedelta
 from trexconf.program_conf import MERCHANT_NEWS_STATUS_PUBLISH
+from trexconf.conf import MERCHANT_NEWS_BASE_URL
 
 logger = logging.getLogger('model')
 
@@ -223,6 +224,22 @@ class MarketingImage(BaseNModel, DictModel):
         
         return image_file
     
+    @staticmethod
+    def create_upload_file(image_label, image_file_storage_filename, public_url, merchant_acct, image_file_type=None):
+        logger.debug('image_file_type=%s', image_file_type)
+        
+        image_file = MarketingImage(
+                            parent                              = merchant_acct.create_ndb_key(),
+                            image_label                         = image_label,
+                            image_file_public_url               = public_url,
+                            image_file_storage_filename         = image_file_storage_filename,
+                            image_file_type                     = image_file_type,
+                            )
+        
+        image_file.put()
+        
+        return image_file
+    
     @staticmethod
     def remove_file(image_file, bucket):
         
@@ -313,7 +330,8 @@ class MerchantNewsFile(BaseNModel, DictModel):
     
     
     dict_properties = ['image_url', 'completed_progress_in_percentage','is_published', 'is_enabled',
-                       'label', 'desc', 'news_text', 'start_date', 'end_date', 'enabled', 'is_archived', 
+                       'label', 'desc', 'news_text', 'start_date', 'end_date', 'enabled', 'is_archived',
+                       'news_public_url', 
                        'completed_status']
     
     @property
@@ -326,6 +344,10 @@ class MerchantNewsFile(BaseNModel, DictModel):
             return self.news_file_public_url
         else:
             return conf.MERCHANT_NEWS_DEFAULT_IMAGE
+        
+    @property
+    def news_public_url(self):
+        return '%s/merchant/marketing/news/%s/show' % (MERCHANT_NEWS_BASE_URL, self.key_in_str)
     
     @property
     def completed_progress_in_percentage(self):
@@ -480,6 +502,7 @@ class MerchantNewsFile(BaseNModel, DictModel):
                 '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'),
+                'news_public_url'       : self.news_public_url,
                 }
         
     def publish(self, published_by=None):

{trex-model-1.5.24 → trex-model-1.5.26}/trexmodel/models/datastore/membership_models.py

@@ -67,29 +67,31 @@ class MembershipBase(BaseNModel, DictModel):
     def list_by_merchant_acct(cls, merchant_acct, is_archived=False):
         return cls.query(ndb.AND(MerchantMembership.archived == is_archived), ancestor=merchant_acct.create_ndb_key()).fetch(limit=model_conf.MAX_FETCH_RECORD)
     
-    def calc_expiry_date(self, start_date=None):
+    def calc_expiry_date(self, start_date=None, number_of_year=None):
         
         if start_date is None:
             start_date = datetime.utcnow()
         
         logger.debug('start_date=%s', start_date)
         logger.debug('self.expiration_type=%s', self.expiration_type)
+        if is_not_empty(number_of_year) and isinstance(number_of_year, int):
+            return start_date + relativedelta(years=number_of_year)
+        else:   
+            if self.expiration_type == program_conf.MEMBERSHIP_EXPIRATION_TYPE_AFTER_YEAR:
+                return start_date + relativedelta(years=self.expiration_value)
+             
+            elif self.expiration_type == program_conf.MEMBERSHIP_EXPIRATION_TYPE_AFTER_MONTH:
+                return start_date + relativedelta(months=self.expiration_value)
             
-        if self.expiration_type == program_conf.MEMBERSHIP_EXPIRATION_TYPE_AFTER_YEAR:
-            return start_date + relativedelta(years=self.expiration_value)
-         
-        elif self.expiration_type == program_conf.MEMBERSHIP_EXPIRATION_TYPE_AFTER_MONTH:
-            return start_date + relativedelta(months=self.expiration_value)
-        
-        elif self.expiration_type == program_conf.MEMBERSHIP_EXPIRATION_TYPE_AFTER_WEEK:
-            return start_date + relativedelta(weeks=self.expiration_value)
-        
-        elif self.expiration_type == program_conf.MEMBERSHIP_EXPIRATION_TYPE_AFTER_DAY:
-            return start_date + relativedelta(days=self.expiration_value)
-        
-        else:
-            #for no expiration
-            return datetime.max
+            elif self.expiration_type == program_conf.MEMBERSHIP_EXPIRATION_TYPE_AFTER_WEEK:
+                return start_date + relativedelta(weeks=self.expiration_value)
+            
+            elif self.expiration_type == program_conf.MEMBERSHIP_EXPIRATION_TYPE_AFTER_DAY:
+                return start_date + relativedelta(days=self.expiration_value)
+            
+            else:
+                #for no expiration
+                return datetime.max
     
     @classmethod
     def upload_membership_card_image(cls, membership, uploading_file, merchant_acct, bucket, modified_by=None):

{trex-model-1.5.24 → trex-model-1.5.26}/trexmodel/models/datastore/merchant_models.py

@@ -1442,7 +1442,7 @@ class Outlet(BusinessEntity, FullTextSearchable):
     
     @property
     def merchant_acct_key(self):
-        return self.key.parent().urlsafe()
+        return self.key.parent().urlsafe().decode('utf-8')
     
     @property
     def outlet_key(self):

{trex-model-1.5.24 → trex-model-1.5.26}/trexmodel/models/datastore/ndb_models.py

@@ -17,7 +17,33 @@ from trexconf import conf as lib_conf
 from trexconf import conf as model_conf
 from google.cloud.datastore.helpers import GeoPoint
  
-logger = logging.getLogger('model') 
+#logger = logging.getLogger('model')
+logger = logging.getLogger('target_debug') 
+
+def clone_entity(entity, parent=None, **extra_args):
+    """
+    Clone an NDB entity and return the clone.
+    
+    Args:
+        entity: The NDB entity to be cloned.
+        extra_args: Additional properties to override in the cloned entity.
+        
+    Returns:
+        A new instance of the entity's class with copied properties.
+    """
+    klass = entity.__class__
+    props = {}
+    
+    for prop_name, prop in klass._properties.items():
+        logger.debug('clone prop_name=%s',  prop_name)
+        if not isinstance(prop, ndb.ComputedProperty):
+            props[prop_name] = getattr(entity, prop_name)
+    
+    props.update(extra_args)
+    if parent:
+        return klass(parent=parent, **props)
+    else:
+        return klass(**props)
 
 def convert_to_serializable_value(val, none_as_empty_string=False, gmt=0, 
                                   datetime_format=lib_conf.DEFAULT_DATETIME_FORMAT, 
@@ -223,6 +249,10 @@ class NDBModel(object):
     def create_ndb_key(self):
         return ndb.Key(flat=self.key.flat())
     
+    def clone(self, parent=None, **overrides):
+        return clone_entity(self, parent=parent, **overrides)
+        
+    
 class BaseNModel(DictModel, NDBModel):
 
     saved = False

{trex-model-1.5.24 → trex-model-1.5.26}/trexmodel/models/datastore/rating_models.py

@@ -10,9 +10,10 @@ from trexmodel.models.datastore.user_models import User
 from trexconf import conf
 from datetime import datetime, timedelta
 import logging
-from trexmodel.models.datastore.transaction_models import SalesTransaction
+from trexmodel.models.datastore.transaction_models import CustomerTransaction
 
-logger = logging.getLogger('model')
+#logger = logging.getLogger('model')
+logger = logging.getLogger('target_debug')
 
 class RatingBase(BaseNModel, DictModel):
     user_acct                           = ndb.KeyProperty(name="user_acct", kind=User)
@@ -95,6 +96,24 @@ class OutletRating(RatingBase):
             
         
         outlet_rating.put()
+        
+    @staticmethod
+    def update(user_acct, outlet, service_rating=.5, ambience_rating=.5, food_rating=.5, value_rating=.5):
+        
+        outlet_rating = OutletRating.get_user_rating_by_outlet(user_acct, outlet)
+        if outlet_rating:
+            outlet_rating.previous_service_rating    = outlet_rating.service_rating
+            outlet_rating.previous_ambience_rating    = outlet_rating.ambience_rating
+            outlet_rating.previous_food_rating       = outlet_rating.food_rating
+            outlet_rating.previous_value_rating      = outlet_rating.value_rating
+            
+            outlet_rating.service_rating    = service_rating
+            outlet_rating.ambience_rating    = ambience_rating
+            outlet_rating.food_rating       = food_rating
+            outlet_rating.value_rating      = value_rating
+                
+            
+            outlet_rating.put()    
     
     @staticmethod
     def __calculate_rating(rating_list):
@@ -146,18 +165,25 @@ class TransactionRating(RatingBase):
     remarks                             = ndb.StringProperty(required=False)
     created_datetime                    = ndb.DateTimeProperty(required=True, auto_now_add=True)
     
-    dict_properties         = ['transaction_id','service_rating', 'ambience_rating', 'food_rating','value_rating',
+    dict_properties         = ['transaction_id','service_rating', 'ambience_rating', 'food_rating','value_rating', 'remarks',
                                ]
     
     @staticmethod
     def create(user_acct, transaction_id, service_rating=.5, ambience_rating=.5, food_rating=.5, value_rating=.5, 
                remarks=None, for_testing=False):
-        sales_transaction = SalesTransaction.get_by_transaction_id(transaction_id)
-        if sales_transaction is not None:
-            outlet         = sales_transaction.transact_outlet_entity
-            merchant_acct  = sales_transaction.transact_merchant_acct
-            
+        customer_transaction = CustomerTransaction.get_by_transaction_id(transaction_id)
+        
+        logger.info('customer_transaction=%s', customer_transaction)
+        logger.info('for_testing=%s', for_testing)
+        
+        if customer_transaction is not None:
+            outlet         = customer_transaction.transact_outlet_entity
+            merchant_acct  = customer_transaction.transact_merchant_acct
+        
             transaction_rating = TransactionRating.get_by_transaction_id(transaction_id)
+            
+            logger.info('transaction_rating=%s', transaction_rating)
+            
             if transaction_rating is None:
                 transaction_rating       = TransactionRating(
                                                 user_acct           = user_acct.create_ndb_key(),

{trex-model-1.5.24 → trex-model-1.5.26}/trexmodel/models/datastore/redeem_models.py

@@ -151,6 +151,11 @@ class CustomerRedemption(BaseNModel, DictModel):
     def redeemed_outlet_details(self):
         if self.redeemed_outlet:
             return Outlet.fetch(self.redeemed_outlet_key)
+        
+    @property
+    def redeemed_outlet_name(self):
+        if self.redeemed_outlet_details:
+            return self.redeemed_outlet_details.name
     
     @property
     def redeemed_customer_key(self):
@@ -246,10 +251,17 @@ class CustomerRedemption(BaseNModel, DictModel):
         return CustomerRedemption.query(ndb.AND(CustomerRedemption.status==status), ancestor=customer.create_ndb_key()).fetch(limit=limit)
     
     @staticmethod
-    def list_customer_redemption(customer_acct, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False):
-        query = CustomerRedemption.query(ancestor = customer_acct.create_ndb_key()).order(-CustomerRedemption.redeemed_datetime)
-        
-        return CustomerRedemption.list_all_with_condition_query(query, offset=offset, limit=limit, start_cursor=start_cursor, return_with_cursor=return_with_cursor)
+    def list_customer_redemption(customer_acct, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False, reverse_order=True, keys_only=False):
+        if keys_only:
+            query = CustomerRedemption.query(ancestor = customer_acct.create_ndb_key())
+            return CustomerRedemption.list_all_with_condition_query(query, offset=offset, limit=limit, keys_only=True)
+        else:
+            if reverse_order:
+                query = CustomerRedemption.query(ancestor = customer_acct.create_ndb_key()).order(-CustomerRedemption.redeemed_datetime)
+            else:
+                query = CustomerRedemption.query(ancestor = customer_acct.create_ndb_key()).order(CustomerRedemption.redeemed_datetime)
+            
+            return CustomerRedemption.list_all_with_condition_query(query, offset=offset, limit=limit, start_cursor=start_cursor, return_with_cursor=return_with_cursor)
     
     @staticmethod
     def list_by_outlet(redeemed_outlet, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False):

{trex-model-1.5.24 → trex-model-1.5.26}/trexmodel/models/datastore/redemption_catalogue_models.py

@@ -12,6 +12,8 @@ from trexmodel.models.datastore.merchant_models import MerchantUser,\
     MerchantAcct
 from trexlib.utils.string_util import is_not_empty, is_empty
 from trexmodel.models.datastore.model_decorators import model_transactional
+from trexconf.program_conf import REDEMPTION_CATALOGUE_STATUS_DEFINED_CATALOGUE,\
+    REDEMPTION_CATALOGUE_STATUS_NEW
 
 logger = logging.getLogger('model')
 
@@ -49,7 +51,7 @@ class RedemptionCatalogue(BaseNModel, DictModel):
                         "redeem_reward_format","catalogue_settings", "image_storage_filename", "image_public_url",
                         "exclusive_tags_list", "exclusive_memberships_list", "exclusive_tier_memberships_list",
                         "completed_progress_in_percentage","completed_status_index", "catalogue_items",
-                        "is_enabled", "is_disabled", "is_archived", "is_published", "loyalty_package",
+                        "is_enabled", "is_disabled", "is_archived", "is_published", "loyalty_package", "is_expired",
                         ]
     
     @property
@@ -64,6 +66,10 @@ class RedemptionCatalogue(BaseNModel, DictModel):
     def is_archived(self):
         return self.archived
     
+    @property
+    def is_expired(self):
+        return self.end_date<datetime.today().date()
+    
     @property
     def is_published(self):
         return self.completed_status == program_conf.PROGRAM_STATUS_PUBLISH
@@ -157,6 +163,25 @@ class RedemptionCatalogue(BaseNModel, DictModel):
         return redemption_catalogue
     
     
+    def clone(self, created_by=None, **overrides):
+        created_datetime = datetime.utcnow();
+        overrides.setdefault('created_datetime', created_datetime)
+        overrides.setdefault('modified_datetime', created_datetime)
+        overrides.setdefault('published_datetime', None)
+        overrides.setdefault('archived_datetime', None)
+        overrides.setdefault('completed_status', REDEMPTION_CATALOGUE_STATUS_NEW)
+        
+        created_by_username = None
+        if is_not_empty(created_by):
+            if isinstance(created_by, MerchantUser):
+                created_by_username = created_by.username
+                
+        overrides.setdefault('created_by', created_by.create_ndb_key())        
+        overrides.setdefault('created_by_username', created_by_username)        
+        
+        new_cloned = super().clone(parent=self.key.parent(), **overrides)
+        return new_cloned
+    
     def remove_redemption_catalogue_item(self, voucher_index, modified_by=None):
         modified_by_username = None
         if is_not_empty(modified_by):

{trex-model-1.5.24 → trex-model-1.5.26}/trexmodel/models/datastore/transaction_models.py

@@ -266,6 +266,13 @@ class CustomerTransaction(SalesTransaction):
         if self.transact_outlet:
             return Outlet.fetch(self.transact_outlet.urlsafe())
     
+    @property
+    def transact_outlet_name(self):
+        outlet = self.transact_outlet_details
+        if outlet:
+            return self.transact_outlet_details.name
+        else:
+            return ''
     
     @property
     def purchased_merchant_membership_key(self):

{trex-model-1.5.24 → trex-model-1.5.26}/trexmodel/models/datastore/voucher_models.py

@@ -385,6 +385,14 @@ class MerchantVoucher(VoucherBase):
                 final_list.append(v)
         return final_list
     
+    @staticmethod
+    def list_latest_by_merchant_account(merchant_acct):
+        vouchers_list = MerchantVoucher.query(ndb.AND(MerchantVoucher.archived==False), ancestor=merchant_acct.create_ndb_key()).fetch(limit=model_conf.MAX_FETCH_RECORD)
+        final_list = []
+        for v in vouchers_list:
+            final_list.append(v)
+        return final_list
+    
     @staticmethod
     def list_archived_by_merchant_account(merchant_acct):
         return MerchantVoucher.query(ndb.AND(MerchantVoucher.archived==True), ancestor=merchant_acct.create_ndb_key()).fetch(limit=model_conf.MAX_FETCH_RECORD)
@@ -393,16 +401,7 @@ class MerchantVoucher(VoucherBase):
     def list_published_by_merchant_account(merchant_acct):
         return MerchantVoucher.query(ndb.AND(MerchantVoucher.completed_status==program_conf.VOUCHER_STATUS_PUBLISH), ancestor=merchant_acct.create_ndb_key()).fetch(limit=model_conf.MAX_FETCH_RECORD)
     
-    @staticmethod
-    def list_latest_by_merchant_account(merchant_acct):
-        published_vouchers_list =  MerchantVoucher.query(ndb.AND(MerchantVoucher.completed_status==program_conf.VOUCHER_STATUS_PUBLISH), ancestor=merchant_acct.create_ndb_key()).fetch(limit=model_conf.MAX_FETCH_RECORD)
-        
-        filtered_out_archived_vouchers_list = []
-        for voucher in published_vouchers_list:
-            if voucher.archived==False:
-                filtered_out_archived_vouchers_list.append(voucher)
-        
-        return filtered_out_archived_vouchers_list
+    
         
 class BrandVouhcer(VoucherBase):
     #merchant_acct           = ndb.KeyProperty(name="merchant_acct", kind=MerchantAcct)

{trex-model-1.5.24 → trex-model-1.5.26}/trexmodel/models/merchant_helpers.py

@@ -45,6 +45,9 @@ def construct_merchant_acct_info(merchant_acct):
     
     if merchant_acct.published_news_configuration:
         merchant_news_list = merchant_acct.published_news_configuration['news']
+        
+        for news in merchant_news_list:
+            logger.debug('news public url=%s', news.get('news_public_url'))
     
     published_redemption_catalogue_configuration = merchant_acct.published_redemption_catalogue_configuration
     catalogues_list = []