trex-model 1.3.5__tar.gz → 1.3.7__tar.gz

{trex-model-1.3.5/trex_model.egg-info → trex-model-1.3.7}/PKG-INFO

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

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

{trex-model-1.3.5 → trex-model-1.3.7/trex_model.egg-info}/PKG-INFO

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

{trex-model-1.3.5 → trex-model-1.3.7}/trex_model.egg-info/SOURCES.txt

@@ -40,6 +40,7 @@ trexmodel/models/datastore/prepaid_models.py
 trexmodel/models/datastore/product_models.py
 trexmodel/models/datastore/program_models.py
 trexmodel/models/datastore/rating_models.py
+trexmodel/models/datastore/recruit_models.py
 trexmodel/models/datastore/redeem_models.py
 trexmodel/models/datastore/redemption_catalogue_models.py
 trexmodel/models/datastore/reward_model_helpers.py

{trex-model-1.3.5 → trex-model-1.3.7}/trexmodel/models/datastore/customer_model_helpers.py

@@ -186,14 +186,19 @@ def update_customer_entiteld_voucher_summary_with_new_voucher_info(customer_enti
     voucher_summary         = customer_entitled_voucher_summary.get(merchant_voucher_key)
     latest_expiry_date_str  = None
     if redeem_info_list and len(redeem_info_list)>0:
-        latest_expiry_date  = get_latest_expiry_date(redeem_info_list)
-        latest_expiry_date_str = datetime.strftime(latest_expiry_date, '%d-%m-%Y')
+        
+        latest_expiry_date      = get_latest_expiry_date(redeem_info_list)
+        latest_expiry_date_str  = datetime.strftime(latest_expiry_date, '%d-%m-%Y')
+    
+    logger.debug('New entitled voucher latest_expiry_date_str=%s', latest_expiry_date_str)
     
     if voucher_summary:
+        logger.debug('Found voucher summary, thus going to add new redeem info')
         customer_entitled_voucher_summary[merchant_voucher_key]['redeem_info_list'].extend(redeem_info_list)
         customer_entitled_voucher_summary[merchant_voucher_key]['amount'] = len(customer_entitled_voucher_summary[merchant_voucher_key]['redeem_info_list'])
           
     else:
+        logger.debug('Not found voucher summary, thus going to create it')
         voucher_summary = {
                             'key'               : merchant_voucher_key,
                             'label'             : voucher_label,

{trex-model-1.3.5 → trex-model-1.3.7}/trexmodel/models/datastore/customer_models.py

@@ -242,7 +242,9 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
         
     @staticmethod
     def remove_ticket_from_lucky_draw_ticket_summary(customer_acct, removed_draw_ticket):
+        logger.debug('removed_draw_ticket=%s', 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
         

trex-model-1.3.7/trexmodel/models/datastore/recruit_models.py

@@ -0,0 +1,47 @@
+'''
+Created on 27 Mar 2024
+
+@author: jacklok
+'''
+
+from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
+from google.cloud import ndb
+from trexmodel.models.datastore.merchant_models import MerchantAcct, Outlet
+from trexmodel.models.datastore.user_models import User
+from trexmodel import conf
+from datetime import datetime, timedelta
+import logging
+from builtins import staticmethod
+
+logger = logging.getLogger('model')
+
+class RecruitBase(BaseNModel, DictModel):
+    name                        = ndb.StringProperty(required=True)
+    mobile_phone                = ndb.StringProperty(required=True)
+    email                       = ndb.StringProperty(required=True)
+    address                     = ndb.TextProperty(required=False)
+    submitted_datetime          = ndb.DateTimeProperty(required=True, auto_now=True)
+
+class CoFounderRecruit(RecruitBase):
+    involved_in_founding        = ndb.BooleanProperty(required=True)
+    founding_details            = ndb.TextProperty(required=False)
+    employment_time             = ndb.TextProperty(required=True)
+    skill                       = ndb.TextProperty(required=True)
+    linkedin_profile            = ndb.TextProperty(required=True)
+    
+    
+    @staticmethod
+    def create(name=None, mobile_phone=None, email=None, address=None, involved_in_founding=False,
+               founding_details=None, employment_time=None, skill=None, linkedin_profile=None):
+        CoFounderRecruit(
+            name                    = name,
+            mobile_phone            = mobile_phone,
+            email                   = email,
+            address                 = address,
+            involved_in_founding    = involved_in_founding,
+            founding_details        = founding_details,
+            employment_time         = employment_time,
+            skill                   = skill,
+            linkedin_profile        = linkedin_profile,
+            ).put()
+