ms-salesforce-api 2.24.0.dev5__tar.gz → 3.0.0__tar.gz

{ms_salesforce_api-2.24.0.dev5 → ms_salesforce_api-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: ms-salesforce-api
-Version: 2.24.0.dev5
+Version: 3.0.0
 Summary: Python library used to extract data from Salesforce API and migrate it to Bigquery and Postgres.
 Author: Making Science
 Requires-Python: >=3.8.1,<4.0.0

{ms_salesforce_api-2.24.0.dev5 → ms_salesforce_api-3.0.0}/ms_salesforce_api/salesforce/api/account/dto/AccountDTO.py

@@ -327,9 +327,10 @@ class AccountDTO(object):
             owner_email=normalize_value(_get_owner_email()),
             type=normalize_value(record["Type"]),
             industry=normalize_value(record["Industry"]),
-            
             risk_assessment=normalize_value(record["Risk_Assessment__c"]),
-            risk_assessment_date=normalize_value(record["Risk_Assessment_Date__c"]),
+            risk_assessment_date=normalize_value(
+                record["Risk_Assessment_Date__c"]
+            ),
         )
 
     def to_dict(self):

{ms_salesforce_api-2.24.0.dev5 → ms_salesforce_api-3.0.0}/ms_salesforce_api/salesforce/api/opportunity/__init__.py

@@ -37,8 +37,7 @@ class Opportunity(SalesforceQueryExecutor):
             return []
 
         opportunities = [
-            OpportunityDTO.from_salesforce_record(record)
-            for record in data
+            OpportunityDTO.from_salesforce_record(record) for record in data
         ]
         opportunities_list = list(opportunities)
 

{ms_salesforce_api-2.24.0.dev5 → ms_salesforce_api-3.0.0}/ms_salesforce_api/salesforce/api/opportunity/dto/OpportunityDTO.py

@@ -204,7 +204,7 @@ class OpportunityDTO(object):
         created_by,
         last_modified_by,
         finance_contact,
-        convertAmount,
+        converted_amount_eur,
         project_code,
         google_drive_link,
         project_status,
@@ -286,7 +286,7 @@ class OpportunityDTO(object):
         self.created_by = created_by
         self.last_modified_by = last_modified_by
         self.finance_contact = finance_contact
-        self.convertAmount = convertAmount
+        self.converted_amount_eur = converted_amount_eur
         self.project_code = project_code
         self.google_drive_link = google_drive_link
         self.project_status = project_status
@@ -380,6 +380,16 @@ class OpportunityDTO(object):
             except (KeyError, TypeError):
                 return ""
 
+        def _get_convert_amount():
+            try:
+                value = record["convertAmount"]
+                clean_value = value.replace("EUR", "")
+                clean_value = clean_value.replace(",", "")
+
+                return float(clean_value)
+            except (KeyError, TypeError, ValueError):
+                return None
+
         opportunity_line_items = record.get("OpportunityLineItems", {})
         if opportunity_line_items and isinstance(opportunity_line_items, dict):
             line_items_records = record.get("OpportunityLineItems", {}).get(
@@ -478,7 +488,9 @@ class OpportunityDTO(object):
                 record.get("Servicios_Asociados__c", "")
             ),
             stage_name=normalize_value(record.get("StageName", "")),
