ms-salesforce-api 2.24.0.dev3__tar.gz → 2.24.0.dev4__tar.gz

{ms_salesforce_api-2.24.0.dev3 → ms_salesforce_api-2.24.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ms-salesforce-api
-Version: 2.24.0.dev3
+Version: 2.24.0.dev4
 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.dev3 → ms_salesforce_api-2.24.0.dev4}/ms_salesforce_api/salesforce/api/lead/constants.py

@@ -1,5 +1,6 @@
 DEFAULT_LEAD_QUERY = """
 SELECT
+    CreatedDate,
     Account__c,
     Account_Fiscal_Name__c,
     Address,

{ms_salesforce_api-2.24.0.dev3 → ms_salesforce_api-2.24.0.dev4}/ms_salesforce_api/salesforce/api/lead/dto/LeadDTO.py

@@ -46,6 +46,7 @@ class LeadDTO(object):
         risk_assessment_date,
         title,
         website,
+        created_date,
     ):
         self.id = id
         self.account = account
@@ -89,6 +90,7 @@ class LeadDTO(object):
         self.risk_assessment_date = risk_assessment_date
         self.title = title
         self.website = website
+        self.created_date = created_date
 
     @staticmethod
     def from_salesforce_record(record):
@@ -184,6 +186,7 @@ class LeadDTO(object):
             ),
             title=normalize_value(record["Title"]),
             website=normalize_value(record["Website"]),
+            created_date=normalize_value(record["CreatedDate"]),
         )
 
     def to_dict(self):
@@ -230,4 +233,5 @@ class LeadDTO(object):
             "risk_assessment_date": self.risk_assessment_date,
             "title": self.title,
             "website": self.website,
+            "created_date": self.created_date,
         }

{ms_salesforce_api-2.24.0.dev3 → ms_salesforce_api-2.24.0.dev4}/ms_salesforce_api/salesforce/api/lead/export_data/Bigquery.py

@@ -68,6 +68,7 @@ class BigQueryExporter:
                 "risk_assessment_date": "STRING",
                 "title": "STRING",
                 "website": "STRING",
+                "created_date": "STRING",
             },
         }
 

{ms_salesforce_api-2.24.0.dev3 → ms_salesforce_api-2.24.0.dev4}/ms_salesforce_api/salesforce/api/opportunity/__init__.py

@@ -48,10 +48,3 @@ class Opportunity(SalesforceQueryExecutor):
             ]
 
         return opportunities_list
-        try:
-            pass
-        except Exception as e:
-            logging.error(
-                f"[ERROR - get_all]: Failed to get all opportunities: {e}"
-            )
-            return []

{ms_salesforce_api-2.24.0.dev3 → ms_salesforce_api-2.24.0.dev4}/ms_salesforce_api/salesforce/api/opportunity/constants.py

@@ -1,5 +1,6 @@
 DEFAULT_ALL_OPPORTUNITIES_QUERY = """
 SELECT
+    TXT_BillingInfo__c,
     Account_Billing_Country__c,
     PCK_Division__c,
     TECH_Out_of_report__c,
@@ -76,6 +77,7 @@ SELECT
     TotalOpportunityQuantity,
     TXT_Comments__c,
     Year_Created__c,
+    LKP_ParentOpportunity__c,
     (
         SELECT
             Description,

{ms_salesforce_api-2.24.0.dev3 → ms_salesforce_api-2.24.0.dev4}/ms_salesforce_api/salesforce/api/opportunity/dto/OpportunityDTO.py

@@ -210,6 +210,8 @@ class OpportunityDTO(object):
         project_status,
         pck_division,
         out_of_report,
+        billing_info,
+        parent_opportunity,
     ):
         self.opportunity_id = opportunity_id
         self.account_billing_country = account_billing_country
@@ -290,6 +292,8 @@ class OpportunityDTO(object):
         self.project_status = project_status
         self.pck_division = pck_division
         self.out_of_report = out_of_report
+        self.billing_info = billing_info
+        self.parent_opportunity = parent_opportunity
 
     @staticmethod
     def from_salesforce_record(record):
@@ -510,6 +514,8 @@ class OpportunityDTO(object):
             project_status=record["PCK_ProjectStatus__c"],
             pck_division=record["PCK_Division__c"],
             out_of_report=record["TECH_Out_of_report__c"],
+            billing_info=record["TXT_BillingInfo__c"],
+            parent_opportunity=record["LKP_ParentOpportunity__c"],
         )
 
     def to_dict(self):
@@ -593,5 +599,7 @@ class OpportunityDTO(object):
             "project_status": self.project_status,
             "pck_division": self.pck_division,
             "out_of_report": self.out_of_report,
+            "billing_info": self.billing_info,
+            "parent_opportunity": self.parent_opportunity,
             
         }

{ms_salesforce_api-2.24.0.dev3 → ms_salesforce_api-2.24.0.dev4}/ms_salesforce_api/salesforce/api/opportunity/export_data/Bigquery.py

@@ -24,7 +24,7 @@ class BigQueryExporter:
         )
         self.batch_size = 200
         self.schemas = {
-            "all_opportunity": {
+            "all_opportunity_new": {
                 "opportunity_id": "STRING",
                 "account_billing_country": "STRING",
                 "account_owner": "STRING",
@@ -103,6 +103,8 @@ class BigQueryExporter:
                 "project_status": "STRING",
                 "pck_division": "STRING",
                 "out_of_report": "STRING",
+                "billing_info": "STRING",
+                "parent_opportunity": "STRING",
             },
             "opportunity_line_item": {
                 "opportunity_id": "STRING",

{ms_salesforce_api-2.24.0.dev3 → ms_salesforce_api-2.24.0.dev4}/pyproject.toml

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