trex-model 1.5.16__tar.gz → 1.5.18__tar.gz

{trex-model-1.5.16 → trex-model-1.5.18}/PKG-INFO

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

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

{trex-model-1.5.16 → trex-model-1.5.18}/trex_model.egg-info/PKG-INFO

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

{trex-model-1.5.16 → trex-model-1.5.18}/trexmodel/models/datastore/customer_models.py

@@ -768,7 +768,7 @@ class CustomerMembership(BaseNModel, DictModel):
     renewed_outlet              = ndb.KeyProperty(name="renewed_outlet", kind=Outlet)
     
     dict_properties     =[
-                            'customer', 'merchant_membership_entity', 'entitled_date', 'expiry_date'
+                            'customer', 'merchant_membership_entity', 'entitled_date', 'expiry_date', 'merchant_membership_key'
                             ]
     
     @property
@@ -1001,7 +1001,7 @@ class CustomerTierMembership(BaseNModel, DictModel):
     valid                       = ndb.BooleanProperty(required=True, default=True)
     
     dict_properties     =[
-                            'customer', 'merchant_tier_membership_entity', 'entitled_date', 'expiry_date', 'valid'
+                            'customer', 'merchant_tier_membership_entity', 'entitled_date', 'expiry_date', 'valid', 'merchant_tier_membership_key',
                             ] 
     
     

{trex-model-1.5.16 → trex-model-1.5.18}/trexmodel/models/datastore/lucky_draw_models.py

@@ -569,11 +569,11 @@ class LuckyDrawTicket(BaseNModel, DictModel):
         return LuckyDrawTicket.query(ndb.AND(LuckyDrawTicket.merchant_acct==merchant_acct.create_ndb_key())).count(limit=model_conf.MAX_FETCH_RECORD)
     
     @staticmethod
-    def list_by_merchant_acct_with_cursor(merchant_acct, offset=0, limit=50, start_cursor=None):
+    def list_by_merchant_acct(merchant_acct, offset=0, limit=50, start_cursor=None, return_with_cursor=True):
         query = LuckyDrawTicket.query(ndb.AND(LuckyDrawTicket.merchant_acct==merchant_acct.create_ndb_key(),))
-        (result, next_cursor) = LuckyDrawTicket.list_all_with_condition_query(query, start_cursor=start_cursor, return_with_cursor=True, offset=offset, limit=limit)
+        return LuckyDrawTicket.list_all_with_condition_query(query, start_cursor=start_cursor, return_with_cursor=return_with_cursor, offset=offset, limit=limit)
+        
         
-        return (result, next_cursor)
     
     @staticmethod
     def create_for_customer_from_sales_amount(customer_acct, sales_amount=None, merchant_acct=None, transact_outlet=None):

{trex-model-1.5.16 → trex-model-1.5.18}/trexmodel/models/datastore/merchant_models.py

@@ -1328,8 +1328,14 @@ class MerchantAcct(MerchantMin):
         
     
     @staticmethod
-    def list(offset=0, limit=10):
-        return MerchantAcct.query().order(-MerchantAcct.registered_datetime).fetch(offset=offset, limit=limit)
+    def list(offset=None, start_cursor=None, return_with_cursor=False, limit = model_conf.MAX_FETCH_RECORD):
+        if return_with_cursor:
+            query = MerchantAcct.query()
+            (result, next_cursor) = MerchantAcct.list_all_with_condition_query(query, start_cursor=start_cursor, return_with_cursor=True, limit=limit)
+        
+            return (result, next_cursor)
+        else:
+            return MerchantAcct.query().order(-MerchantAcct.registered_datetime).fetch(offset=offset, limit=limit)
     
     def delete_and_related(self):
         

{trex-model-1.5.16 → trex-model-1.5.18}/trexmodel/models/datastore/prepaid_models.py

@@ -640,4 +640,34 @@ class CustomerPrepaidReward(BaseNModel,DictModel):
     def delete_all_by_customer(customer):
         query = CustomerPrepaidReward.query(ancestor=customer.create_ndb_key())
         CustomerPrepaidReward.delete_multiples(query)