-            start_date=normalize_value(record.get("DT_ProjectStartDate__c", "")),
+            start_date=normalize_value(
+                record.get("DT_ProjectStartDate__c", "")
+            ),
             tier_short=normalize_value(record.get("Tier_Short__c", "")),
             total_opportunity_quantity=normalize_value(
                 record.get("TotalOpportunityQuantity", "")
@@ -507,9 +519,8 @@ class OpportunityDTO(object):
             created_by=_get_created_by(),
             last_modified_by=_get_last_modified_by(),
             finance_contact=record["MAIL_FinanceContact__c"],
-            convertAmount=record["convertAmount"],
+            converted_amount_eur=_get_convert_amount(),
             project_code=record["FRM_ProjectCode__c"],
-            
             google_drive_link=record["FRM_GoogleDriveLink__c"],
             project_status=record["PCK_ProjectStatus__c"],
             pck_division=record["PCK_Division__c"],
@@ -593,7 +604,7 @@ class OpportunityDTO(object):
             "created_by": self.created_by,
             "last_modified_by": self.last_modified_by,
             "finance_contact": self.finance_contact,
-            "convertAmount": self.convertAmount,
+            "converted_amount_eur": self.converted_amount_eur,
             "project_code": self.project_code,
             "google_drive_link": self.google_drive_link,
             "project_status": self.project_status,
@@ -601,5 +612,4 @@ class OpportunityDTO(object):
             "out_of_report": self.out_of_report,
             "billing_info": self.billing_info,
             "parent_opportunity": self.parent_opportunity,
-            
         }

{ms_salesforce_api-2.24.0.dev5 → ms_salesforce_api-3.0.0}/ms_salesforce_api/salesforce/api/opportunity/export_data/Bigquery.py

@@ -97,12 +97,12 @@ class BigQueryExporter:
                 "created_by": "STRING",
                 "last_modified_by": "STRING",
                 "finance_contact": "STRING",
-                "convertAmount": "STRING",
+                "converted_amount_eur": "FLOAT",
                 "project_code": "STRING",
                 "google_drive_link": "STRING",
                 "project_status": "STRING",
                 "pck_division": "STRING",
-                "out_of_report": "STRING",
+                "out_of_report": "BOOLEAN",
                 "billing_info": "STRING",
                 "parent_opportunity": "STRING",
             },

ms_salesforce_api-3.0.0/ms_salesforce_api/salesforce/api/project/__init__.py

@@ -0,0 +1,101 @@
+import logging
+from concurrent.futures import ThreadPoolExecutor
+
+from ms_salesforce_api.salesforce.api.project.constants import (
+    DEFAULT_PROJECT_BILLING_LINE_QUERY,
+    DEFAULT_PROJECT_OPPORTUNITY_QUERY,
+)
+from ms_salesforce_api.salesforce.api.project.dto.BillingLineDTO import (
+    BillingLineDTO,
+)
+from ms_salesforce_api.salesforce.api.project.dto.OpportunityDTO import (
+    OpportunityDTO,
+)
+from ms_salesforce_api.salesforce.SalesforceQueryExecutor import (
+    SalesforceQueryExecutor,
+)
+
+logging.basicConfig(
+    level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s"
+)
+
+MAX_PROJECT_IDS_PER_QUERY = 200
+
+
+class Project(SalesforceQueryExecutor):
+    def fetch_billing_lines(self, project_ids):
+        billing_lines = []
+        query = DEFAULT_PROJECT_BILLING_LINE_QUERY.format(
+            project_id="','".join(project_ids)
+        )
+
+        data = self.fetch_data(query)
+        if data is not None:
+            billing_lines.extend(data)
+
+        return billing_lines
+
+    def get_batches(self, lst, n):
+        """Yield successive n-sized chunks from lst."""
+        for i in range(0, len(lst), n):
+            yield lst[i : i + n]  # noqa: E203
+
+    def get_all(
+        self,
+        last_executed_at: str = None,
+        query: str = DEFAULT_PROJECT_OPPORTUNITY_QUERY,
+        format: str = "json",
+    ):
+        if last_executed_at:
+            query = query + f"WHERE CreatedDate > {last_executed_at}"
+
+        data = self.fetch_data(query)
+        if data is None:
+            logging.error(
+                "[ERROR - SalesforceAPI]: No projects data return from Salesforce API"  # noqa: E501
+            )
+            return []
+
+        opportunities = {
+            record["Id"]: OpportunityDTO.from_salesforce_record(record)
+            for record in data
+        }
+
+        project_ids = list(opportunities.keys())
+
+        with ThreadPoolExecutor(max_workers=10) as executor:
+            for project_id_batch in self.get_batches(
+                project_ids,
+                MAX_PROJECT_IDS_PER_QUERY,
+            ):
+                batch_results = list(
+                    executor.map(
+                        self.fetch_billing_lines,
+                        [project_id_batch],
+                    )
+                )
+                for billing_line_data in batch_results:
+                    for record in billing_line_data:
+                        project_id = record["Project_Line_Item__r"][
+                            "Project__c"
+                        ]
+                        opportunity = opportunities.get(project_id)
+
+                        billing_line_dto = (
+                            BillingLineDTO.from_salesforce_record(
+                                record,
+                                opportunity.projectcode,
+                            )
+                        )
+
+                        if opportunity is not None:
+                            if not opportunity.billing_lines:
+                                opportunity.billing_lines = []
+                            opportunity.billing_lines.append(billing_line_dto)
+        opportunities_list = list(opportunities.values())
+        if format == "json":
+            opportunities_list = [
+                opportunity.to_dict() for opportunity in opportunities_list
+            ]
+
+        return opportunities_list

