trex-model 1.5.4__tar.gz → 1.5.6__tar.gz

{trex-model-1.5.4 → trex-model-1.5.6}/PKG-INFO

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

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

{trex-model-1.5.4 → trex-model-1.5.6}/trex_model.egg-info/PKG-INFO

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

{trex-model-1.5.4 → trex-model-1.5.6}/trexmodel/models/datastore/customer_models.py

@@ -277,6 +277,14 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
             ticket.patch_prize_image_base_url()
             Customer.update_ticket_into_lucky_draw_ticket_summary(customer_acct, ticket.to_configuration())
     
+    @staticmethod    
+    def list_by_customer_key_list(customer_keys_list):
+        ndb_keys_list = []
+        for k in customer_keys_list:
+            ndb_keys_list.append(ndb.Key(urlsafe=k))
+        
+        return Customer.fetch_multi(ndb_keys_list)
+    
     @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()
@@ -375,6 +383,29 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
         
         return created_customer
     
+    @classmethod
+    def list_last_active_customer_by_range(cls, merchant_acct,  last_active_date_since, last_active_date_end, 
+                                          offset=0, limit=conf.MAX_FETCH_RECORD, start_cursor=None, return_with_cursor=False):
+        query = cls.query(ndb.AND(
+                            cls.merchant_acct==merchant_acct.create_ndb_key(),
+                            cls.last_transact_datetime>=last_active_date_since,
+                            cls.last_transact_datetime<last_active_date_end,
+                            
+                            )).order(-cls.last_transact_datetime)
+        
+        return cls.list_all_with_condition_query(query, offset=offset, limit=limit, start_cursor=start_cursor, return_with_cursor=return_with_cursor)
+    
+    @classmethod
+    def count_last_active_customer_by_range(cls, merchant_acct,  last_active_date_since, last_active_date_end, limit=conf.MAX_FETCH_RECORD,):
+        query = cls.query(ndb.AND(
+                            cls.merchant_acct==merchant_acct.create_ndb_key(),
+                            cls.last_transact_datetime>=last_active_date_since,
+                            cls.last_transact_datetime<=last_active_date_end,
+                            
+                            ))
+        
+        return cls.count_with_condition_query(query)
+    
     @classmethod
     def list(cls, offset=0, limit=conf.MAX_FETCH_RECORD, start_cursor=None, return_with_cursor=False, keys_only=False):
         query = cls.query()
@@ -787,6 +818,24 @@ class CustomerMembership(BaseNModel, DictModel):
                                         ), ancestor=customer.create_ndb_key()).get()
                                         
     
+    @staticmethod
+    def count_merchant_customer_membership(merchant_acct):
+        if merchant_acct:
+            query = CustomerMembership.query(ndb.AND(CustomerMembership.merchant_acct==merchant_acct.create_ndb_key()))
+        else:
+            query = CustomerMembership.query()
+        
+        return CustomerMembership.count_with_condition_query(query)
+    
+    @staticmethod
+    def list_merchant_customer_membership(merchant_acct, limit=conf.MAX_FETCH_RECORD, start_cursor=None, return_with_cursor=False):
+        if merchant_acct:
+            query = CustomerMembership.query(ndb.AND(CustomerMembership.merchant_acct==merchant_acct.create_ndb_key()))
+        else:
+            query = CustomerMembership.query()
+        
+        return CustomerMembership.list_all_with_condition_query(query, limit=limit, start_cursor=start_cursor, return_with_cursor=return_with_cursor, keys_only=False)
+    
     @staticmethod
     def list_all_by_customer(customer, limit = conf.MAX_FETCH_RECORD, offset=0, keys_only=False):
         return CustomerMembership.query(ancestor=customer.create_ndb_key()).fetch(offset=offset, limit=limit, keys_only=keys_only)

{trex-model-1.5.4 → trex-model-1.5.6}/trexmodel/models/datastore/merchant_models.py

@@ -18,6 +18,7 @@ from trexconf import conf, program_conf
 from trexmodel.models.datastore.system_models import Tagging
 from trexmodel.models.datastore.model_decorators import model_transactional
 from trexmodel.program_conf import LOYALTY_PACKAGE_LITE, LOYALTY_PRODUCT
+import pytz
 
 logger = logging.getLogger('model')
 #logger = logging.getLogger('debug')
@@ -63,6 +64,7 @@ class MerchantAcct(MerchantMin):
     api_key                                 = ndb.StringProperty(required=False)
     
     account_plan                            = ndb.JsonProperty()
+    setup_progress                          = ndb.JsonProperty()
     outlet_count                            = ndb.IntegerProperty(default=0)
     
     published_program_configuration                 = ndb.JsonProperty()
@@ -91,7 +93,7 @@ class MerchantAcct(MerchantMin):
     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', 'effective_referral_program_count',
+                       'timezone', 'effective_referral_program_count', 'gmt_hour',
                        'published_program_configuration', 'published_tier_program_configuration', 'published_referral_program_configuration', 
                        'published_voucher_configuration', 'published_news_configuration', 'membership_configuration', 
                        'tier_membership_configuration', 'prepaid_configuration', 'lucky_draw_configuration', 'product_modifier_configuration',
@@ -101,6 +103,22 @@ class MerchantAcct(MerchantMin):
                        ]
     
     
