trex-model 1.6.4__tar.gz → 1.6.6__tar.gz

{trex_model-1.6.4 → trex_model-1.6.6}/PKG-INFO

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

{trex_model-1.6.4 → trex_model-1.6.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.6.4',
+     version='1.6.6',
      author="Jack Lok",
      author_email="sglok77@gmail.com",
      description="TRex database module package",

{trex_model-1.6.4 → trex_model-1.6.6}/trex_model.egg-info/PKG-INFO

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

{trex_model-1.6.4 → trex_model-1.6.6}/trex_model.egg-info/SOURCES.txt

@@ -57,6 +57,7 @@ trexmodel/models/datastore/voucher_models.py
 trexmodel/models/datastore/helper/__init__.py
 trexmodel/models/datastore/helper/reward_model_helpers.py
 trexmodel/models/datastore/helper/reward_transaction_helper.py
+trexmodel/models/datastore/helper/sales_transaction_helpers.py
 trexmodel/utils/__init__.py
 trexmodel/utils/gcloud/__init__.py
 trexmodel/utils/gcloud/datastore_util.py

{trex_model-1.6.4 → trex_model-1.6.6}/trexmodel/models/datastore/customer_models.py

@@ -87,6 +87,10 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
                            
                            ]
     
+    @property
+    def customer_key(self):
+        return self.key_in_str
+    
     @property
     def is_any_entitled_voucher_active(self):
         

{trex_model-1.6.4 → trex_model-1.6.6}/trexmodel/models/datastore/helper/reward_transaction_helper.py

@@ -19,14 +19,14 @@ from trexmodel.models.datastore.customer_model_helpers import update_customer_en
     update_customer_entiteld_voucher_summary_with_customer_new_voucher,\
     update_prepaid_summary_with_reverted_prepaid,\
     update_reward_summary_with_reverted_reward
-from trexanalytics.bigquery_upstream_data_config import create_merchant_customer_reward_reverted_upstream_for_merchant,\
-    create_merchant_customer_transaction_upstream_for_merchant,\
+from trexanalytics.bigquery_upstream_data_config import 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_revert_entitled_customer_voucher_upstream_for_merchant,\
     create_redeemed_customer_voucher_to_upstream_for_merchant,\
-    create_merchant_sales_transaction_upstream_for_merchant
+    create_merchant_sales_transaction_upstream_for_merchant,\
+    create_merchant_customer_reward_upstream_for_merchant
 from trexmodel.models.datastore.membership_models import MerchantTierMembership
 from trexmodel.models.datastore.transaction_models import CustomerTransaction,\
     SalesTransaction
@@ -152,11 +152,10 @@ def create_sales_transaction(transact_outlet=None, sales_amount=.0, tax_amount=.
                                        transact_by          = transact_by,
                                        
                                        transact_datetime    = transact_datetime,
-                                       promotion_code       = promotion_code,
                                        
                                        )
             
-        create_merchant_sales_transaction_upstream_for_merchant(sales_transaction, streamed_datetime=transact_datetime)
+        create_merchant_sales_transaction_upstream_for_merchant(sales_transaction,)
         
         return sales_transaction
         