{ms_salesforce_api-2.24.0.dev5 → ms_salesforce_api-3.0.0}/ms_salesforce_api/salesforce/api/project/__tests__/test_Project.py

@@ -382,154 +382,152 @@ class TestProject(unittest.TestCase):
         self.assertEqual(len(opportunities), 1)
 
         opportunity = opportunities[0]
-
+        opportunity_result = {
+            "account_assigment_group": "03",
+            "account_billing_address": "211 Main Street, Webster, Maine, 01570, United "
+            "States",
+            "account_billing_city": "Webster",
+            "account_billing_country": "US",
+            "account_billing_postal_code": "01570",
+            "account_billing_state_code": "ME",
+            "account_billing_street": "211 Main Street",
+            "account_business_function": "BP03",
+            "account_business_name": "THE COMMERCE INSURANCE COMPANY",
+            "account_cif": "042495247",
+            "account_company_invoicing": "",
+            "account_created_date": "2020-03-18 15:32:15",
+            "account_currency_code": "EUR",
+            "account_customer_groupId": "1",
+            "account_customer_subgroupId": "5",
+            "account_fax": None,
+            "account_invoicing_email": "client1@test.com",
+            "account_mail_invoicing": "client1@test.com",
+            "account_name": "MAPFRE USA",
+            "account_office": "Making Science LLC",
+            "account_payment_terms": "T060",
+            "account_pec_email": None,
+            "account_phone": None,
+            "account_sap_id": "10000319",
+            "account_tax_category": None,
+            "account_tax_classification": "0",
+            "account_tax_id_type": "US01",
+            "account_tier": "T1",
+            "account_website": None,
+            "amount": 0.0,
+            "autorenewal": False,
+            "billing_lines": [
+                {
+                    "billing_amount": 6708.0,
+                    "billing_date": "2022-08-31",
+                    "billing_period_ending_date": "2022-08-31",
+                    "billing_period_starting_date": "2022-08-01",
+                    "billing_plan_amount": "6708",
+                    "billing_plan_billing_date": "2022-08-31",
+                    "billing_plan_item": "1",
+                    "billing_plan_service_end_date": "2022-08-31",
+                    "billing_plan_service_start_date": "2022-08-01",
+                    "created_date": "2022-08-09 14:56:23",
+                    "currency": "USD",
+                    "hourly_price": 65.0,
+                    "id": "a0sAX000000I8lgYAC",
+                    "last_modified_date": "2022-10-16 18:56:34",
+                    "name": "BL-000175313",
+                    "project_code": "",
+                    "project_id": "a00AX000002DVi1YAG",
+                    "revenue_dedication": 103.2,
+                }
+            ],
+            "comments": "",
+            "controller_email": "employee4@test.com",
+            "controller_sub_email": "employee3@test.com",
+            "cost_center": "",
+            "created_at": "2022-08-01 08:53:12",
+            "currency": "EUR",
+            "end_date": "",
+            "group_bqid": "1",
+            "group_end_date": "2100-12-12",
+            "group_groupid": "a0cAX000000TSWUYA4",
+            "group_name": "MAPFRE",
+            "group_owner_email": "employee1@test.com",
+            "group_pck_type": "Key Account",
+            "group_start_date": "2023-06-01",
+            "group_supervisor_email": "employee2@test.com",
+            "international_deparments": False,
+            "invoicing_country_code": "US",
+            "jira_task_url": "<a "
+            "href=https://makingscience.atlassian.net/browse/ESMSBD0001-7168 "
+            "target=_blank>View Jira Task</a>",
+            "last_updated_at": "2023-09-01 10:00:54",
+            "maintance_project": False,
+            "ms_project_id": False,
+            "operation_coordinator_email": "employee5@test.com",
+            "operation_coordinator_name": "",
+            "operation_coordinator_sub": "",
+            "operation_coordinator_sub_email": "employee5@test.com",
+            "opportunity": "",
+            "opportunity_extension": "",
+            "opportunity_name": "New Site Mapfre AAA",
+            "opportunity_project_code": "",
+            "periodicity": "",
+            "profit_center": "200018",
+            "profitcenter": "",
+            "project_account": "",
+            "project_id": "a00AX000002DVi1YAG",
+            "project_line_items": [
+                {
+                    "country": None,
+                    "created_date": "2022-08-02 15:44:34",
+                    "effort": "516",
+                    "ending_date": "2022-12-31",
+                    "id": "a0VAX000000EE0b2AG",
+                    "last_modified_date": "2023-06-20 22:33:36",
+                    "ms_pli_name": "USA_UX/UI Design_USMSEX05508",
+                    "opportunity_project_code": None,
+                    "product_name": "UXUI Project",
+                    "project_id": "a00AX000002DVi1YAG",
+                    "quantity": 516.0,
+                    "starting_date": "2022-08-01",
+                    "total_price": 33540.0,
+                    "unit_price": 65.0,
+                },
+                {
+                    "country": None,
+                    "created_date": "2022-08-09 14:54:59",
+                    "effort": "331",
+                    "ending_date": "2022-12-31",
+                    "id": "a0VAX000000ELU52AO",
+                    "last_modified_date": "2023-06-20 22:33:36",
+                    "ms_pli_name": "ES_UX/UI Design_USMSEX05508",
+                    "opportunity_project_code": None,
+                    "product_name": "UXUI Project",
+                    "project_id": "a00AX000002DVi1YAG",
+                    "quantity": 331.0,
+                    "starting_date": "2022-08-01",
+                    "total_price": 21515.0,
+                    "unit_price": 65.0,
+                },
+            ],
+            "project_name": "MapfreAAA",
+            "project_start_date": "2022-08-01",
+            "project_tier": "Unkown",
+            "projectcode": "",
+            "quote": "",
+            "revenue_details": "",
+            "status": "",
+            "subgroup_bqid": "5",
+            "subgroup_end_date": "2100-12-12",
+            "subgroup_groupid": "a0cAX000000TSWUYA4",
+            "subgroup_name": "MAPFRE USA",
+            "subgroup_owner_email": "employee1@test.com",
+            "subgroup_start_date": "2023-06-01",
+            "subgroup_subgroupid": "a19AX0000004simYAA",
+        }
         self.assertIsInstance(opportunity, dict)
 
         self.assertDictEqual(
             opportunity,
-            {
-                "account_assigment_group": "03",
-                "account_billing_address": "211 Main Street, Webster, Maine, 01570, United "
-                "States",
-                "account_billing_city": "Webster",
-                "account_billing_country": "US",
-                "account_billing_postal_code": "01570",
-                "account_billing_state_code": "ME",
-                "account_billing_street": "211 Main Street",
-                "account_business_function": "BP03",
-                "account_business_name": "THE COMMERCE INSURANCE COMPANY",
-                "account_cif": "042495247",
-                "account_company_invoicing": "",
-                "account_created_date": "2020-03-18 15:32:15",
-                "account_currency_code": "EUR",
-                "account_customer_groupId": "1",
-                "account_customer_subgroupId": "5",
-                "account_fax": None,
-                "account_invoicing_email": "client1@test.com",
-                "account_mail_invoicing": "client1@test.com",
-                "account_name": "MAPFRE USA",
-                "account_office": "Making Science LLC",
-                "account_payment_terms": "T060",
-                "account_pec_email": None,
-                "account_phone": None,
-                "account_sap_id": "10000319",
-                "account_tax_category": None,
-                "account_tax_classification": "0",
-                "account_tax_id_type": "US01",
-                "account_tier": "T1",
-                "account_website": None,
-                "amount": 0.0,
-                "autorenewal": False,
-                "billing_lines": [
-                    {
-                        "billing_amount": 6708.0,
-                        "billing_date": "2022-08-31",
-                        "billing_period_ending_date": "2022-08-31",
-                        "billing_period_starting_date": "2022-08-01",
-                        "billing_plan_amount": "6708",
-                        "billing_plan_billing_date": "2022-08-31",
-                        "billing_plan_item": "1",
-                        "billing_plan_service_end_date": "2022-08-31",
-                        "billing_plan_service_start_date": "2022-08-01",
-                        "created_date": "2022-08-09 14:56:23",
-                        "currency": "USD",
-                        "hourly_price": 65.0,
-                        "id": "a0sAX000000I8lgYAC",
-                        "last_modified_date": "2022-10-16 18:56:34",
-                        "name": "BL-000175313",
-                        "project_code": "USMSEX05508",
-                        "project_id": "a00AX000002DVi1YAG",
-                        "revenue_dedication": 103.2,
-                    }
-                ],
-                "comments": "",
-                "controller_email": "employee4@test.com",
-                "controller_sub_email": "employee3@test.com",
-                "cost_center": "",
-                "created_at": "2022-08-01 08:53:12",
-                "currency": "EUR",
-                "end_date": "",
-                "group_bqid": "1",
-                "group_end_date": "2100-12-12",
-                "group_groupid": "a0cAX000000TSWUYA4",
-                "group_name": "MAPFRE",
-                "group_owner_email": "employee1@test.com",
-                "group_pck_type": "Key Account",
-                "group_start_date": "2023-06-01",
-                "group_supervisor_email": "employee2@test.com",
-                "international_deparments": False,
-                "invoicing_country_code": "US",
-                "jira_task_url": "<a "
-                "href=https://makingscience.atlassian.net/browse/ESMSBD0001-7168 "
-                "target=_blank>View Jira Task</a>",
-                "last_updated_at": "2023-09-01 10:00:54",
-                "maintance_project": False,
-                "ms_project_id": False,
-                "operation_coordinator_email": "employee5@test.com",
-                "operation_coordinator_name": "",
-                "operation_coordinator_sub": "",
-                "operation_coordinator_sub_email": "employee5@test.com",
-                "opportunity": "",
-                "opportunity_extension": "",
-                "opportunity_name": "New Site Mapfre AAA",
-                "periodicity": "",
-                "profit_center": "200018",
-                "profitcenter": "",
-                "project_account": "",
-                "project_code": "USMSEX05508",
-                "project_id": "a00AX000002DVi1YAG",
-                "project_line_items": [
-                    {
-                        "country": None,
-                        "created_date": "2022-08-02 15:44:34",
-                        "effort": "516",
-                        "ending_date": "2022-12-31",
-                        "id": "a0VAX000000EE0b2AG",
-                        "last_modified_date": "2023-06-20 22:33:36",
-                        "ms_pli_name": "USA_UX/UI Design_USMSEX05508",
-                        "ms_project_code": None,
-                        "product_name": "UXUI Project",
-                        "project_id": "a00AX000002DVi1YAG",
-                        "quantity": 516.0,
-                        "starting_date": "2022-08-01",
-                        "total_price": 33540.0,
-                        "unit_price": 65.0,
-                    },
-                    {
-                        "country": None,
-                        "created_date": "2022-08-09 14:54:59",
-                        "effort": "331",
-                        "ending_date": "2022-12-31",
-                        "id": "a0VAX000000ELU52AO",
-                        "last_modified_date": "2023-06-20 22:33:36",
-                        "ms_pli_name": "ES_UX/UI Design_USMSEX05508",
-                        "ms_project_code": None,
-                        "product_name": "UXUI Project",
-                        "project_id": "a00AX000002DVi1YAG",
-                        "quantity": 331.0,
-                        "starting_date": "2022-08-01",
-                        "total_price": 21515.0,
-                        "unit_price": 65.0,
-                    },
-                ],
-                "project_name": "MapfreAAA",
-                "project_start_date": "2022-08-01",
-                "project_tier": "Unkown",
-                "projectcode": "",
-                "projectid": "",
-                "quote": "",
-                "revenue_details": "",
-                "status": "",
-                "subgroup_bqid": "5",
-                "subgroup_end_date": "2100-12-12",
-                "subgroup_groupid": "a0cAX000000TSWUYA4",
-                "subgroup_name": "MAPFRE USA",
-                "subgroup_owner_email": "employee1@test.com",
-                "subgroup_start_date": "2023-06-01",
-                "subgroup_subgroupid": "a19AX0000004simYAA",
-            },
+            opportunity_result,
         )
