fix: ussd help menu

correct return/exit codes are 00, 99

apps/cic-ussd/cic_ussd/account/tokens.py

@@ -14,7 +14,7 @@ from cic_ussd.account.chain import Chain
 from cic_ussd.cache import cache_data, cache_data_key, get_cached_data
 from cic_ussd.error import CachedDataNotFoundError, SeppukuError
 from cic_ussd.metadata.tokens import query_token_info, query_token_metadata
-from cic_ussd.processor.poller import wait_for_cache
+from cic_ussd.processor.util import wait_for_cache
 
 logg = logging.getLogger(__file__)
 

apps/cic-ussd/cic_ussd/data/sys/guardians.txt

@@ -1,9 +1 @@
-+254707628499
++254700000000
-+254757628885
-+254757628900
-+254792048646
-+254792048228
-+254792048490
-+254792048902
-+254727806655
-+254790079966

apps/cic-ussd/cic_ussd/data/sys/helpers.csv

@@ -1,19 +1,19 @@
-keys,en,sw,kam,kik,miji,luo,bor
+keys,en,sw
-female,Female,Mwanamke,Mundumuka,Mutumia,Muche,Dhako,Uwole
+female,Female,Mwanamke
-from,From,Kutoka kwa,Kuma kwa,Kuuma kwa,Ulaako,Kowuok kuom,ira
+from,From,Kutoka kwa
-male,Male,Mwanaume,Mundume,Mundurume,Mulume,Dichuo,Dir
+male,Male,Mwanaume
-not_provided,Not provided,Haijawekwa,Inenganitwe,Ndiikiritwo,Kaphana,Okoketi,Kes inkan
+not_provided,Not provided,Haijawekwa
-no_language_list,No language list,Hamna lugha ya kuchagua,Vai luka ya kusakwa,Hatire ruthiomi rwakucagurwo,Kahana luga irio orodeshwa,Onge dhok miyiero,Afaan chaguad injirt
+no_language_list,No language list,Hamna lugha ya kuchagua
-no_transaction_history,No transaction history,Hamna ripoti ya matumizi,Vai livoti ya utumii,Hatire riboti ya mahuthira,Kahana repoti ya mahumizi,Onge ripot mar tiyo,Odhuu jalkaban injirt
+no_transaction_history,No transaction history,Hamna ripoti ya matumizi
-no_tokens_list,No more Sarafu,Hamna sarafu zingine,Vai Sarafu ingi,Hatire Sarafu inge,Kahana Sarafu zaidi,Onge Sarafu moko,Sarafu dibii injirt
+no_tokens_list,No tokens to list,Hamna sarafu nyingine
-other,Other,Nyingine,Ingi,Inge,Nyinjine,Moko,Ta dibii
+other,Other,Nyingine
-received,Received,Ulipokea,Niwakwatie,Niuramukirire ,Hokera,Niyudo,Argat
+received,Received,Ulipokea
-sent,Sent,Ulituma,Niwatumie,Niuratumire,Humwa,Nioro,Ergan
+sent,Sent,Ulituma
-to,To,Kwa,Kwa,Hare,Kwa,Ne,Es
+to,To,Kwa
-guardians_list_header,Your PIN guards are:,PIN Walinzi uliowaongeza ni:,PIN Atetheesya ala wongelile ni:,Agiteri a PIN yaku ni:,PIN Aimirizi urioika ni:,PIN Jorit magi gin:,PIN Naam at korkorad:
+guardians_list_header,Your set guardians are:,Walinzi uliowaongeza ni:
-no_guardians_list,No PIN guardians set,Hamna PIN walinzi walioongezwa,Vai atetheesya mongelwa,Hartire agiteri meekeretwo,Kahana aimirizi adzoikwa,Onge jorit moketi,Nam an korkorad injirt
+no_guardians_list,No guardians set,Hamna walinzi walioongezwa
-error.no_phone_number_provided,No phone number was provided,Nambari ya simu haijawekwa,Namba ya simu inaikiwa,Namba ya thimu ndihianetwo,Kahana namba ya simu idzopewa,Namba mar simu okoketi,Namba simu kees inkaan
+error.no_phone_number_provided,No phone number was provided.,Namabari ya simu haijawekwa.
-error.no_matching_account,The number provided is not registered,Nambari uliyoweka haijasajiliwa,Namba ya simu ila wekiya ti mbandikithye,Namba iria wekera ndiandekithetwo,Namba idzopewa kaidzagwe kusajiliwa,Namba mar simu miketo pok ondiki,Namba ka at kekeet sajiil incab
+error.no_matching_account,The number provided is not registered.,Nambari uliyoweka haijasajiliwa.
-error.is_initiator,Phone number cannot be your own,Nambari yafaa kuwa tofauti na yako,Namba ya simu yaile ithiwa itavwanene na yaku,Namba ifatie gukorwo  ina utiganu na yaku,Namba yasimu kaidima kukala niyako,Namba onego obed mopogre gimari,Namba simu tete tau mal
+error.is_initiator,Phone number cannot be your own.,Nambari yafaa kuwa tofauti na yako.
-error.is_existent_guardian,This phone number is already added as a PIN guardian,Nambari hii tayari imeongezwa kama mlinzi wa nambari ya siri,Namba ii niyongeletwe tayari ta mutethesya wa kusovya pin,Namba ino niyongereirwo ta murugamereri ya namba ya thiri,Nambari ii yasimu yaikwa kare Muimirizi,Nambani oseketi kaka jarit,Namba tana yayu nam korkoradi taat
+error.is_existent_guardian,This phone number is is already added as a guardian.,Namabari hii tayari imeongezwa kama mlinzi wa nambari ya siri.
-error.is_not_existent_guardian,Phone number not set as PIN guardian,Nambari hii haijaongezwa kama mlinzi wa nambari ya PIN,Namba ii iyongeletwe ta mutethesya wa kusovya PIN,Namba ino ndiongereirwo ta  mugiteri wa PIN,Nambari ii yasimu kaiikika kugaluza PIN zda mwimirizi,Nambani pok omed kaka jarit,Namba simu ta nam korkorad indharan
+error.is_not_existent_guardian,Phone number not set as PIN reset guardian.,Nambari hii haijaongezwa kama mlinzi wa nambari ya siri.

