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

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

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

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

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

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

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

@@ -775,9 +775,14 @@ class CustomerMembership(BaseNModel, DictModel):
     def merchant_membership_key(self):
         return self.merchant_membership.urlsafe().decode('utf-8')
     
+    @property
+    def customer_key(self):
+        return self.key.parent().urlsafe().decode('utf-8')
+    
     @property
     def merchant_acct_entity(self):
-        return MerchantAcct.fetch(self.merchant_acct.urlsafe())
+        if self.merchant_acct:
+            return MerchantAcct.fetch(self.merchant_acct.urlsafe())
     
     @property
     def merchant_membership_entity(self):
@@ -855,6 +860,16 @@ class CustomerMembership(BaseNModel, DictModel):
                 valid_memberships_list.append(m)
                 
         
+        return valid_memberships_list
+    
+    @staticmethod
+    def list_by_customer(customer):
+        memberships_list = CustomerMembership.list_all_by_customer(customer)
+        valid_memberships_list = []
+        for m in memberships_list:
+            valid_memberships_list.append(m)
+                
+        
         return valid_memberships_list        
                                     
     @staticmethod

{trex-model-1.5.14 → trex-model-1.5.16}/trexmodel/models/datastore/helper/reward_transaction_helper.py

@@ -24,7 +24,9 @@ from trexanalytics.bigquery_upstream_data_config import create_merchant_customer
     create_merchant_customer_redemption_upstream_for_merchant,\
     create_merchant_customer_prepaid_upstream_for_merchant,\
     create_merchant_customer_redemption_reverted_upstream_for_merchant,\
-    create_revert_entitled_customer_voucher_upstream_for_merchant
+    create_revert_entitled_customer_voucher_upstream_for_merchant,\
+    create_entitled_customer_voucher_upstream_for_merchant,\
+    create_redeemed_customer_voucher_to_upstream_for_merchant
 from trexmodel.models.datastore.membership_models import MerchantTierMembership
 from trexmodel.models.datastore.transaction_models import CustomerTransaction,\
     SalesTransaction
@@ -695,6 +697,12 @@ def redeem_reward_transaction(customer, redeem_outlet=None, reward_format=None,
             if customer_redemption:
                 create_redemption_message(customer_redemption)
                 create_merchant_customer_redemption_upstream_for_merchant(customer_redemption, streamed_datetime=redeemed_datetime)
+                if reward_format == program_conf.REWARD_FORMAT_VOUCHER:
+                    for voucher_key in redeemed_voucher_keys_list:
+                        customer_voucher        = CustomerEntitledVoucher.fetch(voucher_key)
+                        if customer_voucher:
+                            create_redeemed_customer_voucher_to_upstream_for_merchant(customer_voucher)
+                    
             
             return customer_redemption
             

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

@@ -227,6 +227,38 @@ class CustomerRedemption(BaseNModel, DictModel):
         
         return CustomerRedemption.list_all_with_condition_query(query, offset=offset, limit=limit, start_cursor=start_cursor, return_with_cursor=return_with_cursor)
     
+    @staticmethod
+    def count_by_merchant_acct(merchant_acct, datetime_ranage_start=None, datetime_range_end=None):
+        if datetime_ranage_start and datetime_range_end:
+            result = CustomerRedemption.query(ndb.AND(
+                        CustomerRedemption.merchant_acct==merchant_acct.create_ndb_key(),
+                        CustomerRedemption.redeemed_datetime>=datetime_ranage_start,
+                        CustomerRedemption.redeemed_datetime<datetime_range_end,
+                        )).count(limit=conf.MAX_FETCH_RECORD)
+        else:
+            result = CustomerRedemption.query(ndb.AND(
+                        CustomerRedemption.merchant_acct==merchant_acct.create_ndb_key(),
+                        )).count(limit=conf.MAX_FETCH_RECORD)
+    
+        
+        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):
+        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(),
+                    CustomerRedemption.redeemed_datetime>=datetime_ranage_start,
+                    CustomerRedemption.redeemed_datetime<datetime_range_end,
+                    ))
+        else:
+            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 (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):
         if reverse_order:
@@ -507,7 +539,11 @@ class CustomerRedemption(BaseNModel, DictModel):
                                                                                 }
                 
                 
-                customer_entitled_voucher.redeem(redeemed_by, redeemed_datetime=redeemed_datetime)
+                customer_entitled_voucher.redeem(redeemed_by, 
+                                                 redeemed_datetime=redeemed_datetime, 
+                                                 redeemed_outlet=redeemed_outlet,
+                                                 transaction_id=transaction_id,
+                                                 )
                 
                 transaction_id_list.append(customer_entitled_voucher.transaction_id)
                 

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

