trex-model 1.0.4__tar.gz → 1.0.7__tar.gz

{trex-model-1.0.4/trex_model.egg-info → trex-model-1.0.7}/PKG-INFO

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

{trex-model-1.0.4 → trex-model-1.0.7}/setup.py

@@ -3,7 +3,7 @@ with open("README.md", "r") as fh:
     long_description = fh.read()
 setuptools.setup(
      name='trex-model',  
-     version='1.0.4',
+     version='1.0.7',
      author="Jack Lok",
      author_email="sglok77@gmail.com",
      description="TRex database module package",

{trex-model-1.0.4 → trex-model-1.0.7/trex_model.egg-info}/PKG-INFO

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

{trex-model-1.0.4 → trex-model-1.0.7}/trex_model.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ trexmodel/models/prepaid_helpers.py
 trexmodel/models/datastore/__init__.py
 trexmodel/models/datastore/admin_models.py
 trexmodel/models/datastore/analytic_models.py
+trexmodel/models/datastore/app_models.py
 trexmodel/models/datastore/coporate_models.py
 trexmodel/models/datastore/customer_model_helpers.py
 trexmodel/models/datastore/customer_models.py

trex-model-1.0.7/trexmodel/models/datastore/app_models.py

@@ -0,0 +1,71 @@
+'''
+Created on 23 May 2023
+
+@author: jacklok
+'''
+
+import logging
+from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
+from google.cloud import ndb
+from datetime import datetime
+import trexmodel.conf as model_conf
+
+logger = logging.getLogger('model')
+
+class AppMessageBase(BaseNModel, DictModel):
+    title                   = ndb.StringProperty(required=True)
+    content                 = ndb.StringProperty(required=False)
+    start_date              = ndb.DateProperty(required=True)
+    end_date                = ndb.DateProperty(required=True)
+    archived                = ndb.BooleanProperty(default=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)
+    
+    @classmethod
+    def create(cls, title, content=None, start_date=None, end_date=None):
+        message = cls(
+                        title       = title, 
+                        content     = content,
+                        start_date  = start_date,
+                        end_date    = end_date,
+                        )
+        message.put()
+        return message
+    
+    @classmethod
+    def update(cls, message, title=None, content=None, start_date=None, end_date=None):
+        message.title         = title
+        message.content       = content
+        message.start_date    = start_date
+        message.end_date      = end_date
+        message.put()
+        
+    def archive(self):
+        self.archived = True
+        self.archived_datetime = datetime.now()
+        self.put()    
+        
+    @classmethod
+    def list(cls, is_archived=False):
+        return cls.query(ndb.AND(cls.archived == is_archived)).fetch(limit=model_conf.MAX_FETCH_RECORD)
+    
+    @classmethod
+    def list_active(cls):
+        now = datetime.now().date()
+        return cls.query(ndb.AND(cls.archived == False, cls.start_date>=now, cls.end_date<now)).fetch(limit=model_conf.MAX_FETCH_RECORD)
+
+class AppMessage(AppMessageBase):
+    pass
+    
+
+class AppPromotion(AppMessageBase):
+    image_file_type                = ndb.StringProperty(required=False)
+    image_file_public_url          = ndb.StringProperty(required=False)
+    image_file_storage_filename    = ndb.StringProperty(required=False)
+    
+    
+    
+    
+        

{trex-model-1.0.4 → trex-model-1.0.7}/trexmodel/models/datastore/customer_model_helpers.py

@@ -201,7 +201,8 @@ def update_customer_entiteld_voucher_summary_with_new_voucher_info(customer_enti
 
     return customer_entitled_voucher_summary
 
-def update_customer_entiteld_voucher_summary_after_reverted_voucher(customer_entitled_voucher_summary, reverted_customer_voucher):
+
+def update_customer_entiteld_voucher_summary_after_removed_voucher(customer_entitled_voucher_summary, removed_customer_voucher):
     '''
     removed entitled voucher from customer entitled voucher summary 
     '''
@@ -209,8 +210,8 @@ def update_customer_entiteld_voucher_summary_after_reverted_voucher(customer_ent
     
     
     if customer_entitled_voucher_summary:
-        merchant_voucher_key                    = reverted_customer_voucher.entitled_voucher_key
-        redeem_code_of_reverting_voucher        = reverted_customer_voucher.redeem_code
+        merchant_voucher_key                    = removed_customer_voucher.entitled_voucher_key
+        redeem_code_of_reverting_voucher        = removed_customer_voucher.redeem_code
         
         logger.debug('merchant_voucher_key=%s', merchant_voucher_key)
         logger.debug('redeem_code_of_reverting_voucher=%s', redeem_code_of_reverting_voucher)
@@ -235,9 +236,13 @@ def update_customer_entiteld_voucher_summary_after_reverted_voucher(customer_ent
                 
     return customer_entitled_voucher_summary
     
-    
+
+def update_customer_entiteld_voucher_summary_after_reverted_voucher(entitled_voucher_summary, reverted_customer_voucher):
+    return update_customer_entiteld_voucher_summary_after_removed_voucher(entitled_voucher_summary, reverted_customer_voucher)
+
 def update_customer_entiteld_voucher_summary_after_redeemed_voucher(entitled_voucher_summary, redeemed_customer_voucher):
-    return update_customer_entiteld_voucher_summary_after_reverted_voucher(entitled_voucher_summary, redeemed_customer_voucher)
+    return update_customer_entiteld_voucher_summary_after_removed_voucher(entitled_voucher_summary, redeemed_customer_voucher)
+
 
 ''' --------------- End: Update reward summary for voucher--------------'''
 

{trex-model-1.0.4 → trex-model-1.0.7}/trexmodel/models/datastore/customer_models.py

@@ -18,6 +18,8 @@ from six import string_types
 from datetime import datetime, timedelta
 from trexmodel.models.datastore.membership_models import MerchantTierMembership,\
     MerchantMembership
+from trexmodel.models.datastore.customer_model_helpers import update_customer_entiteld_voucher_summary_after_removed_voucher,\
+    update_customer_entiteld_voucher_summary_with_customer_new_voucher
     
 
 logger = logging.getLogger('model')
@@ -66,6 +68,7 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
     entitled_voucher_summary                    = ndb.JsonProperty()
     entitled_birthday_reward_summary            = ndb.JsonProperty()
     entitled_membership_reward_summary          = ndb.JsonProperty()
+    entitled_lucky_draw_ticket_summary          = ndb.JsonProperty(required=False)
     
     kpi_summary                         = ndb.JsonProperty()
     
@@ -73,7 +76,7 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
     
     dict_properties     = ['name', 'mobile_phone', 'email', 'gender', 'birth_date', 'reference_code', 'merchant_reference_code',  
                            'tags_list', 'memberships_list', 'registered_merchant_acct', 'entitled_membership_reward_summary',
-                           'reward_summary', 'entitled_voucher_summary', 'prepaid_summary', 'kpi_summary', 
+                           'reward_summary', 'entitled_voucher_summary', 'prepaid_summary', 'kpi_summary', 'entitled_lucky_draw_ticket_summary',
                            'entitled_birthday_reward_summary', 'tier_membership_key',
                            'registered_outlet_key', 'registered_merchant_acct_key', 'registered_datetime', 'modified_datetime']
     
@@ -159,6 +162,82 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
         customer_acct.tier_membership           = new_tier_membership.create_ndb_key()
         customer_acct.put()        
     
+    @staticmethod
+    def add_new_tickets_list_into_lucky_draw_ticket_summary(customer_acct, new_entitled_draw_tickets_list):
+        
+        logger.debug('new_entitled_draw_tickets_list=%s', new_entitled_draw_tickets_list)
+        
+        entitled_lucky_draw_ticket_summary = {}
+        if customer_acct.entitled_lucky_draw_ticket_summary:
+            entitled_lucky_draw_ticket_summary = customer_acct.entitled_lucky_draw_ticket_summary
+        
+        entitled_tickets_list = entitled_lucky_draw_ticket_summary.get('tickets') or []
+        
+        tickets_to_update_list = []
+        
+        #check before add
+        for new_ticket in new_entitled_draw_tickets_list:
+            check_ticket = next((obj for obj in entitled_tickets_list if obj.get('ticket_key') == new_ticket.get('ticket_key')), None)
+            if check_ticket is None:
+                logger.debug('Cannot find ticket, thus going to add ticket')
+                tickets_to_update_list.append(new_ticket)
+            else:
+                logger.debug('Found ticket, thus ignore to avoid duplicated ticket')
+                continue
+        
+        entitled_tickets_list.extend(tickets_to_update_list)
+        
+        entitled_lucky_draw_ticket_summary['tickets']    = entitled_tickets_list
+        entitled_lucky_draw_ticket_summary['count']      = len(entitled_tickets_list)
+        
+        customer_acct.entitled_lucky_draw_ticket_summary = entitled_lucky_draw_ticket_summary
+         
+        
+        customer_acct.put()
+        
+    @staticmethod
+    def update_ticket_into_lucky_draw_ticket_summary(customer_acct, updated_draw_ticket):
+        entitled_lucky_draw_ticket_summary = {}
+        if customer_acct.entitled_lucky_draw_ticket_summary:
+            entitled_lucky_draw_ticket_summary = customer_acct.entitled_lucky_draw_ticket_summary
+        
+        draw_tickets_list = entitled_lucky_draw_ticket_summary.get('tickets') or []
+        
+        new_tickets_list = []
+        
+        for ticket in draw_tickets_list:
+            if ticket.get('ticket_key')!=updated_draw_ticket.get('ticket_key'):
+                new_tickets_list.append(ticket)
+            else:
+                new_tickets_list.append(updated_draw_ticket)
+                
+        customer_acct.entitled_lucky_draw_ticket_summary['tickets'] = new_tickets_list
+        customer_acct.put()
+        
+    @staticmethod
+    def remove_ticket_from_lucky_draw_ticket_summary(customer_acct, removed_draw_ticket):
+        entitled_lucky_draw_ticket_summary = {}
+        if customer_acct.entitled_lucky_draw_ticket_summary:
+            entitled_lucky_draw_ticket_summary = customer_acct.entitled_lucky_draw_ticket_summary
+        
+        draw_tickets_list = entitled_lucky_draw_ticket_summary.get('tickets') or []
+        
+        new_tickets_list = []
+        
+        for ticket in draw_tickets_list:
+            if ticket.get('ticket_key')!=removed_draw_ticket.get('ticket_key'):
+                new_tickets_list.append(ticket)
+            
+                
+        customer_acct.entitled_lucky_draw_ticket_summary['tickets'] = new_tickets_list
+        customer_acct.entitled_lucky_draw_ticket_summary['count']   = len(new_tickets_list)
+        customer_acct.put()    
+        
+    @staticmethod
+    def update_tickets_list_into_lucky_draw_ticket_summary(customer_acct, tickets_list):
+        for ticket in tickets_list:
+            ticket.patch_prize_image_base_url()
+            Customer.update_ticket_into_lucky_draw_ticket_summary(customer_acct, ticket.to_configuration())
     @classmethod
     def get_by_reference_code(cls, reference_code, merchant_acct):
         return cls.query(ndb.AND(cls.reference_code==reference_code, cls.merchant_acct==merchant_acct.create_ndb_key())).get()
@@ -567,7 +646,17 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
         if is_membership_reward_has_been_given==False:
             customer_acct.entitled_membership_reward_summary  = entitled_membership_reward_summary
             customer_acct.put()
-
+    
+    def update_after_removed_voucher(self, removed_voucher):
+        entitled_voucher_summary = self.entitled_voucher_summary
+        update_customer_entiteld_voucher_summary_after_removed_voucher(entitled_voucher_summary, removed_voucher)
+        self.put()
+        
+    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()    
+    
 class CustomerMembership(BaseNModel, DictModel):
     '''
     parent is Customer

{trex-model-1.0.4 → trex-model-1.0.7}/trexmodel/models/datastore/fb_subsriber_models.py

@@ -6,7 +6,6 @@ Created on 23 Oct 2020
 
 from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
-from trexlib.utils.common.cache_util import cache
 
 import logging  
 from trexlib.utils.security_util import generate_user_id, hash_password

{trex-model-1.0.4 → trex-model-1.0.7}/trexmodel/models/datastore/loyalty_models.py

@@ -31,7 +31,8 @@ class LoyaltyDeviceSetting(BaseNModel,DictModel):
     activated_datetime      = ndb.DateTimeProperty(required=False)
     testing                 = ndb.BooleanProperty(required=False, default=False)
     
-    dict_properties = ['device_name', 'activation_code', 'device_id', 'activated', 'assigned_outlet_key', 'activated_datetime', 'created_datetime']
+    dict_properties = ['device_name', 'activation_code', 'device_id', 'activated', 'assigned_outlet_key', 
+                       'activated_datetime', 'created_datetime']
     
     @property
     def is_test_setting(self):