apps/cic-ussd/cic_ussd/data/sys/sms.csv

@@ -1,7 +1,7 @@
-keys,en,sw,kam,kik,miji,luo,bor
+keys,en,sw
-account_successfully_created,You have been registered on Sarafu Network! To use dial *384*96# on Safaricom and *483*96# on other networks. For help %{support_phone},Umesajiliwa kwa Sarafu Network! Kutumia bonyeza *384*96# Safaricom ama *483*46# kwa utandao tofauti. Kwa Usaidizi %{support_phone},Niwayandikithya na Sarafu Network! Safaricom kuna namba ii *384*96#  mitandao ingi *483*96#. Utethyo ungi kuna %{support_phone},Niweyandekithia kwe Sarafu Network! Kuhuthira hihinya *384*96# he Safaricom na *483*46# he mitambo ingi Uteithio %{support_phone},Usajiliwa Sarafu Network! kuhumira hopya *384*96# Saf *483*96# mtandao mnjine. Kuvizwa %{support_phone},Osendiki e Sarafu Network! Kidwatiyogo to dii *384*96# Safaricom kata *483*46# e netwak mamoko. Kuom kony %{support_phone},Yaayu sirejestan Sarafu Network! Kuches *384*96# Safaricom *483*46# Airtel
+account_successfully_created,You have been registered on Sarafu Network! To use dial *384*96# on Safaricom and *483*96# on other networks. For help %{support_phone}.,Umesajiliwa kwa huduma ya Sarafu! Kutumia bonyeza *384*96# Safaricom ama *483*46# kwa utandao tofauti. Kwa Usaidizi %{support_phone}.
-received_tokens,Successfully received %{amount} %{token_symbol} from %{tx_sender_information} %{timestamp} to %{tx_recipient_information} Balance %{balance} %{token_symbol},Umepokea %{amount} %{token_symbol} kutoka kwa %{tx_sender_information} %{timestamp} kuendea %{tx_recipient_information} Salio %{balance} %{token_symbol},Niwakwata %{amount} %{token_symbol} kuma %{tx_sender_information} %{timestamp} kuvikia %{tx_recipient_information} Mbalansi %{balance} %{token_symbol},Wamukira %{amount} %{token_symbol} kuuma kwa %{tx_sender_information} %{timestamp} to %{tx_recipient_information} Watigaria %{balance} %{token_symbol},Uphokera %{amount} %{token_symbol} kula %{tx_sender_information} %{timestamp} Kwenda %{tx_recipient_information}. Sazoro %{balance} %{token_symbol},Iyudo %{amount} %{token_symbol} kowuok kuom %{tx_sender_information} %{timestamp} odhi ne %{tx_recipient_information}. Dong mari en %{balance} %{token_symbol},Yaargat %{amount} %{token_symbol} ira %{tx_sender_information} %{timestamp} Es %{tx_recipient_information} Balansi %{balance} %{token_symbol}
+received_tokens,Successfully received %{amount} %{token_symbol} from %{tx_sender_information} %{timestamp} to %{tx_recipient_information}. New balance is %{balance} %{token_symbol}.,Umepokea %{amount} %{token_symbol} kutoka kwa %{tx_sender_information} %{timestamp} ikapokewa na %{tx_recipient_information}. Salio lako ni %{balance} %{token_symbol}.
-sent_tokens,Successfully sent %{amount} %{token_symbol} to %{tx_recipient_information} %{timestamp} from %{tx_sender_information} Balance %{balance} %{token_symbol},Umetuma %{amount} %{token_symbol} kwa %{tx_recipient_information} %{timestamp} kutoka kwa %{tx_sender_information} Salio %{balance} %{token_symbol},Niwatuma %{amount} %{token_symbol} kwa %{tx_recipient_information} %{timestamp} kuma %{tx_sender_information} Mbalansi %{balance} %{token_symbol}.,Watuma  %{amount} %{token_symbol} kwe %{tx_recipient_information} %{timestamp} kuuma %{tx_sender_information} Watigaria %{balance} %{token_symbol},Uhuma %{amount} %{token_symbol} kwa %{tx_recipient_information} %{timestamp} kula %{tx_sender_information} Sazoro %{balance} %{token_symbol},Ioro %{amount} %{token_symbol} ne %{tx_recipient_information} %{timestamp} kowuok kuom %{tx_sender_information}. Dong mari en %{balance} %{token_symbol},yaergat %{amount} %{token_symbol} Es %{tx_recipient_information} %{timestamp} ira %{tx_sender_information} Balansi hareetin %{balance} %{token_symbol}
+sent_tokens,Successfully sent %{amount} %{token_symbol} to %{tx_recipient_information} %{timestamp} from %{tx_sender_information}. New balance is %{balance} %{token_symbol}.,Umetuma %{amount} %{token_symbol} kwa %{tx_recipient_information} %{timestamp} kutoka kwa %{tx_sender_information}. Salio lako ni %{balance} %{token_symbol}.
-terms,By using the service you agree to the terms and conditions at http://grassecon.org/tos,Kwa kutumia hii huduma umekubali sheria na masharti yafuatayo http://grassecon.org/tos,Kwa kutumia mutandao uu niwetikilana na miyao na masharti ma http://grassecon.org/tos,"Kuhuthira mitambo ino , niuraetekania na mawatho na mutaratara wa http://grassecon.org/tos","Kuhumira huduma,Ukubali sheria na malagizo http://grassecon.org/tos ",Kuom tiyo gi huduma ni iyie chike kod weche mantie http://grassecon.org/tos,Oja service tun tumiith yaayuu kubalt one chuf at http://grassecon.org/tos
+terms,"By using the service, you agree to the terms and conditions at http://grassecon.org/tos","Kwa kutumia hii huduma, umekubali sheria na masharti yafuatayo http://grassecon.org/tos"
-upsell_unregistered_recipient,%{tx_sender_information} tried to send you %{token_symbol}. Dial *384*96# on Safaricom and *483*96# on others For help %{support_phone},%{tx_sender_information} amejaribu kutuma %{token_symbol} na hujasajili. Bonyeza*384*96# Saf  au*483*46# kwa mitandao tofauti. Usaidizi %{support_phone},%{tx_sender_information} niwatata kuutumia %{token_symbol} lakini ndwimwandikithye. Safaricom kuna *384*96# laini ingi *483*96# Utethyo %{support_phone},%{tx_sender_information} ekugeretie gugutumira %{token_symbol} no ndeyandikithetie. Hihinya *384*96# he Safaricom na *483*96# mitambo ingi. Uteithio %{support_phone},%{tx_sender_information} Yuhuma %{token_symbol} Kudzasajiliwa. Humira hopya *384*96# Safaricom au *483*96# mtandao mnjine. Kuvizwa %{support_phone},%{tx_sender_information} otemo oro ni %{token_symbol} to pok ondiki. Tiyo go dii *384*96# Safaricom gi *483*96# e netwak mamoko. E kony %{support_phone},%{tx_sender_information} yaa si ergu jariib %{token_symbol} ammo atin insajilan.Tumiitu kuches *384*96# Safaricom *483*96# dibii Qarqars %{support_phone}
+upsell_unregistered_recipient,%{tx_sender_information} tried to send you %{token_symbol} but you are not registered. To use dial *384*96# on Safaricom and *483*96# on other networks. For help %{support_phone}.,%{tx_sender_information} amejaribu kukutumia %{token_symbol} lakini hujasajili. Kutumia bonyeza *384*96# Safaricom ama *483*46# kwa utandao tofauti. Kwa Usaidizi %{support_phone}.
-pin_reset_initiated,%{pin_initiator} has sent a request to initiate your PIN reset,%{pin_initiator} ametuma ombi la kubadilisha PIN yako,%{pin_initiator} niwatuma wendi waku wa kwambiisya kusovya PIN yaku,%{pin_initiator}  Niatuma ihoya ria guchengia PIN yaku,%{pin_initiator} yuhuma voyo kurekebisha piniyo.,%{pin_initiator} ooro kwayo mar loko nambani mopondo,%{pin_initiator} pin Tate badilishadu feet
+pin_reset_initiated,%{pin_initiator} has sent a request to initiate your PIN reset.,%{pin_initiator} ametuma ombi la kubadilisha PIN yako.