@@ -344,7 +344,8 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
     
     @property
     def redeemed_by_outlet_key(self):
-        return self.redeemed_by_outlet.urlsafe().decode('utf-8')
+        if self.redeemed_by_outlet:
+            return self.redeemed_by_outlet.urlsafe().decode('utf-8')
     
     
     
@@ -390,7 +391,7 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
             result = CustomerEntitledVoucher.query(ndb.AND(
                         CustomerEntitledVoucher.merchant_acct==merchant_acct.create_ndb_key(),
                         CustomerEntitledVoucher.rewarded_datetime>=datetime_ranage_start,
-                        CustomerEntitledVoucher.datetime_range_end<datetime_range_end,
+                        CustomerEntitledVoucher.rewarded_datetime<datetime_range_end,
                         )).count(limit=conf.MAX_FETCH_RECORD)
         else:
             result = CustomerEntitledVoucher.query(ndb.AND(
@@ -401,11 +402,26 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
         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):
-        if is_not_empty(datetime_ranage_start) and is_not_empty(datetime_range_end):
+    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):
             query = CustomerEntitledVoucher.query(ndb.AND(
                     CustomerEntitledVoucher.merchant_acct==merchant_acct.create_ndb_key(),
-                    CustomerEntitledVoucher.rewarded_datetime>=datetime_ranage_start,
+                    CustomerEntitledVoucher.rewarded_datetime>=datetime_range_start,
+                    CustomerEntitledVoucher.rewarded_datetime<datetime_range_end,
+                    ))
+        else:
+            query = CustomerEntitledVoucher.query(ndb.AND(
+                    CustomerEntitledVoucher.merchant_acct==merchant_acct.create_ndb_key(),
+                    ))
+        return CustomerEntitledVoucher.list_all_with_condition_query(query, offset=offset, limit=limit)
+        
+    
+    @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):
+        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(),
+                    CustomerEntitledVoucher.rewarded_datetime>=datetime_range_start,
                     CustomerEntitledVoucher.rewarded_datetime<datetime_range_end,
                     ))
         else:
@@ -437,7 +453,7 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
         self.put()
         
     
-    def redeem(self, redeemed_by=None, redeemed_datetime=None):
+    def redeem(self, redeemed_by=None, redeemed_datetime=None, redeemed_outlet=None, transaction_id=None):
         self.status = program_conf.REWARD_STATUS_REDEEMED   
         
         if redeemed_datetime is None:
@@ -447,9 +463,11 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
         if redeemed_by:
             redeemed_by_username = redeemed_by.username
         
-        self.redeemed_datetime      = redeemed_datetime
-        self.redeemed_by            = redeemed_by.create_ndb_key()
-        self.redeemed_by_username   = redeemed_by_username
+        self.redeemed_datetime          = redeemed_datetime
+        self.redeemed_by                = redeemed_by.create_ndb_key()
+        self.redeemed_by_username       = redeemed_by_username
+        self.redeemed_outlet            = redeemed_outlet.create_ndb_key()
+        self.redeemed_transaction_id    = transaction_id
         self.put()
     
     def remove(self, removed_by=None, removed_datetime=None):
@@ -542,7 +560,9 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
     def create(merchant_voucher, customer_acct, transact_outlet=None, 
                effective_date=None, expiry_date=None,
                transaction_id=None, invoice_id=None,
-               rewarded_by=None, rewarded_datetime=None):
+               rewarded_by=None, rewarded_datetime=None,
+               program_key=None
+               ):
         
         redeem_code = random_string(program_conf.REDEEM_CODE_LENGTH, is_human_mistake_safe=True)
         
@@ -569,6 +589,7 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
                                             rewarded_datetime       = rewarded_datetime,
                                             
                                             user_acct               = customer_acct.registered_user_acct.create_ndb_key(),
+                                            reward_program          = string_to_key_property(program_key),
                                             )
         
         customer_entiteld_voucher.put()

{trex-model-1.5.14 → trex-model-1.5.16}/trexmodel/models/datastore/voucher_models.py

@@ -363,7 +363,14 @@ class MerchantVoucher(VoucherBase):
         
         merchant_acct = voucher.merchant_acct
         merchant_acct.add_voucher(voucher.to_voucher_configuration())     
-            
+    
+    @staticmethod    
+    def list_by_voucher_key_list(voucher_key_list):
+        ndb_keys_list = []
+        for k in voucher_key_list:
+            ndb_keys_list.append(ndb.Key(urlsafe=k))
+        
+        return MerchantVoucher.fetch_multi(ndb_keys_list)        
     
     @staticmethod
     def list_all_by_merchant_account(merchant_acct):