subscriber client base code

client/core/apps/sms_credit_transfer.py

@@ -22,12 +22,12 @@
 from core.sms import sms
 from core.subscriber import subscriber
 from core.exceptions import SubscriberNotFound
-
+from core.denomination_store import DenominationStore
 
 config_db = config_database.ConfigDB()
 gt = gettext.translation("endaga", config_db['localedir'],
                          [config_db['locale'], "en_US"]).gettext
-
+ERROR_TRX = " error_transfer"
 
 def _init_pending_transfer_db():
     """Create the pending transfers table if it doesn't already exist."""
@@ -45,6 +45,13 @@ def _init_pending_transfer_db():
         # Make the DB world-writable.
         os.chmod(config_db['pending_transfer_db_path'], 0o777)
 
+def get_validity_days(amount):
+    denomination = DenominationStore()
+    validity_days = denomination.get_validity_days(amount)
+    if validity_days is None:
+        return None
+    else:
+        return validity_days[0]
 
 def process_transfer(from_imsi, to_imsi, amount):
     """Process a transfer request.
@@ -58,15 +65,77 @@ def process_transfer(from_imsi, to_imsi, amount):
       boolean indicating success
     """
     from_balance = int(subscriber.get_account_balance(from_imsi))
+    # Error when blocked or expired user tries to transfer credit
+    from_imsi_status = subscriber.status().get_account_status(
+        from_imsi)
+    to_imsi_status = subscriber.status().get_account_status(
+        from_imsi)
+    if from_imsi_status != 'active':
+        if from_imsi_status == 'active*':
+            status = 'is blocked'
+        else:
+            status = 'has no validity'
+        return False, ("Your account %s!" % status)
+    #  rare scenario
+    if to_imsi_status in ['recycle', 'recycle*']:
+        return False, ("%s doesn't exists" % to_imsi)
     # Error when user tries to transfer more credit than they have.
     if not from_balance or from_balance < amount:
-        return False, gt("Your account doesn't have sufficient funds for"
-                         " the transfer.")
+        return False, ("Your account doesn't have sufficient funds for the "
+                       "transfer.")
     # Error when user tries to transfer to a non-existent user.
     #       Could be 0!  Need to check if doesn't exist.
     if not to_imsi or (subscriber.get_account_balance(to_imsi) == None):
-        return False, gt("The number you're sending to doesn't exist."
-                         " Try again.")
+        return False, ("The number you're sending to doesn't exist. Try again."
+                       )
+    # Error when user tries to transfer more credit than network max balance
+    network_max_balance = int(config_db['network_max_balance'])
+    credit_limit = freeswitch_strings.humanize_credits(network_max_balance)
+    to_balance = int(subscriber.get_account_balance(to_imsi))
+    max_transfer = network_max_balance - to_balance
+    max_transfer_str = freeswitch_strings.humanize_credits(max_transfer)
+    from_num = subscriber.get_numbers_from_imsi(from_imsi)[0]
+    to_num = subscriber.get_numbers_from_imsi(to_imsi)[0]
+    max_attempts = config_db['network_mput']
+    if to_balance > network_max_balance:
+        attempts = subscriber.status().get_invalid_count(from_imsi)
+        block_info = " Attempts left %(left)s !" % {
+            'left': int(max_attempts) - (int(attempts) + 1)
+        }
+        reason = ("Top-up not allowed. Maximum balance "
+                  "limit crossed %(credit)s."
+                  ) % {'credit': credit_limit}
+        # For cloud
+        events.create_transfer_event(from_imsi, from_balance, from_balance,
+                                     reason + ERROR_TRX , from_num, to_num)
+
+        return False, reason + block_info + ERROR_TRX
+    elif (amount + to_balance) > network_max_balance:
+        # Mark this event for blocking
+        attempts = subscriber.status().get_invalid_count(from_imsi)
+        block_info = " Attempts left %(left)s !" % {
+            'left': int(max_attempts) - (int(attempts) + 1)
+        }
+        reason = ("Top-up not allowed. Maximum balance "
+                  "limit crossed %(credit)s. You can transfer upto "
+                  "%(transfer)s."
+                  ) % {'credit': credit_limit, 'transfer': max_transfer_str}
+        # For cloud
+        events.create_transfer_event(from_imsi, from_balance, from_balance,
+                                     reason + ERROR_TRX , from_num, to_num)
+        return False, reason + block_info + ERROR_TRX
+    # check top-up amount in denomination bracket
+    validity_days = get_validity_days(amount)
+    if validity_days is None:
+        attempts = subscriber.status().get_invalid_count(from_imsi)
+        block_info = " Attempts left %(left)s !" % {
+            'left': int(max_attempts) - (int(attempts) + 1)
+        }
+        reason = "Top-up not under denomination range."
+        # For cloud
+        events.create_transfer_event(from_imsi, from_balance, from_balance,
+                                     reason + ERROR_TRX , from_num, to_num)
+        return False, reason + block_info + ERROR_TRX
     # Add the pending transfer.
     code = ''
     for _ in range(int(config_db['code_length'])):