apps/cic-ussd/cic_ussd/error.py

@@ -52,5 +52,4 @@ class UnknownUssdRecipient(Exception):
     """Raised when a recipient of a transaction is not known to the ussd application."""
 
 
-class MaxRetryReached(Exception):
+
-    """Raised when the maximum number of retries defined for polling for the availability of a resource."""

apps/cic-ussd/cic_ussd/processor/menu.py

@@ -31,8 +31,7 @@ from cic_ussd.cache import cache_data_key, cache_data, get_cached_data
 from cic_ussd.db.models.account import Account
 from cic_ussd.metadata import PersonMetadata
 from cic_ussd.phone_number import Support
-from cic_ussd.processor.poller import wait_for_session_data
+from cic_ussd.processor.util import parse_person_metadata, ussd_menu_list, wait_for_session_data
-from cic_ussd.processor.util import parse_person_metadata, ussd_menu_list
 from cic_ussd.session.ussd_session import save_session_data
 from cic_ussd.state_machine.logic.language import preferred_langauge_from_selection
 from cic_ussd.translation import translation_for

apps/cic-ussd/cic_ussd/processor/poller.py

@@ -1,104 +0,0 @@
-# standard imports
-import logging
-import time
-from queue import Queue
-from typing import Callable, Dict, Optional, Tuple, Union
-
-# external imports
-from cic_types.condiments import MetadataPointer
-
-# local imports
-from cic_ussd.cache import cache_data_key, get_cached_data
-from cic_ussd.error import MaxRetryReached
-
-
-logg = logging.getLogger()
-
-
-# adapted from https://github.com/justiniso/polling/blob/master/polling.py
-# opted not to use the package to reduce dependency
-def poller(args: Optional[Tuple],
-           interval: int,
-           kwargs: Optional[Dict],
-           max_retry: int,
-           target: Callable[..., Union[Dict, str]]):
-    """"""
-    collected_values: list = []
-    expected_value = None
-    tries = 0
-
-    while True:
-        if tries >= max_retry:
-            raise MaxRetryReached(collected_values, expected_value)
-        try:
-            if args:
-                value = target(*args)
-            elif kwargs:
-                value = target(**kwargs)
-            else:
-                value = target()
-            expected_value = value
-        except () as error:
-            expected_value = error
-        else:
-            if bool(value) or value == {}:
-                logg.debug(f'Resource: {expected_value} now available.')
-                break
-        collected_values.append(expected_value)
-        logg.debug(f'Collected values are: {collected_values}')
-        tries += 1
-        time.sleep(interval)
-
-
-def wait_for_cache(identifier: Union[list, bytes],
-                   resource_name: str,
-                   salt: MetadataPointer,
-                   interval: int = 1,
-                   max_retry: int = 5):
-    """
-    :param identifier:
-    :type identifier:
-    :param interval:
-    :type interval:
-    :param resource_name:
-    :type resource_name:
-    :param salt:
-    :type salt:
-    :param max_retry:
-    :type max_retry:
-    :return:
-    :rtype:
-    """
-    key: str = cache_data_key(identifier=identifier, salt=salt)
-    logg.debug(f'Polling for resource: {resource_name} at: {key} every: {interval} second(s) for {max_retry} seconds.')
-    poller(args=(key,), interval=interval, kwargs=None, max_retry=max_retry, target=get_cached_data)
-
-
-def wait_for_session_data(resource_name: str,
-                          session_data_key: str,
-                          ussd_session: dict,
-                          interval: int = 1,
-                          max_retry: int = 5):
-    """
-    :param interval:
-    :type interval:
-    :param resource_name:
-    :type resource_name:
-    :param session_data_key:
-    :type session_data_key:
-    :param ussd_session:
-    :type ussd_session:
-    :param max_retry:
-    :type max_retry:
-    :return:
-    :rtype:
-    """
-    # poll for data element first
-    logg.debug(f'Data poller with max retry at: {max_retry}. Checking for every: {interval} seconds.')
-    poller(args=('data',), interval=interval, kwargs=None, max_retry=max_retry, target=ussd_session.get)
-
-    # poll for session data element
-    get_session_data = ussd_session.get('data').get
-    logg.debug(f'Session data poller for: {resource_name} with max retry at: {max_retry}. Checking for every: {interval} seconds.')
-    poller(args=(session_data_key,), interval=interval, kwargs=None, max_retry=max_retry, target=get_session_data)
-