@@ -772,7 +771,7 @@ def prepaid_payment_transaction(customer, redeem_outlet=None, reward_format=None
             
             if customer_redemption:
                 create_payment_message(customer_redemption)
-                create_merchant_customer_redemption_upstream_for_merchant(customer_redemption, streamed_datetime=redeemed_datetime)
+                create_merchant_customer_redemption_upstream_for_merchant(customer_redemption, )
             
             return customer_redemption
             
@@ -832,7 +831,8 @@ def revert_transaction(transaction_details, reverted_by, reverted_datetime=None,
     merchant_acct                       = transaction_details.transact_merchant_acct
     transaction_id                      = transaction_details.transaction_id
     customer_acct                       = transaction_details.transact_customer_acct
-        
+    is_from_instant_transaction         = transaction_details.is_from_instant_transaction
+    
     if transaction_details.is_membership_purchase:
         #remove membership
         
@@ -942,18 +942,12 @@ def revert_transaction(transaction_details, reverted_by, reverted_datetime=None,
             
             create_merchant_customer_transaction_upstream_for_merchant(transaction_details, Reverted=True)
             
-            if transaction_details.is_sales_transaction:
+            if transaction_details.is_from_instant_transaction:
                 sales_transaction = SalesTransaction.get_by_transaction_id(transaction_id)
                 
                 if sales_transaction:
-                    sales_transaction.is_revert                  = True
-                    sales_transaction.reverted_datetime          = reverted_datetime
-                    sales_transaction.reverted_by                = reverted_by_key
-                    sales_transaction.reverted_by_username       = reverted_by.username
+                    sales_transaction.used                  = False
                     sales_transaction.put()
-                    
-                    create_merchant_sales_transaction_upstream_for_merchant(sales_transaction, Reverted=True)
-                
             
             if is_stamp_entitled_in_transaction or is_point_entitled_in_transaction or is_voucher_entitled_in_transaction or is_prepaid_entitled_in_transaction:
                 for p in reverting_point_details_list:
@@ -966,7 +960,7 @@ def revert_transaction(transaction_details, reverted_by, reverted_datetime=None,
                         
                         customer_reward_summary = update_reward_summary_with_reverted_reward(customer_reward_summary, p.to_reward_summary())
                         if create_upstream:
-                            create_merchant_customer_reward_reverted_upstream_for_merchant(transaction_details, p, reverted_datetime)
+                            create_merchant_customer_reward_upstream_for_merchant(transaction_details, p, Reverted=True)
                         
                     
                 for p in reverting_stamp_details_list:
@@ -979,7 +973,7 @@ def revert_transaction(transaction_details, reverted_by, reverted_datetime=None,
                         
                         customer_reward_summary = update_reward_summary_with_reverted_reward(customer_reward_summary, p.to_reward_summary())
                         if create_upstream:
-                            create_merchant_customer_reward_reverted_upstream_for_merchant(transaction_details, p, reverted_datetime)
+                            create_merchant_customer_reward_upstream_for_merchant(transaction_details, p, Reverted=True)
                     
                 for p in reverting_vouchers_list:
                     if p.is_valid:
@@ -999,7 +993,7 @@ def revert_transaction(transaction_details, reverted_by, reverted_datetime=None,
                         
                         voucher_reward_brief = VoucherRewardDetailsForUpstreamData(voucher_key, 1, expiry_date, rewarded_datetime)
                         if create_upstream:
-                            create_merchant_customer_reward_reverted_upstream_for_merchant(transaction_details, voucher_reward_brief, reverted_datetime)
+                            create_merchant_customer_reward_upstream_for_merchant(transaction_details, voucher_reward_brief, Reverted=True)
                 
                 for p in reverting_prepaid_list:
                     if p.is_valid:
@@ -1011,8 +1005,7 @@ def revert_transaction(transaction_details, reverted_by, reverted_datetime=None,
                         
                         customer_prepaid_summary = update_prepaid_summary_with_reverted_prepaid(customer_prepaid_summary, p.to_prepaid_summary())
                         if create_upstream:
-                            #create_merchant_customer_prepaid_reverted_upstream_for_merchant(transaction_details, p, reverted_datetime)
-                            create_merchant_customer_reward_reverted_upstream_for_merchant(transaction_details, p, reverted_datetime)
+                            create_merchant_customer_prepaid_upstream_for_merchant(transaction_details, p, Reverted=True)
                 
                 
             
@@ -1198,8 +1191,8 @@ def create_topup_prepaid_transaction(customer, prepaid_program, topup_outlet=Non
             update_customer_kpi_summary_and_transact_summary(customer, customer_transaction)
             
             create_transaction_message(customer_transaction)
-            create_merchant_customer_prepaid_upstream_for_merchant(customer_transaction, prepaid_topup_reward, streamed_datetime=transact_datetime)
-            create_merchant_customer_transaction_upstream_for_merchant(customer_transaction, streamed_datetime=transact_datetime)
+            create_merchant_customer_prepaid_upstream_for_merchant(customer_transaction, prepaid_topup_reward, )
+            create_merchant_customer_transaction_upstream_for_merchant(customer_transaction, )
         
         return (customer_transaction, prepaid_summary)
         

trex_model-1.6.6/trexmodel/models/datastore/helper/sales_transaction_helpers.py

@@ -0,0 +1,33 @@
+'''
+Created on 23 Jun 2025
+
+@author: jacklok
+'''
+import logging
+from datetime import datetime
+from trexanalytics.bigquery_upstream_data_config import create_merchant_sales_transaction_upstream_for_merchant
+
+#logger = logging.getLogger('helper')
+logger = logging.getLogger('target_debug')
+
+def revert_sales_transaction(transaction_details, reverted_by, reverted_datetime=None):
+    
+    if transaction_details.is_revert==False and transaction_details.allow_to_revert and transaction_details.used==False:
+        logger.info('going to check for sales transaction revert')
+        
+        if reverted_datetime is None:
+            reverted_datetime = datetime.utcnow()
+        
+        if reverted_by:
+            transaction_details.reverted_by                = reverted_by.create_ndb_key()
+            transaction_details.reverted_by_username       = reverted_by.username
+        
+        transaction_details.reverted_datetime   = reverted_datetime
+        transaction_details.is_revert = True
+        transaction_details.put()
+        
+        create_merchant_sales_transaction_upstream_for_merchant(transaction_details, Reverted=True)
+        
+    else:
+        logger.error('Sales transaction is either reverted or not allow to revert or it has been claimed by customer')
+        raise Exception('Sales transaction is either reverted or not allow to revert or it has been claimed by customer')

{trex_model-1.6.4 → trex_model-1.6.6}/trexmodel/models/datastore/transaction_models.py

@@ -185,29 +185,45 @@ class SalesTransaction(BaseNModel, DictModel):
         
         return customer_transaction
     
-    @staticmethod
-    def list_merchant_transaction(transact_merchant, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False, reverse_order=True):
+    @classmethod
+    def list_outlet_transaction(cls, transact_outlet, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False, reverse_order=True):
         if reverse_order:
-            query = SalesTransaction.query(ndb.AND(SalesTransaction.transact_merchant==transact_merchant.create_ndb_key()))
+            query = cls.query(ndb.AND(cls.transact_outlet==transact_outlet.create_ndb_key())).order(-cls.transact_datetime)
         else:
-            query = SalesTransaction.query(ndb.AND(SalesTransaction.transact_merchant==transact_merchant.create_ndb_key()))
+            query = cls.query(ndb.AND(cls.transact_outlet==transact_outlet.create_ndb_key())).order(cls.transact_datetime)
         
-        return SalesTransaction.list_all_with_condition_query(query, offset=offset, limit=limit, start_cursor=start_cursor, return_with_cursor=return_with_cursor)
+        return cls.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(transact_merchant, limit=conf.MAX_FETCH_RECORD):
-        query = SalesTransaction.query(ndb.AND(SalesTransaction.transact_merchant==transact_merchant.create_ndb_key()))
+    @classmethod
+    def count_outlet_transaction(cls, transact_outlet, limit=conf.MAX_FETCH_RECORD):
+        query = cls.query(ndb.AND(cls.transact_outlet==transact_outlet.create_ndb_key()))
         
-        return SalesTransaction.count_with_condition_query(query, limit)
+        return   cls.count_with_condition_query(query, limit=limit)
     
-    @staticmethod
-    def list(offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False, reverse_order=True):
+    
+    @classmethod
+    def list_merchant_transaction(cls, transact_merchant, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False, reverse_order=True):
+        if reverse_order:
+            query = cls.query(ndb.AND(cls.transact_merchant==transact_merchant.create_ndb_key()))
+        else:
+            query = cls.query(ndb.AND(cls.transact_merchant==transact_merchant.create_ndb_key()))
+        
+        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_by_merchant(cls, transact_merchant, limit=conf.MAX_FETCH_RECORD):
+        query = cls.query(ndb.AND(cls.transact_merchant==transact_merchant.create_ndb_key()))
+        
+        return cls.count_with_condition_query(query, limit)
+    
+    @classmethod
+    def list(cls, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False, reverse_order=True):
         if reverse_order:
-            query = SalesTransaction.query().order(-SalesTransaction.transact_datetime)
+            query = cls.query().order(-cls.transact_datetime)
         else:
-            query = SalesTransaction.query().order(SalesTransaction.transact_datetime)
+            query = cls.query().order(cls.transact_datetime)
         
-        return SalesTransaction.list_all_with_condition_query(query, offset=offset, limit=limit, start_cursor=start_cursor, return_with_cursor=return_with_cursor)
+        return cls.list_all_with_condition_query(query, offset=offset, limit=limit, start_cursor=start_cursor, return_with_cursor=return_with_cursor)
     
     @classmethod
     def list_transaction_by_date(cls, transact_date, transact_outlet=None, including_reverted_transaction=True, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False):
@@ -332,7 +348,7 @@ class CustomerTransaction(SalesTransaction):
                                'transact_datetime', 'created_datetime',  'transact_outlet_key', 'is_revert', 'reverted_datetime', 'reverted_by_username',
                                'transact_by', 'transact_by_username', 'is_reward_redeemed', 'is_sales_transaction', 'allow_to_revert',
                                'is_membership_purchase', 'purchased_merchant_membership_key', 'is_tier_membership_upgraded', 'upgraded_merchant_tier_membership_key',
-                               'is_rating_review_enabled', 'promotion_code', 'is_partner_transaction',
+                               'is_rating_review_enabled', 'promotion_code', 'is_partner_transaction', 'is_from_instant_transaction',
                                ]
     
     def to_transaction_details_json(self):
@@ -511,9 +527,9 @@ class CustomerTransaction(SalesTransaction):
                                                         
                                                         transact_datetime               = sales_transaction.transact_datetime,
                                                         is_from_instant_transaction     = True,
-                                                        is_rating_review_enabled        = is_rating_review_enabled
+                                                        is_rating_review_enabled        = is_rating_review_enabled,
                                                         #is_sales_transaction            = True,
-                                                        #allow_to_revert                 = True,
+                                                        allow_to_revert                 = False,
                                                         #is_membership_purchase          = False,
                                                         #is_membership_renew             = False,
                                                         #purchased_merchant_membership   = False,
@@ -589,105 +605,7 @@ class CustomerTransaction(SalesTransaction):
         #customer.put()
         
         return customer_transaction
-    '''
-    def revert(self, customer_acct, reverted_by):
-        transaction_id = self.transaction_id
-        
-        entitled_point_details_list     = CustomerPointReward.list_by_transaction_id(transaction_id)
-        
-        entitled_stamp_details_list     = CustomerStampReward.list_by_transaction_id(transaction_id)
-        
-        entiteld_vouchers_list          = CustomerEntitledVoucher.list_by_transaction_id(transaction_id)
-        
-        entitled_prepaid_list           = CustomerPrepaidReward.list_by_transaction_id(transaction_id)
-        
-        is_transaction_reward_used      = False
-        
-        customer_reward_summary     = customer_acct.reward_summary or {}
-        entitled_voucher_summary    = customer_acct.entitled_voucher_summary or {}
-        
-        logger.debug('revert: transaction_id=%s', transaction_id)
-        logger.debug('revert: entitled_point_details_list count=%s', len(entitled_point_details_list))
-        logger.debug('revert: entitled_stamp_details_list count=%s', len(entitled_stamp_details_list))
-        logger.debug('revert: entiteld_vouchers_list count=%s', len(entiteld_vouchers_list))
-        
-        for p in entitled_point_details_list:
-            if p.is_used:
-                is_transaction_reward_used = True
-                break
-        
-        if is_transaction_reward_used is False:
-            for p in entitled_stamp_details_list:
-                if p.is_used:
-                    is_transaction_reward_used = True
-                    break
-                
-        if is_transaction_reward_used is False:
-            for p in entiteld_vouchers_list:
-                if p.is_used:
-                    is_transaction_reward_used = True
-                    break
-        
-        logger.debug('revert: is_transaction_reward_used=%s', is_transaction_reward_used)
-        
-        if is_transaction_reward_used is False:
-            
-            logger.debug('Going to revert transqction')
-            reverted_by_key                 = reverted_by.create_ndb_key()
-            
-            reverted_datetime               = datetime.now()
-            self.is_revert                  = True
-            self.reverted_datetime          = reverted_datetime
-            self.reverted_by                = reverted_by_key
-            self.reverted_by_username       = reverted_by.username
-            self.put()
-            
-            for p in entitled_point_details_list:
-                if p.is_valid:
-                    customer_reward_summary = update_reward_summary_with_reverted_reward(customer_reward_summary, p.to_reward_summary())
-                    p.status                        = program_conf.REWARD_STATUS_REVERTED
-                    p.reverted_datetime             = reverted_datetime
-                    p.reverted_by                   = reverted_by_key
-                    p.reverted_by_username          = reverted_by.username
-                    p.put()
-                    
-                
-            for p in entitled_stamp_details_list:
-                if p.is_valid:
-                    customer_reward_summary = update_reward_summary_with_reverted_reward(customer_reward_summary, p.to_reward_summary())
-                    p.status                        = program_conf.REWARD_STATUS_REVERTED
-                    p.reverted_datetime             = reverted_datetime
-                    p.reverted_by                   = reverted_by_key
-                    p.reverted_by_username          = reverted_by.username
-                    p.put()
-                
-            for p in entiteld_vouchers_list:
-                if p.is_valid:
-                    p.status                        = program_conf.REWARD_STATUS_REVERTED
-                    p.reverted_datetime             = reverted_datetime
-                    p.reverted_by                   = reverted_by_key
-                    p.reverted_by_username          = reverted_by.username
-                    p.put()
-                    
-                    entitled_voucher_summary = update_customer_entiteld_voucher_summary_after_reverted_voucher(entitled_voucher_summary, p)
-            
-            updated_voucher_summary = {}
-            
-            logger.debug('revert transaction debug: entitled_voucher_summary=%s', entitled_voucher_summary)
-            
-            for voucher_key, details in entitled_voucher_summary.items():
-                if len(details.get('redeem_info_list'))>0:
-                    updated_voucher_summary[voucher_key] = details
-                
-            customer_acct.reward_summary            = customer_reward_summary
-            customer_acct.entitled_voucher_summary  = updated_voucher_summary or {}
-            customer_acct.put()
-            
-            return True
-        
-        else:
-            raise Exception('Transaction reward have been used')
-    '''
+    
     @staticmethod
     def list_customer_transaction(customer_acct, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False, reverse_order=True, keys_only=False):
         if keys_only:
@@ -706,45 +624,12 @@ class CustomerTransaction(SalesTransaction):
         query = CustomerTransaction.query(ancestor = customer_acct.create_ndb_key())
         CustomerTransaction.delete_multiples(query)
     
-    @staticmethod
-    def list(offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False, reverse_order=True):
-        if reverse_order:
-            query = CustomerTransaction.query().order(-CustomerTransaction.transact_datetime)
-        else:
-            query = CustomerTransaction.query().order(CustomerTransaction.transact_datetime)
-        
-        return CustomerTransaction.list_all_with_condition_query(query, offset=offset, limit=limit, start_cursor=start_cursor, return_with_cursor=return_with_cursor)
-    
-    @staticmethod
-    def list_outlet_transaction(transact_outlet, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False, reverse_order=True):
-        if reverse_order:
-            query = CustomerTransaction.query(ndb.AND(CustomerTransaction.transact_outlet==transact_outlet.create_ndb_key())).order(-CustomerTransaction.transact_datetime)
-        else:
-            query = CustomerTransaction.query(ndb.AND(CustomerTransaction.transact_outlet==transact_outlet.create_ndb_key())).order(CustomerTransaction.transact_datetime)
-        
-        return CustomerTransaction.list_all_with_condition_query(query, offset=offset, limit=limit, start_cursor=start_cursor, return_with_cursor=return_with_cursor)
-    
-    @staticmethod
-    def list_merchant_transaction(transact_merchant, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False, reverse_order=True):
-        if reverse_order:
-            query = CustomerTransaction.query(ndb.AND(CustomerTransaction.transact_merchant==transact_merchant.create_ndb_key()))
-        else:
-            query = CustomerTransaction.query(ndb.AND(CustomerTransaction.transact_merchant==transact_merchant.create_ndb_key()))
-        
-        return CustomerTransaction.list_all_with_condition_query(query, offset=offset, limit=limit, start_cursor=start_cursor, return_with_cursor=return_with_cursor)
-    
     @staticmethod
     def count_valid_customer_transaction(customer_acct, limit=conf.MAX_FETCH_RECORD):
         query = CustomerTransaction.query(ndb.AND(CustomerTransaction.is_revert==False), ancestor = customer_acct.create_ndb_key())
         
         return   CustomerTransaction.count_with_condition_query(query, limit=limit)
     
-    @staticmethod
-    def count_outlet_transaction(transact_outlet, limit=conf.MAX_FETCH_RECORD):
-        query = CustomerTransaction.query(ndb.AND(CustomerTransaction.transact_outlet==transact_outlet.create_ndb_key()))
-        
-        return   CustomerTransaction.count_with_condition_query(query, limit=limit)
-    
     @staticmethod
     def list_valid_customer_transaction(customer_acct, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False):