-
         billing_line = opportunity["billing_lines"][0]
         self.assertDictEqual(
             billing_line,
@@ -549,7 +547,7 @@ class TestProject(unittest.TestCase):
                 "id": "a0sAX000000I8lgYAC",
                 "last_modified_date": "2022-10-16 18:56:34",
                 "name": "BL-000175313",
-                "project_code": "USMSEX05508",
+                "project_code": "",
                 "project_id": "a00AX000002DVi1YAG",
                 "revenue_dedication": 103.2,
             },

{ms_salesforce_api-2.24.0.dev5 → ms_salesforce_api-3.0.0}/ms_salesforce_api/salesforce/api/project/dto/OpportunityDTO.py

@@ -546,7 +546,9 @@ class OpportunityDTO(object):
 
         def _get_opportunity_project_code():
             try:
-                return normalize_value(record["Opportunity__r"]["FRM_ProjectCode__c"])
+                return normalize_value(
+                    record["Opportunity__r"]["FRM_ProjectCode__c"]
+                )
             except (TypeError, KeyError):
                 return ""
 

{ms_salesforce_api-2.24.0.dev5 → ms_salesforce_api-3.0.0}/ms_salesforce_api/salesforce/api/project/dto/ProjectLineItemDTO.py

@@ -47,11 +47,25 @@ class ProjectLineItemDTO:
             except Exception:
                 return ""
 
