diff --git a/orchestration/sharepoint_renamer_orchestrator.py b/orchestration/sharepoint_renamer_orchestrator.py index 84a4b62d7..15a2bd081 100644 --- a/orchestration/sharepoint_renamer_orchestrator.py +++ b/orchestration/sharepoint_renamer_orchestrator.py @@ -87,21 +87,26 @@ class SharepointRenamerOrchestrator: ) for row in reader: - uprn = row["UPRN"].strip() - address = row["Address"].strip() - postcode = row["Postcode"].strip() - for root in roots: - folder_path = ( - f"{root}/{address}, {postcode}" - f"/{SharepointSubfolders.ASSESSMENT.value}/{ASSESSMENT_SUBFOLDER}" - ) - if self._process_folder(folder_path, uprn, address, postcode): - break - else: - logger.warning( - f"Missing folder for UPRN {uprn} in any root: " - f"{address}, {postcode}" - ) + self._process_row( + roots, + uprn=row["UPRN"].strip(), + address=row["Address"].strip(), + postcode=row["Postcode"].strip(), + ) + + def _process_row( + self, roots: list[str], uprn: str, address: str, postcode: str + ) -> None: + for root in roots: + folder_path = ( + f"{root}/{address}, {postcode}" + f"/{SharepointSubfolders.ASSESSMENT.value}/{ASSESSMENT_SUBFOLDER}" + ) + if self._process_folder(folder_path, uprn, address, postcode): + return + logger.warning( + f"Missing folder for UPRN {uprn} in any root: {address}, {postcode}" + ) def _process_folder( self, folder_path: str, uprn: str, address: str, postcode: str