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

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

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

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

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

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

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

@@ -23,7 +23,8 @@ from trexanalytics.bigquery_upstream_data_config import create_merchant_customer
     create_merchant_customer_transaction_upstream_for_merchant,\
     create_merchant_customer_redemption_upstream_for_merchant,\
     create_merchant_customer_prepaid_upstream_for_merchant,\
-    create_merchant_customer_redemption_reverted_upstream_for_merchant
+    create_merchant_customer_redemption_reverted_upstream_for_merchant,\
+    create_revert_entitled_customer_voucher_upstream_for_merchant
 from trexmodel.models.datastore.membership_models import MerchantTierMembership
 from trexmodel.models.datastore.transaction_models import CustomerTransaction,\
     SalesTransaction
@@ -920,6 +921,8 @@ def revert_transaction(transaction_details, reverted_by, reverted_datetime=None,
                     p.reverted_by_username          = reverted_by.username
                     p.put()
                     
+                    create_revert_entitled_customer_voucher_upstream_for_merchant(p)
+                    
                     entitled_voucher_summary = update_customer_entiteld_voucher_summary_after_reverted_voucher(entitled_voucher_summary, p)
                     
                     voucher_key         = p.entitled_voucher_key

{trex-model-1.5.13 → trex-model-1.5.14}/trexmodel/models/datastore/lucky_draw_models.py

@@ -496,6 +496,7 @@ class LuckyDrawTicket(BaseNModel, DictModel):
     merchant_acct           = ndb.KeyProperty(name="merchant_acct", kind=MerchantAcct)
     transact_outlet         = ndb.KeyProperty(name="transact_outlet", kind=Outlet)
     ticket_key              = ndb.StringProperty(required=True)
+    program_key             = ndb.StringProperty(required=False)
     created_datetime        = ndb.DateTimeProperty(required=True, auto_now_add=True)
     used_datetime           = ndb.DateTimeProperty(required=False)
     expiry_date             = ndb.DateProperty(required=True)
@@ -563,6 +564,17 @@ class LuckyDrawTicket(BaseNModel, DictModel):
     def count_entiteld_by_customer_acct_by_date_range(customer_acct, start_datetime=None, end_datetime=None):
         return LuckyDrawTicket.query(ndb.AND(LuckyDrawTicket.created_datetime>=start_datetime, LuckyDrawTicket.created_datetime<end_datetime), ancestor=customer_acct.create_ndb_key()).count(limit=model_conf.MAX_FETCH_RECORD)
     
+    @staticmethod
+    def count_by_merchant_acct(merchant_acct):
+        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):
+        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 (result, next_cursor)
+    
     @staticmethod
     def create_for_customer_from_sales_amount(customer_acct, sales_amount=None, merchant_acct=None, transact_outlet=None):
         number_of_ticket = 0
@@ -665,6 +677,7 @@ class LuckyDrawTicket(BaseNModel, DictModel):
         
         program = LuckyDrawTicket.__get_lucky_draw_program(merchant_acct.lucky_draw_configuration, customer_acct=customer_acct)
         if program:            
+            program_key = program.get('program_key')
             prize_details_list  = program.get('program_settings').get('prize_settings').get('prizes')
             ticket_image_url    = program.get('program_settings').get('ticket_image_url')
             
@@ -688,7 +701,7 @@ class LuckyDrawTicket(BaseNModel, DictModel):
                                 expiry_date         = expiry_date.date(),
                                 ticket_key          = random_string(16),
                                 drawed_details      = drawed_details,
-                                
+                                program_key         = program_key,
                                 #created_by          = created_by.create_ndb_key(),
                                 #created_by_username = created_by_username,
                             )

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

@@ -60,6 +60,10 @@ class RewardEntitlement(BaseNModel, DictModel):
     def is_removed(self):
         return self.status == program_conf.REWARD_STATUS_REMOVED
     
+    @property
+    def is_reverted(self):
+        return self.status == program_conf.REWARD_STATUS_REVERTED
+    
     
     
 class CustomerEntitledReward(RewardEntitlement):
@@ -76,13 +80,24 @@ class CustomerEntitledReward(RewardEntitlement):
     def entitled_customer_key(self):
         return self.key.parent().urlsafe().decode('utf-8')
     
+    @property
+    def entitled_user_key(self):
+        return self.user_acct.urlsafe().decode('utf-8')
+    
+    @property
+    def merchant_acct_key(self):
+        return self.merchant_acct.urlsafe().decode('utf-8')
+    
     @property
     def entitled_customer_acct(self):
         return Customer.fetch(self.key.parent().urlsafe())
     
     @property
     def reward_program_key(self):
-        return self.reward_program.urlsafe().decode('utf-8')
+        if self.reward_program:
+            return self.reward_program.urlsafe().decode('utf-8')
+        else:
+            return ''
     
     @property
     def rewarded_by_merchant_acct_entity(self):
@@ -327,6 +342,12 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
                             'status', 'is_reverted', 'is_used',
                            ]
     
+    @property
+    def redeemed_by_outlet_key(self):
+        return self.redeemed_by_outlet.urlsafe().decode('utf-8')
+    
+    
+    
     @staticmethod
     def list_by_transaction_id(transaction_id):
         return CustomerEntitledVoucher.query(CustomerEntitledVoucher.transaction_id==transaction_id).fetch(limit=conf.MAX_FETCH_RECORD)
@@ -363,6 +384,38 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
         
         return result
     
+    @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 = 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,
+                        )).count(limit=conf.MAX_FETCH_RECORD)
+        else:
+            result = CustomerEntitledVoucher.query(ndb.AND(
+                        CustomerEntitledVoucher.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 = CustomerEntitledVoucher.query(ndb.AND(
+                    CustomerEntitledVoucher.merchant_acct==merchant_acct.create_ndb_key(),
+                    CustomerEntitledVoucher.rewarded_datetime>=datetime_ranage_start,
+                    CustomerEntitledVoucher.rewarded_datetime<datetime_range_end,
+                    ))
+        else:
+            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)
+        
+        return (result, next_cursor)
+    
     @staticmethod
     def count_redeemed_by_merchant_voucher_and_passed_redeemed_datetime(customer, merchant_voucher, passed_redeemed_datetime):