+        def _get_opportunity_project_code():
+            try:
+                project = record.get("Project__r")
+                opportunity = project.get("Opportunity__r") if project else {}
+                opportunity_project_code = opportunity.get(
+                    "FRM_ProjectCode__c"
+                )
+
+                return opportunity_project_code
+
+            except AttributeError:
+                return None
+
         product_name = (
             record.get("ProductNew__r", {}).get("Name")
             if record.get("ProductNew__r")
             else None
         )
+
         return cls(
             id=record.get("Id"),
             created_date=_parse_created_date(record.get("CreatedDate")),
@@ -68,7 +82,7 @@ class ProjectLineItemDTO:
             ms_pli_name=record.get("MS_PLI_Name__c"),
             country=record.get("Country__c"),
             project_id=project_id,
-            opportunity_project_code=record.get("Project__r", {}).get("Opportunity__r", {}).get("FRM_ProjectCode__c"),
+            opportunity_project_code=_get_opportunity_project_code(),
         )
 
     def to_dict(self):

{ms_salesforce_api-2.24.0.dev5 → ms_salesforce_api-3.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ms-salesforce-api"
-version = "2.24.0.dev5"
+version = "3.0.0"
 description = "Python library used to extract data from Salesforce API and migrate it to Bigquery and Postgres."
 authors = ["Making Science"]
 readme = "README.md"

ms_salesforce_api-2.24.0.dev5/ms_salesforce_api/salesforce/api/project/__init__.py

@@ -1,109 +0,0 @@
-import logging
-from concurrent.futures import ThreadPoolExecutor
-
-from ms_salesforce_api.salesforce.api.project.constants import (
-    DEFAULT_PROJECT_BILLING_LINE_QUERY,
-    DEFAULT_PROJECT_OPPORTUNITY_QUERY,
-)
-from ms_salesforce_api.salesforce.api.project.dto.BillingLineDTO import (
-    BillingLineDTO,
-)
-from ms_salesforce_api.salesforce.api.project.dto.OpportunityDTO import (
-    OpportunityDTO,
-)
-from ms_salesforce_api.salesforce.SalesforceQueryExecutor import (
-    SalesforceQueryExecutor,
-)
-
-logging.basicConfig(
-    level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s"
-)
-
-MAX_PROJECT_IDS_PER_QUERY = 200
-
-
-class Project(SalesforceQueryExecutor):
-    def fetch_billing_lines(self, project_ids):
-        billing_lines = []
-        query = DEFAULT_PROJECT_BILLING_LINE_QUERY.format(
-            project_id="','".join(project_ids)
-        )
-
-        data = self.fetch_data(query)
-        if data is not None:
-            billing_lines.extend(data)
-
-        return billing_lines
-
-    def get_batches(self, lst, n):
-        """Yield successive n-sized chunks from lst."""
-        for i in range(0, len(lst), n):
-            yield lst[i : i + n]  # noqa: E203
-
-    def get_all(
-        self,
-        last_executed_at: str = None,
-        query: str = DEFAULT_PROJECT_OPPORTUNITY_QUERY,
-        format: str = "json",
-    ):
-        try:
-            if last_executed_at:
-                query = query + f"WHERE CreatedDate > {last_executed_at}"
-
-            data = self.fetch_data(query)
-            if data is None:
-                logging.error(
-                    "[ERROR - SalesforceAPI]: No projects data return from Salesforce API"  # noqa: E501
-                )
-                return []
-
-            opportunities = {
-                record["Id"]: OpportunityDTO.from_salesforce_record(record)
-                for record in data
-            }
-
-            project_ids = list(opportunities.keys())
-
-            with ThreadPoolExecutor(max_workers=10) as executor:
-                for project_id_batch in self.get_batches(
-                    project_ids,
-                    MAX_PROJECT_IDS_PER_QUERY,
-                ):
-                    batch_results = list(
-                        executor.map(
-                            self.fetch_billing_lines,
-                            [project_id_batch],
-                        )
-                    )
-                    for billing_line_data in batch_results:
-                        for record in billing_line_data:
-                            project_id = record["Project_Line_Item__r"][
-                                "Project__c"
-                            ]
-                            opportunity = opportunities.get(project_id)
-
-                            billing_line_dto = (
-                                BillingLineDTO.from_salesforce_record(
-                                    record,
-                                    opportunity.projectcode,
-                                )
-                            )
-
-                            if opportunity is not None:
-                                if not opportunity.billing_lines:
-                                    opportunity.billing_lines = []
-                                opportunity.billing_lines.append(
-                                    billing_line_dto
-                                )
-            opportunities_list = list(opportunities.values())
-            if format == "json":
-                opportunities_list = [
-                    opportunity.to_dict() for opportunity in opportunities_list
-                ]
-
-            return opportunities_list
-        except Exception as e:
-            logging.error(
-                f"[ERROR - get_all]: Failed to get opportunities: {e}"
-            )
-            return []