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

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

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

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

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

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

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

@@ -23,8 +23,8 @@ import pytz
 from trexlib.utils.common.cache_util import deleteFromCache, getFromCache,\
     setCache
 
-logger = logging.getLogger('model')
-#logger = logging.getLogger('debug')
+#logger = logging.getLogger('model')
+logger = logging.getLogger('target_debug')
 
 class BusinessEntity(BaseNModel, DictModel):
     company_name                = ndb.StringProperty(required=False)
@@ -892,7 +892,7 @@ class MerchantAcct(MerchantMin):
                 existing_partner_merchant_dict[merchant_acct_key] = partner_merchant_configuration
             else:
                 existing_partner_merchant_dict[merchant_acct_key] = partner_merchant_configuration
-                existing_partner_merchant_dict['count']+=existing_partner_merchant_dict['count']
+                self.approved_partner_merchant_configuration['count']+=self.approved_partner_merchant_configuration['count']
                 
         self.put()  
         deleteFromCache(self.key_in_str)     
@@ -901,9 +901,17 @@ class MerchantAcct(MerchantMin):
         if self.approved_partner_merchant_configuration is not None:
             existing_partner_merchant_dict = self.approved_partner_merchant_configuration.get('partners')
             
-            if existing_partner_merchant_dict and existing_partner_merchant_dict.get(existing_partner_merchant_dict):
-                del existing_partner_merchant_dict[partner_merchant_acct_key]
-                self.approved_partner_merchant_configuration['count']-=1
+            logger.debug('existing_partner_merchant_dict=%s', existing_partner_merchant_dict)
+            
+            if existing_partner_merchant_dict:# and existing_partner_merchant_dict.get(existing_partner_merchant_dict):
+                for key in existing_partner_merchant_dict.keys():
+                    logger.debug('key=%s', key)
+                if partner_merchant_acct_key in existing_partner_merchant_dict:
+                    #existing_partner_merchant_dict.pop(partner_merchant_acct_key)
+                    del existing_partner_merchant_dict[partner_merchant_acct_key]
+                    self.approved_partner_merchant_configuration['count']-=1
+                else:
+                    logger.debug('%s not found', partner_merchant_acct_key)
         
         
     def update_approved_partner_redemption_catalogue(self, catalogue_configuration):

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

@@ -294,7 +294,7 @@ class PartnerLinked(BaseNModel, DictModel):
         if partner_merchant_account:
             logger.debug('partner company=%s', partner_merchant_account.company_name)
             
-            partner_merchant_account.remove_partner_merchant_configuration(self.key_in_str)
+            partner_merchant_account.remove_partner_merchant_configuration(self.merchant_key)
             
             for catalogue_key in self.redemption_catalogue_list:
                 partner_merchant_account.remove_partner_redeption_catalogue(catalogue_key)