ms-salesforce-api 2.24.0.dev5__tar.gz → 2.24.0.dev6__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ms-salesforce-api
-Version: 2.24.0.dev5
+Version: 2.24.0.dev6
 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-2.24.0.dev6}/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-2.24.0.dev6}/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-2.24.0.dev6}/ms_salesforce_api/salesforce/api/opportunity/dto/OpportunityDTO.py

@@ -478,7 +478,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", "")
@@ -509,7 +511,6 @@ class OpportunityDTO(object):
             finance_contact=record["MAIL_FinanceContact__c"],
             convertAmount=record["convertAmount"],
             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"],
@@ -601,5 +602,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.dev6/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-2.24.0.dev6}/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-2.24.0.dev6}/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-2.24.0.dev6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ms-salesforce-api"
-version = "2.24.0.dev5"
+version = "2.24.0.dev6"
 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 []