+    @property
+    def gmt_hour(self):
+        if self.timezone:
+            now             = datetime.utcnow()
+            timezone        = pytz.timezone(self.timezone)
+            #timezone_time   = now.astimezone(self.timezone)
+            return timezone.utcoffset(now).total_seconds() / 3600
+        return conf.DEFAULT_GMT_HOURS
+    
+    def update_setup_progress(self, setup_step):
+        if self.setup_progress is None:
+            self.setup_progress = {
+                }
+        elif self.setup_progress.get(setup_step) is None:
+            self.setup_progress[setup_step] = True
+    
     def to_login_dict(self):
         return {
                 'account_code'      : self.account_code,

{trex-model-1.5.4 → trex-model-1.5.6}/trexmodel/models/datastore/ndb_models.py

@@ -247,6 +247,10 @@ class BaseNModel(DictModel, NDBModel):
     @property
     def key_in_str(self):
         return self.key.urlsafe().decode('utf-8')
+    
+    @property
+    def key_in_urlsafe(self):
+        return self.key.urlsafe()
 
     @property
     def key_name(self):
@@ -278,6 +282,17 @@ class BaseNModel(DictModel, NDBModel):
 
         return None
     
+    @classmethod
+    def fetch_multi(cls, model_keys_list):
+        try:
+            if model_keys_list:
+                return ndb.get_multi(model_keys_list)
+
+        except:
+            logger.error('Failed to fetch entity due to %s', get_tracelog())
+
+        return None
+    
     @classmethod
     def count(cls, limit=model_conf.MAX_FETCH_RECORD): 
         query = cls.query()

{trex-model-1.5.4 → trex-model-1.5.6}/trexmodel/models/datastore/program_models.py

@@ -13,6 +13,7 @@ from trexconf import conf, program_conf
 from datetime import datetime
 from trexmodel.models.datastore.model_decorators import model_transactional
 from trexlib.utils.common.common_util import sort_list, sort_dict_list
+from _datetime import timedelta
     
 
 
@@ -127,6 +128,24 @@ class BaseProgram(BaseNModel, DictModel):
         if self.program_settings and self.program_settings.get('scheme'):
             return self.program_settings.get('scheme').get('is_recurring_scheme')
         return False
+    
+    @property
+    def limit_to_specific_day(self):
+        try:
+            if self.program_settings and self.program_settings.get('scheme'):
+                return self.program_settings.get('scheme').get('limit_to_specific_day')
+        except:
+            pass
+        return False
+    
+    @property
+    def specified_days_list(self):
+        try:
+            if self.program_settings and self.program_settings.get('scheme'):
+                return self.program_settings.get('scheme').get('specified_days_list')
+        except:
+            pass
+        return []
         
     @property
     def giveaway_system_condition(self):
@@ -231,7 +250,6 @@ class BaseProgram(BaseNModel, DictModel):
         
         remove_schedule_program(program)
         
-    
     @classmethod
     @model_transactional(desc="enable program")
     def enable(cls, program, modified_by=None):
@@ -582,7 +600,7 @@ class MerchantProgram(BasicRewardProgram):
                                            'created_datetime', 'modified_datetime',  'enabled','completed_status','is_enabled', 'is_disabled', 'is_review_state', 
                                            'is_published', 'archived', 'is_reward_amount_required', 'completed_progress_in_percentage', 'completed_status_index',
                                            'exclusive_tags_list', 'exclusive_memberships_list', 'exclusive_tier_memberships_list',
-                                           'is_recurring_scheme', 
+                                           'is_recurring_scheme', 'limit_to_specific_day', 'specified_days_list',
                                            'expiration_type', 'expiration_date', 'expiration_value', 'is_expiration_date_type',
                                            'giveaway_reward_when', 'giveaway_reward_advance_in_day',
                                            'giveaway_system_condition', 'giveaway_system_condition_memberships_list', 'giveaway_system_condition_tier_memberships_list',
@@ -630,7 +648,9 @@ class MerchantProgram(BasicRewardProgram):
         program_settings = {
                             'exclusivity'               : exclusivity_configuration,
                             'scheme'                    : {
-                                                            'is_recurring_scheme': True,
+                                                            'is_recurring_scheme'   : True,
+                                                            'limit_to_specific_day' : False,
+                                                            'specified_days_list'   : [],
                                                         }
                             }
         

{trex-model-1.5.4 → trex-model-1.5.6}/trexmodel/models/datastore/redeem_models.py

@@ -365,7 +365,7 @@ class CustomerRedemption(BaseNModel, DictModel):
             redeemed_summary = {
                                     reward_format               : {
                                         
-                                                                    'amount'                    : redeemed_amount,        
+                                                                    'amount'                    : float(redeemed_amount),        
                                                                     'customer_point_rewards'    : redeemed_reward_details_list
                                                                     }
                                     }
@@ -448,7 +448,7 @@ class CustomerRedemption(BaseNModel, DictModel):
             redeemed_summary = {
                                 program_conf.REWARD_FORMAT_PREPAID: {
                                     
-                                                                'amount'                    : redeemed_amount,        
+                                                                'amount'                    : float(redeemed_amount),        
                                                                 'customer_prepaid_rewards'   : redeemed_reward_details_list
                                                                 }
                                 }

{trex-model-1.5.4 → trex-model-1.5.6}/trexmodel/models/datastore/reward_models.py

@@ -653,6 +653,12 @@ class CustomerEntitledTierRewardSummary(BaseNModel, DictModel):
     @staticmethod
     def list_all_by_customer(customer, limit = conf.MAX_FETCH_RECORD, offset=0):
         return CustomerEntitledTierRewardSummary.query(ancestor=customer.create_ndb_key()).fetch(offset=offset, limit=limit)
+    
+    @staticmethod
+    def delete_all_by_customer(customer):
+        result = CustomerEntitledTierRewardSummary.query(ancestor=customer.create_ndb_key()).fetch(limit=conf.MAX_FETCH_RECORD)
+        for r in result:
+            r.delete()
         
     @staticmethod
     def list_tier_reward_summary_by_customer(customer_acct):