+        
+    @staticmethod
+    def list_by_merchant_acct(merchant_acct, datetime_range_start=None, datetime_range_end=None, offset=0, limit=50, start_cursor=None, return_with_cursor=True):
+        if is_not_empty(datetime_range_start) and is_not_empty(datetime_range_end):
+            query = CustomerPrepaidReward.query(ndb.AND(
+                    CustomerPrepaidReward.merchant_acct==merchant_acct.create_ndb_key(),
+                    CustomerPrepaidReward.topup_datetime>=datetime_range_start,
+                    CustomerPrepaidReward.topup_datetime<datetime_range_end,
+                    ))
+        else:
+            query = CustomerPrepaidReward.query(ndb.AND(
+                    CustomerPrepaidReward.merchant_acct==merchant_acct.create_ndb_key(),
+                    ))
+            
+        return CustomerPrepaidReward.list_all_with_condition_query(query, start_cursor=start_cursor, return_with_cursor=return_with_cursor, offset=offset, limit=limit)
+    
+    @staticmethod
+    def count_by_merchant_acct(merchant_acct, datetime_range_start=None, datetime_range_end=None, limit=conf.MAX_FETCH_RECORD,):
+        if is_not_empty(datetime_range_start) and is_not_empty(datetime_range_end):
+            query = CustomerPrepaidReward.query(ndb.AND(
+                    CustomerPrepaidReward.merchant_acct==merchant_acct.create_ndb_key(),
+                    CustomerPrepaidReward.topup_datetime>=datetime_range_start,
+                    CustomerPrepaidReward.topup_datetime<datetime_range_end,
+                    ))
+        else:
+            query = CustomerPrepaidReward.query(ndb.AND(
+                    CustomerPrepaidReward.merchant_acct==merchant_acct.create_ndb_key(),
+                    ))
+            
+        return CustomerPrepaidReward.count_with_condition_query(query, limit)    
     

{trex-model-1.5.16 → trex-model-1.5.18}/trexmodel/models/datastore/redeem_models.py

@@ -20,6 +20,7 @@ from trexmodel.models.datastore.transaction_models import CustomerTransaction
 from trexmodel.models.datastore.prepaid_models import CustomerPrepaidReward
 from trexmodel.models.datastore.redemption_catalogue_models import RedemptionCatalogue
 from trexmodel.models.datastore import user_models
+from _ast import Is
 
 
 logger = logging.getLogger('debug')
@@ -188,18 +189,47 @@ class CustomerRedemption(BaseNModel, DictModel):
         
     def to_voucher_upstream_info_list(self):
         upstream_info_list = []
-        for merchant_voucher_key, voucher_redeemed_details in  self.redeemed_summary.get(program_conf.REWARD_FORMAT_VOUCHER).get('vouchers').items():
-            upstream_info_list.append(CustomerRedeemedItemUpstream(
-                                        customer_key        = self.redeemed_customer_key,
-                                        merchant_key        = self.redeemed_merchant_acct_key,
-                                        redeemed_outlet_key = self.redeemed_outlet_key,
-                                        transaction_id      = self.transaction_id,
-                                        reward_format       = self.reward_format,
-                                        redeemed_datetime   = self.redeemed_datetime,
-                                        redeemed_amount     = voucher_redeemed_details.get('amount'),
-                                        voucher_key         = merchant_voucher_key,
-                                    ))    
-        return upstream_info_list
+        try:
+            if self.redeemed_summary.get(program_conf.REWARD_FORMAT_VOUCHER) is not None:
+                
+                for merchant_voucher_key, voucher_redeemed_details in  self.redeemed_summary.get(program_conf.REWARD_FORMAT_VOUCHER).get('vouchers').items():
+                    amount = 1
+                    if isinstance(voucher_redeemed_details, int):
+                        amount = voucher_redeemed_details
+                    elif isinstance(voucher_redeemed_details, dict):
+                        amount = voucher_redeemed_details.get('amount')
+                        
+                    
+                    upstream_info_list.append(CustomerRedeemedItemUpstream(
+                                                customer_key        = self.redeemed_customer_key,
+                                                merchant_key        = self.redeemed_merchant_acct_key,
+                                                redeemed_outlet_key = self.redeemed_outlet_key,
+                                                transaction_id      = self.transaction_id,
+                                                reward_format       = self.reward_format,
+                                                redeemed_datetime   = self.redeemed_datetime,
+                                                redeemed_amount     = amount,
+                                                voucher_key         = merchant_voucher_key,
+                                            )) 
+            else:
+                for merchant_voucher_key, amount in  self.redeemed_summary.get('vouchers').items():
+                    upstream_info_list.append(CustomerRedeemedItemUpstream(
+                                                customer_key        = self.redeemed_customer_key,
+                                                merchant_key        = self.redeemed_merchant_acct_key,
+                                                redeemed_outlet_key = self.redeemed_outlet_key,
+                                                transaction_id      = self.transaction_id,
+                                                reward_format       = self.reward_format,
+                                                redeemed_datetime   = self.redeemed_datetime,
+                                                redeemed_amount     = amount,
+                                                voucher_key         = merchant_voucher_key,
+                                            ))
+        
+            return upstream_info_list
+        
+        except:
+            logger.error('failed to process redeem summary where self.redeemed_summary=%s', self.redeemed_summary)
+            raise 
+               
+        
     
     def revert(self, reverted_by, reverted_datetime=None):
         self.status = program_conf.REWARD_STATUS_REVERTED
@@ -244,7 +274,7 @@ class CustomerRedemption(BaseNModel, DictModel):
         return result
     
     @staticmethod