@@ -78,10 +147,11 @@ def process_transfer(from_imsi, to_imsi, amount):
     db.close()
     to_num = subscriber.get_numbers_from_imsi(to_imsi)[0]
     amount_str = freeswitch_strings.humanize_credits(amount)
-    response = gt("Reply to this message with %(code)s to confirm your"
-                  " transfer of %(amount)s to %(to_num)s. Code expires in ten"
-                  " minutes.") % {'code': code, 'amount': amount_str,
-                                  'to_num': to_num}
+    response = ("Reply to this message with %(code)s to confirm your transfer"
+                " of %(amount)s to %(to_num)s. Code expires in ten minutes."
+                ) % {
+        'code': code, 'amount': amount_str, 'to_num': to_num
+    }
     return True, response
 
 
@@ -120,6 +190,8 @@ def process_confirm(from_imsi, code):
         events.create_transfer_event(to_imsi, to_imsi_old_credit,
                                      to_imsi_new_credit, reason,
                                      from_number=from_num, to_number=to_num)
+        top_up_validity = subscriber.status().get_subscriber_validity(
+            to_imsi, get_validity_days(amount))
         subscriber.add_credit(to_imsi, str(int(amount)))
         # Humanize credit strings
         amount_str = freeswitch_strings.humanize_credits(amount)
@@ -129,9 +201,10 @@ def process_confirm(from_imsi, code):
                 from_imsi_new_credit)
         # Let the recipient know they got credit.
         message = gt("You've received %(amount)s credits from %(from_num)s!"
-                     " Your new balance is %(new_balance)s.") % {
+                     " Your new balance is %(new_balance)s.Your top-up "
+                     "validity is %(validity)s days.") % {
                      'amount': amount_str, 'from_num': from_num,
-                     'new_balance': to_balance_str}
+                     'new_balance': to_balance_str, 'validity': top_up_validity}
         sms.send(str(to_num), str(config_db['app_number']), str(message))
         # Remove this particular the transfer as it's no longer pending.
         db.execute("DELETE FROM pending_transfers WHERE code=?"
@@ -168,15 +241,23 @@ def handle_incoming(from_imsi, request):
                                  int(config_db['code_length']))
     confirm = confirm_command.match(request)
     _init_pending_transfer_db()
+    max_attempts = config_db['network_mput']
     if transfer:
         to_number, amount = transfer.groups()
         amount = freeswitch_strings.parse_credits(amount).amount_raw
         # Translate everything into IMSIs.
         try:
             to_imsi = subscriber.get_imsi_from_number(to_number)
-            _, resp = process_transfer(from_imsi, to_imsi, amount)
+            _, resp, = process_transfer(from_imsi, to_imsi, amount)
+            if not _ and ERROR_TRX in resp:
+                subscriber.status().set_invalid_count(from_imsi, max_attempts)
+                resp = resp.replace(ERROR_TRX, '')
+            else:
+                subscriber.status().reset_invalid_count(from_imsi)
+            resp = gt(resp)
         except SubscriberNotFound:
-            resp = gt("Invalid phone number: %(number)s" % {'number': to_number})
+            resp = gt(
+                "Invalid phone number: %(number)s" % {'number': to_number})
     elif confirm:
         # The code is the whole request, so no need for groups.
         code = request.strip()

client/core/checkin.py

@@ -92,6 +92,7 @@ def process_config(self, config_dict):
     @delta.DeltaCapable(section_ctx['subscribers'], True)
     def process_subscribers(self, data_dict):
         subscriber.process_update(data_dict)
+        subscriber.status(update=data_dict)
 
     def process_events(self, data_dict):
         """Process information about events.

client/core/interconnect.py

@@ -171,7 +171,9 @@ def checkin(self, timeout=11):
         # Add balance sync data
         status['subscribers'] = subscriber.get_subscriber_states(
             imsis=events.EventStore().modified_subs())
-
+        # Add subscriber status and validity sync data
+        status['subscriber_status'] = subscriber.status().get_subscriber_status(
+            imsis=events.EventStore().modified_subs())
         # Add delta protocol context (if available) to let server know,
         # client supports delta optimization & has a prior delta state
         if delta.DeltaProtocol.CTX_KEY not in status:  # just a precaution