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

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

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

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

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

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

{trex_model-1.6.2 → trex_model-1.6.4}/trexmodel/models/datastore/analytic_models.py

@@ -17,8 +17,9 @@ class UpstreamData(BaseNModel, DictModel):
     stream_content          = ndb.JsonProperty(required=True)
     is_sent                 = ndb.BooleanProperty(required=True, default=False)
     created_datetime        = ndb.DateTimeProperty(required=True, auto_now_add=True)
+    partition_datetime      = ndb.DateTimeProperty(required=False)
     
-    dict_properties = ['table_template_name', 'dataset_name', 'table_name', 'stream_content', 'is_sent']
+    dict_properties = ['table_template_name', 'dataset_name', 'table_name', 'stream_content', 'is_sent', 'partition_datetime']
     
     @staticmethod
     def list_not_send(offset=0, limit=model_conf.MAX_FETCH_RECORD, start_cursor=None,return_with_cursor=False, keys_only=False):
@@ -27,6 +28,12 @@ class UpstreamData(BaseNModel, DictModel):
         return UpstreamData.list_all_with_condition_query(query, offset=offset, start_cursor=start_cursor, return_with_cursor=return_with_cursor, keys_only=keys_only, limit=limit)
 
 
+    @staticmethod
+    def list_all(offset=0, limit=model_conf.MAX_FETCH_RECORD, start_cursor=None,return_with_cursor=False, keys_only=False):
+        query = UpstreamData.query()
+        
+        return UpstreamData.list_all_with_condition_query(query, offset=offset, start_cursor=start_cursor, return_with_cursor=return_with_cursor, keys_only=keys_only, limit=limit)
+
     @staticmethod
     def list_by_date_range(datetime_start, datetime_end, offset=0, limit=model_conf.MAX_FETCH_RECORD, start_cursor=None,return_with_cursor=False, keys_only=False):
         
@@ -43,6 +50,10 @@ class UpstreamData(BaseNModel, DictModel):
     def count_not_sent(limit=model_conf.MAX_FETCH_RECORD):
         return UpstreamData.query(ndb.AND(UpstreamData.is_sent==False)).count(limit = limit)
     
+    @staticmethod
+    def count_all(limit=model_conf.MAX_FETCH_RECORD):
+        return UpstreamData.query().count(limit = limit)
+    
     @staticmethod
     def count_by_date_range(datetime_start, datetime_end, limit=model_conf.MAX_FETCH_RECORD):
         datetime_end = datetime_end + timedelta(days=1)
@@ -53,13 +64,14 @@ class UpstreamData(BaseNModel, DictModel):
                                 )).count(limit = limit)
     
     @staticmethod
-    def create(merchant_acct, dataset_name, table_name, table_template_name, stream_content):
+    def create(merchant_acct, dataset_name, table_name, table_template_name, stream_content, partition_datetime=None):
         UpstreamData(
                     merchant_acct       = merchant_acct.create_ndb_key(), 
                     table_template_name = table_template_name,
                     dataset_name        = dataset_name,
                     table_name          = table_name,
                     stream_content      = stream_content,
+                    partition_datetime  = partition_datetime,
                     ).put()
                     
 

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

@@ -757,7 +757,7 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
     def update_after_added_voucher(self, added_voucher):
         entitled_voucher_summary = self.entitled_voucher_summary
         update_customer_entiteld_voucher_summary_with_customer_new_voucher(entitled_voucher_summary, added_voucher)