apps/cic-ussd/cic_ussd/processor/util.py

@@ -102,3 +102,77 @@ def ussd_menu_list(fallback: str, menu_list: list, split: int = 3) -> List[str]:
         except IndexError:
             menu_list_reprs.append(fallback)
     return menu_list_reprs
+
+
+def wait_for_cache(identifier: Union[list, bytes], resource_name: str, salt: MetadataPointer, interval: int = 1, max_retry: int = 5):
+    """
+    :param identifier:
+    :type identifier:
+    :param interval:
+    :type interval:
+    :param resource_name:
+    :type resource_name:
+    :param salt:
+    :type salt:
+    :param max_retry:
+    :type max_retry:
+    :return:
+    :rtype:
+    """
+    key = cache_data_key(identifier=identifier, salt=salt)
+    resource = get_cached_data(key)
+    counter = 0
+    while resource is None:
+        logg.debug(f'Waiting for: {resource_name} at: {key}. Checking after: {interval} ...')
+        time.sleep(interval)
+        counter += 1
+        resource = get_cached_data(key)
+        if resource is not None:
+            logg.debug(f'{resource_name} now available.')
+            break
+        else:
+            if counter == max_retry:
+                logg.debug(f'Could not find: {resource_name} within: {max_retry}')
+                break
+
+
+def wait_for_session_data(resource_name: str, session_data_key: str, ussd_session: dict, interval: int = 1, max_retry: int = 5):
+    """
+    :param interval:
+    :type interval:
+    :param resource_name:
+    :type resource_name:
+    :param session_data_key:
+    :type session_data_key:
+    :param ussd_session:
+    :type ussd_session:
+    :param max_retry:
+    :type max_retry:
+    :return:
+    :rtype:
+    """
+    data = ussd_session.get('data')
+    data_poller = 0
+    while not data:
+        logg.debug(f'Waiting for data object on ussd session: {ussd_session.get("external_session_id")}')
+        logg.debug(f'Data poller at: {data_poller}. Checking again after: {interval} secs...')
+        time.sleep(interval)
+        data_poller += 1
+        if data:
+            logg.debug(f'Data object found, proceeding to poll for: {session_data_key}')
+            break
+    if data:
+        session_data_poller = 0
+        session_data = data.get(session_data_key)
+        while not session_data_key:
+            logg.debug(
+                f'Session data poller at: {data_poller} with max retry at: {max_retry}. Checking again after: {interval} secs...')
+            time.sleep(interval)
+            session_data_poller += 1
+
+            if session_data:
+                logg.debug(f'{resource_name} now available.')
+                break
+
+            elif session_data_poller >= max_retry:
+                logg.debug(f'Could not find data object within: {max_retry}')

