feat(portaswitch): add offset request parameter to get_account_list API

Author: yakimenko73

app/bss/adapters/portaswitch/adapter.py

@@ -3,6 +3,8 @@
 from datetime import datetime, timedelta, UTC
 from typing import Final, Iterator, Optional, Dict
 
+from jose.exceptions import ExpiredSignatureError, JWTError
+
 from app_config import AppConfig
 from bss.adapters import BSSAdapter
 from bss.dbs import TiedKeyValue
@@ -24,10 +26,8 @@
     UserEventGroup,
     UserEventType,
 )
-from jose.exceptions import ExpiredSignatureError, JWTError
 from localization import get_translation_func
 from report_error import WebTritErrorException
-
 from .api import AccountAPI, AdminAPI
 from .config import Settings
 from .serializer import Serializer
@@ -171,7 +171,7 @@ def generate_otp(self, user: UserInfo) -> OTPCreateResponse:
                 raise WebTritErrorException(500, "Unknown error", code="external_api_issue")
 
             otp_id: str = generate_otp_id()
-            self._cached_otp_ids[otp_id] = i_account
+            self._cached_otp_ids[otp_id] = i_account, user.user_id
 
             env_info = self._admin_api.get_env_info()
 
@@ -204,12 +204,12 @@ def validate_otp(self, otp: OTPVerifyRequest) -> SessionInfo:
             # We need the otp_id only for storing the i_account.
             otp_id = safely_extract_scalar_value(otp.otp_id)
 
-            i_account: int = self._cached_otp_ids.get(otp_id)
+            (i_account, user_ref) = self._cached_otp_ids.get(otp_id, (None, None))
             if not i_account:
                 raise WebTritErrorException(status_code=404, error_message=f"Incorrect OTP code: {otp.code}")
 
             data: dict = self._admin_api.verify_otp(otp_token=otp.code)
-            if str(i_account) not in self._otp_settings.IGNORE_ACCOUNTS and not data["success"]:
+            if user_ref not in self._otp_settings.IGNORE_ACCOUNTS and not data["success"]:
                 raise WebTritErrorException(status_code=404, error_message=f"Incorrect OTP code: {otp.code}")
 
             self._cached_otp_ids.pop(otp_id)
@@ -407,7 +407,7 @@ def retrieve_contacts(self, session: SessionInfo, user: UserInfo) -> list[Contac
                         type.value for type in
                         self._portaswitch_settings.CONTACTS_SELECTING_EXTENSION_TYPES
                     }
-                    accounts = self._admin_api.get_account_list(i_customer)["account_list"]
+                    accounts = self._get_all_accounts_by_customer(i_customer)
                     account_to_aliases = {account["i_account"]: account.get("alias_list", []) for account in accounts}
                     extensions = self._admin_api.get_extensions_list(i_customer)["extensions_list"]
 
@@ -416,7 +416,7 @@ def retrieve_contacts(self, session: SessionInfo, user: UserInfo) -> list[Contac
                             aliases = [str(alias) for alias in account_to_aliases.get(ext.get("i_account"), [])]
                             contacts.append(Serializer.get_contact_info_by_extension(ext, aliases, i_account))
                 case PortaSwitchContactsSelectingMode.ACCOUNTS:
-                    accounts = self._admin_api.get_account_list(i_customer)["account_list"]
+                    accounts = self._get_all_accounts_by_customer(i_customer)
 
                     for account in accounts:
                         if (status := account.get("status")) and status == "blocked":
@@ -833,7 +833,7 @@ def _get_number_to_customer_accounts_map(self) -> dict[str, dict]:
         # Retrieve accounts for a pre-defined list of customers to map them to phonebook records
         with ThreadPoolExecutor(max_workers=10) as executor:
             future_to_customer_id = {
-                executor.submit(lambda cid: self._admin_api.get_account_list(int(cid))["account_list"],
+                executor.submit(lambda cid: self._get_all_accounts_by_customer(int(cid)),
                                 cid): cid
                 for cid in self._portaswitch_settings.CONTACTS_SELECTING_CUSTOMER_IDS
             }
@@ -848,3 +848,26 @@ def _get_number_to_customer_accounts_map(self) -> dict[str, dict]:
                         f"Error fetching accounts for customer {future_to_customer_id[future]}: {e}")
 
         return number_to_accounts
+
+    def _get_all_accounts_by_customer(self, i_customer: int) -> list[dict]:
+        """Fetch all accounts for a customer using pagination with offset until total is reached."""
+        all_accounts: list[dict] = []
+        offset = 0
+        limit = 1000
+
+        while True:
+            resp = self._admin_api.get_account_list(i_customer, limit, offset)
+            page = resp.get("account_list", []) if isinstance(resp, dict) else []
+            total = resp.get("total") if isinstance(resp, dict) else None
+
+            all_accounts.extend(page)
+
+            # Stop if we've reached the total or the page is shorter than limit
+            if total is not None and len(all_accounts) >= int(total):
+                break
+            if len(page) < limit:
+                break
+
+            offset += limit
+
+        return all_accounts

app/bss/adapters/portaswitch/api/admin.py

@@ -53,7 +53,7 @@ def refresh(self, user=None, auth_session=None):
         self.store_auth_session(session, self._api_user)
         return session
 
-    def get_account_list(self, i_customer: int):
+    def get_account_list(self, i_customer: int, limit: int = 1000, offset: int = 0):
         """Returns information about accounts related to the input i_customer.
 
         Parameters:
@@ -72,7 +72,9 @@ def get_account_list(self, i_customer: int):
                 "get_not_closed_accounts": 1,
                 "get_only_real_accounts": 1,
                 "get_statuses": 1,
-                "limit": 1000,
+                "get_total": 1,
+                "limit": limit,
+                "offset": offset,
                 "limit_alias_did_number_list": 100
             },
         )

app/bss/adapters/portaswitch/config.py

@@ -50,8 +50,10 @@ def decode_contacts_custom(cls, v: Union[List, str]) -> List[dict]:
     @field_validator("ALLOWED_ADDONS", mode='before')
     @classmethod
     def decode_allowed_addons(cls, v: Union[List, str]) -> List[str]:
-        v = str(v)
-        return [x.strip() for x in v.split(';')] if str(v) else v
+        if isinstance(v, int):
+            v = str(v)
+
+        return [x.strip() for x in v.split(';')] if isinstance(v, str) else v
 
     model_config = {
         "env_prefix": "PORTASWITCH_",
@@ -65,9 +67,11 @@ class OTPSettings(BaseSettings):
 
     @field_validator("IGNORE_ACCOUNTS", mode='before')
     @classmethod
-    def decode_ignore_accounts(cls, v: str) -> List[str]:
-        v = str(v)
-        return [str(x) for x in v.split(';')] if v else v
+    def decode_ignore_accounts(cls, v: Union[List, str]) -> List[str]:
+        if isinstance(v, int):
+            v = str(v)
+
+        return [x.strip() for x in v.split(';')] if isinstance(v, str) else v
 
     model_config = {
         "env_prefix": "OTP_",