-        self.put()    
+        self.put()
     
 class CustomerMembership(BaseNModel, DictModel):
     '''

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

@@ -25,8 +25,8 @@ from trexanalytics.bigquery_upstream_data_config import create_merchant_customer
     create_merchant_customer_prepaid_upstream_for_merchant,\
     create_merchant_customer_redemption_reverted_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
+    create_redeemed_customer_voucher_to_upstream_for_merchant,\
+    create_merchant_sales_transaction_upstream_for_merchant
 from trexmodel.models.datastore.membership_models import MerchantTierMembership
 from trexmodel.models.datastore.transaction_models import CustomerTransaction,\
     SalesTransaction
@@ -139,7 +139,7 @@ def create_sales_transaction(transact_outlet=None, sales_amount=.0, tax_amount=.
     logger.debug('invoice_details=%s', invoice_details)
     
     @model_transactional(desc='create_sales_transaction')
-    def __start_transaction_for_customer_transaction(): 
+    def __start_transaction_for_sales_transaction(): 
         sales_transaction = SalesTransaction.create(
                                        transact_outlet      = transact_outlet,
                                        
@@ -156,11 +156,11 @@ def create_sales_transaction(transact_outlet=None, sales_amount=.0, tax_amount=.
                                        
                                        )
             
-        #create_merchant_sales_transaction_upstream_for_merchant(sales_transaction, streamed_datetime=transact_datetime)
+        create_merchant_sales_transaction_upstream_for_merchant(sales_transaction, streamed_datetime=transact_datetime)
         
         return sales_transaction
         
-    return __start_transaction_for_customer_transaction()
+    return __start_transaction_for_sales_transaction()
 
 def create_reward_transaction(customer, transact_outlet=None, sales_amount=.0, tax_amount=.0, invoice_id=None, remarks=None, 
                             transact_by=None, transact_datetime=None, invoice_details=None, promotion_code=None):
@@ -171,6 +171,25 @@ def create_reward_transaction(customer, transact_outlet=None, sales_amount=.0, t
     
     @model_transactional(desc='create_reward_transaction')
     def __start_transaction_for_customer_transaction():
+        
+        sales_transaction = SalesTransaction.create(
+                                       transact_outlet      = transact_outlet,
+                                       
+                                       transact_amount      = sales_amount, 
+                                       tax_amount           = tax_amount,
+                                       
+                                       invoice_id           = invoice_id, 
+                                       remarks              = remarks,
+                                       
+                                       transact_by          = transact_by,
+                                       
+                                       transact_datetime    = transact_datetime,
+                                       
+                                       )
+        create_merchant_sales_transaction_upstream_for_merchant(sales_transaction)
+        
+        #customer_transaction = give_reward_from_sales_transaction(customer, sales_transaction)
+        
         customer_transaction = CustomerTransaction.create_system_transaction(
                                        customer, 
                                        transact_outlet      = transact_outlet,
@@ -196,7 +215,8 @@ def create_reward_transaction(customer, transact_outlet=None, sales_amount=.0, t
         
         if trigger_check_reward_success:
             create_transaction_message(customer_transaction)
-            create_merchant_customer_transaction_upstream_for_merchant(customer_transaction, streamed_datetime=transact_datetime)
+            create_merchant_customer_transaction_upstream_for_merchant(customer_transaction, )
+        
         
         return customer_transaction
         
@@ -216,7 +236,7 @@ def give_reward_from_sales_transaction(customer, sales_transaction, for_testing=
             
             if trigger_check_reward_success:
                 create_transaction_message(customer_transaction)
-                create_merchant_customer_transaction_upstream_for_merchant(customer_transaction, streamed_datetime=sales_transaction.transact_datetime)
+                create_merchant_customer_transaction_upstream_for_merchant(customer_transaction,)
         
         return customer_transaction
     
@@ -389,12 +409,12 @@ def check_for_tier_membership_upgrade_downgrade(customer_acct, merchant_acct, tr
         existing_tier_membership        = None
         membership_to_assign            = None
         
-        customer_kpi_summary            = customer_acct.kpi_summary
+        customer_kpi_summary            = customer_acct.kpi_summary or {}
         
-        total_transact_amount           = customer_kpi_summary['total_transact_amount']
-        total_accumulated_point         = customer_kpi_summary['total_accumulated_point']
-        total_accumulated_stamp         = customer_kpi_summary['total_accumulated_stamp'] 
-        total_accumulated_prepaid       = customer_kpi_summary['total_accumulated_prepaid']
+        total_transact_amount           = customer_kpi_summary.get('total_transact_amount',0)
+        total_accumulated_point         = customer_kpi_summary.get('total_accumulated_point',0)
+        total_accumulated_stamp         = customer_kpi_summary.get('total_accumulated_stamp',0) 
+        total_accumulated_prepaid       = customer_kpi_summary.get('total_accumulated_prepaid',0)
         
         logger.debug('check_for_tier_membership_upgrade_downgrade: total_transact_amount=%s', total_transact_amount)
         logger.debug('check_for_tier_membership_upgrade_downgrade: total_accumulated_point=%s', total_accumulated_point)
@@ -712,7 +732,7 @@ 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)
+                create_merchant_customer_redemption_upstream_for_merchant(customer_redemption, )
                 if reward_format == program_conf.REWARD_FORMAT_VOUCHER:
                     for voucher_key in redeemed_voucher_keys_list:
                         customer_voucher        = CustomerEntitledVoucher.fetch(voucher_key)
@@ -920,6 +940,21 @@ def revert_transaction(transaction_details, reverted_by, reverted_datetime=None,
             transaction_details.reverted_by_username       = reverted_by.username
             transaction_details.put()
             
+            create_merchant_customer_transaction_upstream_for_merchant(transaction_details, Reverted=True)
+            
+            if transaction_details.is_sales_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.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:
                     if p.is_valid:
@@ -1265,7 +1300,7 @@ def update_transaction_all_entitled_reward_summary(transaction_id):
         
         if vouchers_list:
             logger.debug('found entitled voucher list')
-            entiteld_voucher_brief          = EntitledVoucherSummary()
+            entiteld_voucher_brief          = EntitledVoucherSummary(transaction_id=transaction_id)
             
             for customer_voucher in vouchers_list:
                 merchant_voucher = customer_voucher.entitled_voucher_entity

{trex_model-1.6.2 → trex_model-1.6.4}/trexmodel/models/datastore/lucky_draw_models.py

@@ -16,6 +16,7 @@ import random
 from trexlib.utils.common.common_util import sort_dict_list
 from trexmodel.models.datastore.customer_models import Customer
 from collections import Counter
+from trexmodel.models.datastore.voucher_models import MerchantVoucher
 
 logger = logging.getLogger('model')
 #logger = logging.getLogger('debug')
@@ -678,15 +679,27 @@ 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')
-            
+            prize_details_list      = program.get('program_settings').get('prize_settings').get('prizes')
+            ticket_image_url        = program.get('program_settings').get('ticket_image_url')
+            archived_vouchers_list  = MerchantVoucher.list_archived_by_merchant_account(merchant_acct)
             for prize in prize_details_list:
                 if prize.get('prize_type') == program_conf.REWARD_FORMAT_VOUCHER:
+                    found_voucher = False
                     for voucher_details in merchant_acct.published_voucher_configuration.get('vouchers'):
                         if voucher_details.get('voucher_key') == prize.get('voucher_key'):
                             prize['image_url']  = voucher_details.get('image_url')
                             prize['label']      = voucher_details.get('label')
+                            found_voucher = True
+                    
+                    if found_voucher==False:
+                        logger.info('Some voucher may be archived')
+                        
+                        if archived_vouchers_list:
+                            for voucher_details in archived_vouchers_list:
+                                if voucher_details.key_in_str == prize.get('voucher_key'):
+                                    prize['image_url']  = voucher_details.image_public_url
+                                    prize['label']      = voucher_details.label
+                                    found_voucher = True
                             
             
             drawed_details =  {

{trex_model-1.6.2 → trex_model-1.6.4}/trexmodel/models/datastore/merchant_models.py

@@ -81,6 +81,7 @@ class MerchantAcct(MerchantMin):
     published_tier_program_configuration            = ndb.JsonProperty()
     
     approved_partner_merchant_configuration         = ndb.JsonProperty()
+    partner_merchant_history_configuration          = ndb.JsonProperty()
     
     membership_configuration                        = ndb.JsonProperty()
     tier_membership_configuration                   = ndb.JsonProperty()
@@ -115,7 +116,7 @@ class MerchantAcct(MerchantMin):
                        'dashboard_stat_figure', 'program_settings', 'is_tier_membership_configured', 'website', 
                        'product_package', 'loyalty_package','pos_package', 'account_plan','outlet_count', 'outlet_limit',
                        'published_redemption_catalogue_configuration', 'partner_redemption_catalogue_configuration',
-                       'approved_partner_merchant_configuration',
+                       'approved_partner_merchant_configuration', 'partner_merchant_history_configuration',
                        'logo_public_url'
                        ]
     
@@ -877,6 +878,12 @@ class MerchantAcct(MerchantMin):
     def update_partner_merchant_configuration(self, partner_merchant_configuration):
         merchant_acct_key = partner_merchant_configuration.get('merchant_acct_key')
         
+        if is_empty(self.partner_merchant_history_configuration):
+            self.partner_merchant_history_configuration = {
+                                                                'partners':{},
+                                                                'count':0
+                                                                }
+        
         if is_empty(self.approved_partner_merchant_configuration):
             self.approved_partner_merchant_configuration = {
                                                 'partners'              :{
@@ -884,15 +891,33 @@ class MerchantAcct(MerchantMin):
                                                                             },
                                                 'count'               : 1,
                                                 } 
+            
+            self.partner_merchant_history_configuration = {
+                                                'partners'              :{
+                                                                            merchant_acct_key  : partner_merchant_configuration,
+                                                                            },
+                                                'count'               : 1,
+                                                } 
                                             
         else:
+            
             existing_partner_merchant_dict  = self.approved_partner_merchant_configuration.get('partners')
-            partner_merchant_details = existing_partner_merchant_dict.get(merchant_acct_key) 
+            partner_merchant_history_dict   = self.partner_merchant_history_configuration.get('partners')
+            partner_merchant_details        = existing_partner_merchant_dict.get(merchant_acct_key)
+            
             if partner_merchant_details:
                 existing_partner_merchant_dict[merchant_acct_key] = partner_merchant_configuration
             else:
                 existing_partner_merchant_dict[merchant_acct_key] = partner_merchant_configuration
                 self.approved_partner_merchant_configuration['count']+=self.approved_partner_merchant_configuration['count']
+            
+            partner_merchant_details        = partner_merchant_history_dict.get(merchant_acct_key) 
+            if partner_merchant_details:
+                partner_merchant_history_dict[merchant_acct_key] = partner_merchant_configuration
+            else:
+                partner_merchant_history_dict[merchant_acct_key] = partner_merchant_configuration
+            
+            self.partner_merchant_history_configuration['count']=len(self.partner_merchant_history_configuration['partners'])
                 
         self.put()  
         deleteFromCache(self.key_in_str)     

{trex_model-1.6.2 → trex_model-1.6.4}/trexmodel/models/datastore/ndb_models.py

@@ -18,8 +18,8 @@ from trexconf import conf as model_conf
 from google.cloud.datastore.helpers import GeoPoint
 from trexlib.utils.common.cache_util import getFromCache, setCache
  
-#logger = logging.getLogger('model')
-logger = logging.getLogger('target_debug') 
+logger = logging.getLogger('model')
+#logger = logging.getLogger('target_debug') 
 
 def clone_entity(entity, parent=None, **extra_args):
     """
@@ -367,10 +367,11 @@ class BaseNModel(DictModel, NDBModel):
                                                  )
     
     @classmethod
-    def list_all_with_condition_query(cls, query, offset=0,  start_cursor=None, return_with_cursor=False, keys_only=False, 
-                 limit=model_conf.MAX_FETCH_RECORD):
+    def list_all_with_condition_query(cls, query, offset=0,  start_cursor=None, return_with_cursor=False, 
+                                      keys_only=False,limit=model_conf.MAX_FETCH_RECORD, order_by=None):
         
         
+        logger.debug('list_all: start_cursor=%s, order_by=%s, return_with_cursor=%s', start_cursor, order_by, return_with_cursor)
         
         if start_cursor or return_with_cursor:
             if is_not_empty(start_cursor):
@@ -379,12 +380,15 @@ class BaseNModel(DictModel, NDBModel):
             else:
                 start_cursor = ndb.Cursor()
             
-            (search_results, next_cursor, more)       = query.fetch_page(page_size=limit, start_cursor=start_cursor, keys_only=keys_only)
+            if order_by:
+                (search_results, next_cursor, more)       = query.order(order_by).fetch_page(page_size=limit, start_cursor=start_cursor, keys_only=keys_only)
+            else:
+                (search_results, next_cursor, more)       = query.fetch_page(page_size=limit, start_cursor=start_cursor, keys_only=keys_only)
             logger.debug('##########################################')
-            
             logger.debug('list_all: results=%s', search_results)
             logger.debug('list_all: next_cursor=%s', next_cursor)
             logger.debug('list_all: more=%s', more) 
+            logger.debug('list_all: return_with_cursor=%s', return_with_cursor) 
             
             logger.debug('##########################################')
             

{trex_model-1.6.2 → trex_model-1.6.4}/trexmodel/models/datastore/partnership_models.py

@@ -9,14 +9,16 @@ from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 import logging
 from trexmodel.models.datastore.merchant_models import MerchantAcct,\
     MerchantUser
-from trexconf import program_conf
-from datetime import datetime
+from trexconf import program_conf, conf
+from datetime import datetime, timedelta
 from trexlib.utils.string_util import is_not_empty
 from trexmodel.models.datastore.redemption_catalogue_models import RedemptionCatalogue
 from trexmodel.models.merchant_helpers import convert_points_between_merchants
 from trexmodel.models.datastore.user_models import User
 from trexlib.utils.common.cache_util import setCache, getFromCache,\
     deleteFromCache
+from trexlib.utils.common.date_util import convert_date_to_datetime
+
 
 
 logger = logging.getLogger('target_debug')
@@ -322,22 +324,58 @@ class PartnershipRewardTransaction(BaseNModel, DictModel):
     '''
     This is used to record convert merchant point to partner merchant point
     '''
-    merchant_acct                   = ndb.KeyProperty(name="merchant_acct", kind=MerchantAcct)
-    partner_merchant_acct           = ndb.KeyProperty(name="partner_merchant_acct", kind=MerchantAcct)
+    merchant_acct                               = ndb.KeyProperty(name="merchant_acct", kind=MerchantAcct)
+    partner_merchant_acct                       = ndb.KeyProperty(name="partner_merchant_acct", kind=MerchantAcct)
     
     merchant_point_worth_value_in_currency      = ndb.FloatProperty(required=True, default=.0)
     partner_point_worth_value_in_currency       = ndb.FloatProperty(required=True, default=.0)
     
-    transact_point_amount           = ndb.FloatProperty(required=True)
-    transact_datetime               = ndb.DateTimeProperty(required=True, auto_now_add=True)
+    transact_point_amount                       = ndb.FloatProperty(required=True)
+    transact_datetime                           = ndb.DateTimeProperty(required=True, auto_now_add=True)
+    
+    user_acct                                   = ndb.KeyProperty(name="user_acct", kind=User)
+    transaction_id                              = ndb.StringProperty(required=True)
+    reward_summary                              = ndb.JsonProperty()
+    
+    is_revert                                   = ndb.BooleanProperty(required=False, default=False)
+    reverted_datetime                           = ndb.DateTimeProperty(required=False)
+    reverted_by                                 = ndb.KeyProperty(name="reverted_by", kind=MerchantUser)
+    reverted_by_username                        = ndb.StringProperty(required=False)
+    
+    dict_properties = [
+                        'partner_merchant_acct_key', 'merchant_point_worth_value_in_currency', 'partner_point_worth_value_in_currency',
+                        'transact_point_amount', 'transact_datetime', 'reward_summary', 'transaction_id',
+                        ]
+    
+    @property
+    def merchant_acct_key(self):
+        return self.merchant_acct.urlsafe().decode('utf-8')
+    
+    @property
+    def partner_merchant_acct_key(self):
+        return self.partner_merchant_acct.urlsafe().decode('utf-8')
+    
+    @property
+    def merchant_acct_entity(self):
+        return self.merchant_acct.get()
+    
+    @property
+    def partner_merchant_acct_entity(self):
+        return self.partner_merchant_acct.get()
     
-    user_acct                       = ndb.KeyProperty(name="user_acct", kind=User)
+    @property
+    def user_acct_entity(self):
+        return self.user_acct.get()
+    
+    @property
+    def user_acct_reference_code(self):
+        return self.user_acct_entity.reference_code
     
     def convertion_rate(self)->float:
         return self.merchant_point_worth_value_in_currency/self.partner_point_worth_value_in_currency
     
     @staticmethod
-    def create(merchant_acct, partner_merchant_acct, user_acct, transact_point_amount):
+    def create(merchant_acct, partner_merchant_acct, user_acct, transact_point_amount, reward_summary=None):
         merchant_artnership_settings = PartnershipSettings.get_by_merchant_acct(merchant_acct)
         partner_partnership_settings = PartnershipSettings.get_by_merchant_acct(partner_merchant_acct)
         
@@ -353,6 +391,10 @@ class PartnershipRewardTransaction(BaseNModel, DictModel):
                                                 
                                                 transact_point_amount   = transact_point_amount,
                                                 user_acct               = user_acct.create_ndb_key(),
+                                                reward_summary          = {
+                                                                            'entitled_voucher_summary': reward_summary.entitled_voucher_summary,
+                                                                            },
+                                                transaction_id          = reward_summary.transaction_id,
                                                 )
             partnership_reward_transaction.put()
             return partnership_reward_transaction
@@ -361,7 +403,42 @@ class PartnershipRewardTransaction(BaseNModel, DictModel):
             raise Exception('Merchant or partner partnership settings is not enabled or created')
     
     
+    @staticmethod
+    def list_transaction_by_date(enquiry_date, merchant_acct=None,  partner_merchant_acct=None, offset=0, limit=conf.PAGINATION_SIZE, return_with_cursor=False, start_cursor=None):
+        start_datetime  = convert_date_to_datetime(enquiry_date)
+        end_datetime    = start_datetime + timedelta(days=1)
+        query = PartnershipRewardTransaction.query(
+                        ndb.AND(
+                            PartnershipRewardTransaction.merchant_acct==merchant_acct.create_ndb_key(),
+                            PartnershipRewardTransaction.partner_merchant_acct==partner_merchant_acct.create_ndb_key(),
+                            PartnershipRewardTransaction.transact_datetime>=start_datetime,
+                            PartnershipRewardTransaction.transact_datetime<end_datetime,
+                        ))
+        if return_with_cursor:
+            (result, next_cursor) = PartnershipRewardTransaction.list_all_with_condition_query(query, order_by=PartnershipRewardTransaction.transact_datetime, start_cursor=start_cursor, return_with_cursor=True, limit=limit)
+        
+            return (result, next_cursor)
+        else:
+            return query.order(PartnershipRewardTransaction.transact_datetime).fetch(offset=offset, limit=limit)
     
     
+    @staticmethod
+    def list_merchant_partnership_reward_transaction(merchant_acct, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False, reverse_order=True, keys_only=False):
+        if keys_only:
+            query = PartnershipRewardTransaction.query(ndb.AND(PartnershipRewardTransaction.merchant_acct==merchant_acct.create_ndb_key()))
+            return PartnershipRewardTransaction.list_all_with_condition_query(query, offset=offset, limit=limit, keys_only=True)
+        else:
+            if reverse_order:
+                query = PartnershipRewardTransaction.query(ndb.AND(PartnershipRewardTransaction.merchant_acct==merchant_acct.create_ndb_key())).order(-PartnershipRewardTransaction.transact_datetime)
+            else:
+                query = PartnershipRewardTransaction.query(ndb.AND(PartnershipRewardTransaction.merchant_acct==merchant_acct.create_ndb_key())).order(PartnershipRewardTransaction.transact_datetime)
+            
+            return PartnershipRewardTransaction.list_all_with_condition_query(query, offset=offset, limit=limit, start_cursor=start_cursor, return_with_cursor=return_with_cursor)
     
+    @staticmethod
+    def count_merchant_partnership_reward_transaction(merchant_acct, limit=conf.MAX_FETCH_RECORD):
+        query = PartnershipRewardTransaction.query(ndb.AND(PartnershipRewardTransaction.merchant_acct==merchant_acct.create_ndb_key()))
+        
+        return   PartnershipRewardTransaction.count_with_condition_query(query, limit=limit)
     
+