apps/cic-ussd/cic_ussd/state_machine/logic/language.py

@@ -11,7 +11,7 @@ from sqlalchemy.orm.session import Session
 # local imports
 from cic_ussd.cache import cache_data_key, get_cached_data
 from cic_ussd.db.models.account import Account
-from cic_ussd.processor.poller import wait_for_cache, wait_for_session_data
+from cic_ussd.processor.util import wait_for_cache, wait_for_session_data
 from cic_ussd.session.ussd_session import save_session_data
 from cic_ussd.translation import Languages
 

apps/cic-ussd/cic_ussd/state_machine/logic/pin.py

@@ -15,7 +15,7 @@ from cic_ussd.db.models.account import Account
 from cic_ussd.db.models.base import SessionBase
 from cic_ussd.db.enum import AccountStatus
 from cic_ussd.encoder import create_password_hash, check_password_hash
-from cic_ussd.processor.poller import wait_for_session_data
+from cic_ussd.processor.util import wait_for_session_data
 from cic_ussd.session.ussd_session import create_or_update_session, persist_ussd_session
 
 

apps/cic-ussd/cic_ussd/state_machine/logic/tokens.py

@@ -7,7 +7,7 @@ from sqlalchemy.orm.session import Session
 # local imports
 from cic_ussd.account.tokens import set_active_token
 from cic_ussd.db.models.account import Account
