trex-model 1.3.0__tar.gz → 1.3.2__tar.gz

{trex-model-1.3.0 → trex-model-1.3.2}/PKG-INFO

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

{trex-model-1.3.0 → trex-model-1.3.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.3.0',
+     version='1.3.2',
      author="Jack Lok",
      author_email="sglok77@gmail.com",
      description="TRex database module package",

{trex-model-1.3.0 → trex-model-1.3.2}/trex_model.egg-info/PKG-INFO

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

{trex-model-1.3.0 → trex-model-1.3.2}/trexmodel/models/datastore/lucky_draw_models.py

@@ -635,8 +635,11 @@ class LuckyDrawTicket(BaseNModel, DictModel):
                         won_prize['image_url'] = won_prize.get('image_url')[index:]
                 
         
-        index = drawed_details.get('ticket_image_url').index('/static')
-        if index>0:
+        logger.info('drawed_details=%s', drawed_details)
+        
+        
+        if '/static'in drawed_details.get('ticket_image_url'):
+            index = drawed_details.get('ticket_image_url').index('/static')
             drawed_details['ticket_image_url'] = drawed_details['ticket_image_url'][index:]
                 
         #drawed_details['won_prize'] = won_prize

{trex-model-1.3.0 → trex-model-1.3.2}/trexmodel/models/datastore/membership_models.py

@@ -7,7 +7,7 @@ Created on 7 Apr 2021
 from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 import trexmodel.conf as model_conf
-from trexlib.utils.string_util import is_not_empty
+from trexlib.utils.string_util import is_not_empty, random_string
 from trexmodel.models.datastore.merchant_models import MerchantAcct, \
     MerchantUser, Outlet
 import logging
@@ -34,6 +34,11 @@ class MembershipBase(BaseNModel, DictModel):
     
     archived                = ndb.BooleanProperty(default=False)
     
+    discount_rate           = ndb.IntegerProperty(default=0)
+    
+    image_storage_filename  = ndb.StringProperty(required=False)
+    image_public_url        = ndb.StringProperty(required=False)
+    
     created_datetime        = ndb.DateTimeProperty(required=True, auto_now_add=True)
     modified_datetime       = ndb.DateTimeProperty(required=True, auto_now=True)
     archived_datetime       = ndb.DateTimeProperty(required=False)
@@ -44,12 +49,21 @@ class MembershipBase(BaseNModel, DictModel):
     modified_by             = ndb.KeyProperty(name="modified_by", kind=MerchantUser)
     modified_by_username    = ndb.StringProperty(required=False)
 
-    dict_properties         = ['label', 'desc', 'terms_and_conditions', 'expiration_type', 'expiration_value', 'created_datetime', 'modified_datetime']
+    dict_properties         = ['label', 'desc', 'terms_and_conditions', 'expiration_type', 
+                               'expiration_value', 'created_datetime', 'modified_datetime',
+                               'discount_rate', 'image_public_url',]
     
     @property
     def merchant_acct(self):
         return MerchantAcct.fetch(self.key.parent().urlsafe())
     
+    @property
+    def membership_card_image(self):
+        if self.image_public_url:
+            return self.image_public_url 
+        else:
+            return self.merchant_acct.logo_public_url
+    
     @classmethod
     def list_by_merchant_acct(cls, merchant_acct, is_archived=False):
         return cls.query(ndb.AND(MerchantMembership.archived == is_archived), ancestor=merchant_acct.create_ndb_key()).fetch(limit=model_conf.MAX_FETCH_RECORD)
@@ -76,8 +90,44 @@ class MembershipBase(BaseNModel, DictModel):
         
         else:
             #for no expiration
-            return datetime.max    
-
+            return datetime.max
+    
+    @classmethod
+    def upload_membership_card_image(cls, membership, uploading_file, merchant_acct, bucket, modified_by=None):
+        file_prefix                         = random_string(8)
+        image_storage_filename              = 'merchant/'+merchant_acct.key_in_str+'/membership/'+file_prefix+'-'+uploading_file.filename
+        blob                                = bucket.blob(image_storage_filename)
+        
+        logger.debug('image_storage_filename=%s', image_storage_filename)
+        
+        blob.upload_from_string(
+                uploading_file.read(),
+                content_type=uploading_file.content_type
+            )
+        
+        image_public_url        = blob.public_url
+        
+        
+        modified_by_username = None
+        
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+        
+        if is_not_empty(membership.image_storage_filename):
+            old_image_blob = bucket.get_blob(membership.image_storage_filename) 
+            if old_image_blob:
+                old_image_blob.delete()
+        
+        membership.image_public_url       = image_public_url
+        membership.image_storage_filename = image_storage_filename
+        
+        membership.modified_by            = modified_by.create_ndb_key()
+        membership.modified_by_username   = modified_by_username
+        
+        membership.put() 
+        
+        
 class MerchantMembership(MembershipBase):
     
     
@@ -87,6 +137,8 @@ class MerchantMembership(MembershipBase):
                                     'label'                         : self.label,
                                     'expiration_type'               : self.expiration_type,
                                     'expiration_value'              : self.expiration_value,
+                                    'card_image'                    : self.membership_card_image,
+                                    'is_tier'                       : False,
                                     }
         
         return membership_configuration