-    def list_by_merchant_acct_with_cursor(merchant_acct, datetime_ranage_start=None, datetime_range_end=None, offset=0, limit=50, start_cursor=None):
+    def list_by_merchant_acct(merchant_acct, datetime_ranage_start=None, datetime_range_end=None, offset=0, limit=50, start_cursor=None, return_with_cursor=True):
         if is_not_empty(datetime_ranage_start) and is_not_empty(datetime_range_end):
             query = CustomerRedemption.query(ndb.AND(
                     CustomerRedemption.merchant_acct==merchant_acct.create_ndb_key(),
@@ -255,9 +285,9 @@ class CustomerRedemption(BaseNModel, DictModel):
             query = CustomerRedemption.query(ndb.AND(
                     CustomerRedemption.merchant_acct==merchant_acct.create_ndb_key(),
                     ))
-        (result, next_cursor) = CustomerRedemption.list_all_with_condition_query(query, start_cursor=start_cursor, return_with_cursor=True, offset=offset, limit=limit)
+        return CustomerRedemption.list_all_with_condition_query(query, start_cursor=start_cursor, return_with_cursor=return_with_cursor, offset=offset, limit=limit)
         
-        return (result, next_cursor)
+        #return (result, next_cursor)
     
     @staticmethod
     def list_merchant_transaction(merchant_acct, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False, reverse_order=True):

{trex-model-1.5.16 → trex-model-1.5.18}/trexmodel/models/datastore/reward_models.py

@@ -151,6 +151,37 @@ class CustomerEntitledReward(RewardEntitlement):
     def delete_all_by_customer(cls, customer):
         query = cls.query(ancestor=customer.create_ndb_key())
         cls.delete_multiples(query)    
+    
+    @staticmethod
+    def count_by_merchant_acct(cls, merchant_acct, datetime_ranage_start=None, datetime_range_end=None):
+        if datetime_ranage_start and datetime_range_end:
+            result = cls.query(ndb.AND(
+                        cls.merchant_acct==merchant_acct.create_ndb_key(),
+                        cls.rewarded_datetime>=datetime_ranage_start,
+                        cls.rewarded_datetime<datetime_range_end,
+                        )).count(limit=conf.MAX_FETCH_RECORD)
+        else:
+            result = cls.query(ndb.AND(
+                        cls.merchant_acct==merchant_acct.create_ndb_key(),
+                        )).count(limit=conf.MAX_FETCH_RECORD)
+    
+        
+        return result
+    
+    @classmethod
+    def list_by_merchant_acct(cls, merchant_acct, datetime_range_start=None, datetime_range_end=None, offset=0, limit=50, start_cursor=None, return_with_cursor=True):
+        if is_not_empty(datetime_range_start) and is_not_empty(datetime_range_end):
+            query = cls.query(ndb.AND(
+                    cls.merchant_acct==merchant_acct.create_ndb_key(),
+                    cls.rewarded_datetime>=datetime_range_start,
+                    cls.rewarded_datetime<datetime_range_end,
+                    ))
+        else:
+            query = cls.query(ndb.AND(
+                    cls.merchant_acct==merchant_acct.create_ndb_key(),
+                    ))
+        return cls.list_all_with_condition_query(query, start_cursor=start_cursor, return_with_cursor=return_with_cursor, offset=offset, limit=limit)
+        
 
 class CustomerCountableReward(CustomerEntitledReward):
     reward_amount               = ndb.FloatProperty(required=True, default=0)
@@ -400,7 +431,7 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
     
         
         return result
-    
+    '''
     @staticmethod
     def list_by_merchant_acct(merchant_acct, datetime_range_start=None, datetime_range_end=None, offset=0, limit=50,):
         if is_not_empty(datetime_range_start) and is_not_empty(datetime_range_end):
@@ -417,7 +448,7 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
         
     
     @staticmethod
-    def list_by_merchant_acct_with_cursor(merchant_acct, datetime_range_start=None, datetime_range_end=None, offset=0, limit=50, start_cursor=None):
+    def list_by_merchant_acct_with_cursor(merchant_acct, datetime_range_start=None, datetime_range_end=None, offset=0, limit=50, start_cursor=None, return_with_cursor=True):
         if is_not_empty(datetime_range_start) and is_not_empty(datetime_range_end):
             query = CustomerEntitledVoucher.query(ndb.AND(
                     CustomerEntitledVoucher.merchant_acct==merchant_acct.create_ndb_key(),
@@ -428,10 +459,10 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
             query = CustomerEntitledVoucher.query(ndb.AND(
                     CustomerEntitledVoucher.merchant_acct==merchant_acct.create_ndb_key(),
                     ))
-        (result, next_cursor) = CustomerEntitledVoucher.list_all_with_condition_query(query, start_cursor=start_cursor, return_with_cursor=True, offset=offset, limit=limit)
+        (result, next_cursor) = CustomerEntitledVoucher.list_all_with_condition_query(query, start_cursor=start_cursor, return_with_cursor=return_with_cursor, offset=offset, limit=limit)
         
         return (result, next_cursor)
-    
+    '''
     @staticmethod
     def count_redeemed_by_merchant_voucher_and_passed_redeemed_datetime(customer, merchant_voucher, passed_redeemed_datetime):