-from cic_ussd.processor.poller import wait_for_session_data
+from cic_ussd.processor.util import wait_for_session_data
 from cic_ussd.session.ussd_session import save_session_data
 
 

apps/cic-ussd/cic_ussd/tasks/callback_handler.py

@@ -15,7 +15,7 @@ from cic_ussd.cache import Cache, cache_data, cache_data_key, get_cached_data
 from cic_ussd.account.chain import Chain
 from cic_ussd.db.models.base import SessionBase
 from cic_ussd.db.models.account import Account
-from cic_ussd.processor.poller import wait_for_cache
+from cic_ussd.processor.util import wait_for_cache
 from cic_ussd.account.statement import filter_statement_transactions
 from cic_ussd.account.transaction import transaction_actors
 from cic_ussd.account.tokens import (collate_token_metadata,

apps/cic-ussd/tests/cic_ussd/processor/test_poller.py

@@ -1,69 +0,0 @@
-# standard imports
-import logging
-import time
-from queue import Queue
-
-# external imports
-import pytest
-from cic_types.condiments import MetadataPointer
-
-# local imports
-from cic_ussd.cache import cache_data, cache_data_key, get_cached_data
-from cic_ussd.error import MaxRetryReached
-from cic_ussd.processor.poller import poller, wait_for_cache, wait_for_session_data
-
-# test imports
-
-
-def test_poller(activated_account, caplog, init_cache, token_symbol):
-    caplog.set_level(logging.DEBUG)
-    identifier = bytes.fromhex(activated_account.blockchain_address)
-    key = cache_data_key(identifier, MetadataPointer.TOKEN_ACTIVE)
-    with pytest.raises(MaxRetryReached) as error:
-        interval = 1
-        max_retry = 3
-        collected_values = [None, None, None]
-        poller(args=(key,), interval=interval, kwargs=None, max_retry=max_retry, target=get_cached_data)
-    assert str(error.value) == str(MaxRetryReached(collected_values, None))
-    cache_data(key, token_symbol)
-    poller(args=(key,), interval=interval, kwargs=None, max_retry=max_retry, target=get_cached_data)
-    assert f'Resource: {token_symbol} now available.' in caplog.text
-
-
-def test_wait_for_cache(activated_account, caplog, init_cache, token_symbol):
-    caplog.set_level(logging.DEBUG)
-    identifier = bytes.fromhex(activated_account.blockchain_address)
-    key = cache_data_key(identifier, MetadataPointer.TOKEN_ACTIVE)
-    cache_data(key, token_symbol)
-    interval = 1
-    max_retry = 3
-    resource_name = 'Active Token'
-    wait_for_cache(identifier, resource_name, MetadataPointer.TOKEN_ACTIVE, interval, max_retry)
-    assert f'Polling for resource: {resource_name} at: {key} every: {interval} second(s) for {max_retry} seconds.' in caplog.text
-
-
-def test_wait_for_session_data(activated_account, caplog, generic_ussd_session):
-    caplog.set_level(logging.DEBUG)
-    generic_ussd_session.__delitem__('data')
-    interval = 1
-    max_retry = 3
-    collected_values = [None, None, None]
-    resource_name = 'Foo Data'
-    session_data_key = 'foo'
-    with pytest.raises(MaxRetryReached) as error:
-        wait_for_session_data(resource_name, session_data_key, generic_ussd_session, interval, max_retry)
-    assert str(error.value) == str(MaxRetryReached(collected_values, None))
-    assert f'Data poller with max retry at: {max_retry}. Checking for every: {interval} seconds.' in caplog.text
-    generic_ussd_session['data'] = {}
-    with pytest.raises(MaxRetryReached) as error:
-        collected_values = [None, None, None]
-        wait_for_session_data(resource_name, session_data_key, generic_ussd_session, interval, max_retry)
-    assert f'Data poller with max retry at: {max_retry}. Checking for every: {interval} seconds.' in caplog.text
-    assert f'Session data poller for: {resource_name} with max retry at: {max_retry}. Checking for every: {interval} seconds.' in caplog.text
-    assert str(error.value) == str(MaxRetryReached(collected_values, None))
-    expected_value = 'bar'
-    generic_ussd_session['data'] = {'foo': expected_value}
-    wait_for_session_data(resource_name, session_data_key, generic_ussd_session, interval, max_retry)
-    assert f'Data poller with max retry at: {max_retry}. Checking for every: {interval} seconds.' in caplog.text
-    assert f'Session data poller for: {resource_name} with max retry at: {max_retry}. Checking for every: {interval} seconds.' in caplog.text
-    assert f'Resource: {expected_value} now available.' in caplog.text

apps/cic-ussd/tests/cic_ussd/test_notifications.py

@@ -9,7 +9,7 @@ from cic_ussd.notifications import Notifier
 
 @pytest.mark.parametrize("key, preferred_language, recipient, expected_message", [
     ("ussd.exit", "en", "+254712345678", "END Thank you for using the service."),
-    ("ussd.exit", "sw", "+254712345678", "END Asante kwa kutumia huduma")
+    ("ussd.exit", "sw", "+254712345678", "END Asante kwa kutumia huduma.")
 ])
 def test_send_sms_notification(celery_session_worker,
                                expected_message,

apps/cic-ussd/tests/cic_ussd/test_translation.py

@@ -17,5 +17,5 @@ def test_translation_for(set_locale_files):
         key='ussd.exit_invalid_request',
         preferred_language='sw'
     )
-    assert swahili_translation == 'END Chaguo si sahihi'
+    assert swahili_translation == 'END Chaguo si sahihi.'
     assert english_translation == 'END Invalid request.'