@@ -94,7 +146,7 @@ class MerchantMembership(MembershipBase):
         
     @staticmethod
     def create(merchant_acct, label, desc=None, expiration_type=None, expiration_value=None, 
-               created_by=None):
+               created_by=None, discount_rate=0, terms_and_conditions=None):
         
         created_by_username = None
         if is_not_empty(created_by):
@@ -105,10 +157,12 @@ class MerchantMembership(MembershipBase):
                                                 parent                  = merchant_acct.create_ndb_key(),
                                                 label                   = label,
                                                 desc                    = desc,
+                                                discount_rate           = discount_rate,
                                                 expiration_type         = expiration_type,
                                                 expiration_value        = expiration_value,
                                                 created_by              = created_by.create_ndb_key(),
                                                 created_by_username     = created_by_username,
+                                                terms_and_conditions    = terms_and_conditions,
                                                 )
         
         merchant_membership.put()
@@ -119,7 +173,7 @@ class MerchantMembership(MembershipBase):
     
     @staticmethod
     def update(merchant_membership, label, desc=None, expiration_type=None, expiration_value=None, 
-               modified_by=None):
+               modified_by=None, discount_rate=0, terms_and_conditions=None):
         modified_by_username = None
         if is_not_empty(modified_by):
             if isinstance(modified_by, MerchantUser):
@@ -131,6 +185,9 @@ class MerchantMembership(MembershipBase):
         merchant_membership.expiration_value        = expiration_value
         merchant_membership.modified_by             = modified_by.create_ndb_key()
         merchant_membership.modified_by_username    = modified_by_username
+        merchant_membership.discount_rate           = discount_rate
+        merchant_membership.terms_and_conditions    = terms_and_conditions
+        
         
         merchant_membership.put()
         
@@ -153,8 +210,9 @@ class MerchantTierMembership(MembershipBase):
     entitle_qualification_value         = ndb.FloatProperty(required=False)
     upgrade_expiry_type                 = ndb.StringProperty(required=True)
     
-    dict_properties         = ['label', 'desc', 'expiration_type', 'expiration_value', 'entitle_qualification_type', 
-                               'entitle_qualification_value', 'upgrade_expiry_type', 'created_datetime', 'modified_datetime'
+    dict_properties         = ['label', 'desc', 'terms_and_conditions', 'expiration_type', 'expiration_value', 'entitle_qualification_type', 
+                               'entitle_qualification_value', 'upgrade_expiry_type', 'created_datetime', 'modified_datetime',
+                               'discount_rate', 'image_public_url',
                                ]
     
     
@@ -167,6 +225,8 @@ class MerchantTierMembership(MembershipBase):
                                     'entitle_qualification_type'    : self.entitle_qualification_type,
                                     'entitle_qualification_value'   : self.entitle_qualification_value,
                                     'upgrade_expiry_type'           : self.upgrade_expiry_type,
+                                    'card_image'                    : self.membership_card_image,
+                                    'is_tier'                       : True,
                                     }
         
         return membership_configuration
@@ -174,7 +234,7 @@ class MerchantTierMembership(MembershipBase):
     @staticmethod
     def create(merchant_acct, label=None, desc=None, expiration_type=None, expiration_value=None, 
                entitle_qualification_type=None, entitle_qualification_value=None, upgrade_expiry_type=None,
-               created_by=None):
+               created_by=None, discount_rate=0, terms_and_conditions=None):
         
         created_by_username = None
         if is_not_empty(created_by):
@@ -192,6 +252,8 @@ class MerchantTierMembership(MembershipBase):
                                                 upgrade_expiry_type             = upgrade_expiry_type,
                                                 created_by                      = created_by.create_ndb_key(),
                                                 created_by_username             = created_by_username,
+                                                discount_rate                   = discount_rate,
+                                                terms_and_conditions            = terms_and_conditions,
                                                 )
         
         merchant_membership.put()
@@ -207,7 +269,7 @@ class MerchantTierMembership(MembershipBase):
     @staticmethod
     def update(merchant_membership, label=None, desc=None, expiration_type=None, expiration_value=None, 
                entitle_qualification_type=None, entitle_qualification_value=None, upgrade_expiry_type=None,
-               modified_by=None):
+               modified_by=None, discount_rate=0, terms_and_conditions=None):
         
         modified_by_username = None
         if is_not_empty(modified_by):
@@ -224,6 +286,9 @@ class MerchantTierMembership(MembershipBase):
         merchant_membership.upgrade_expiry_type             = upgrade_expiry_type
         merchant_membership.modified_by_username            = modified_by_username
         
+        merchant_membership.discount_rate                   = discount_rate
+        merchant_membership.terms_and_conditions            = terms_and_conditions
+        
         merchant_membership.put()
         
         merchant_acct = merchant_membership.merchant_acct