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

{ms_salesforce_api-2.24.0.dev2 → 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.dev2
+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.dev2 → ms_salesforce_api-2.24.0.dev4}/ms_salesforce_api/salesforce/api/account/constants.py

@@ -1,52 +1,55 @@
 DEFAULT_PROJECT_ACCOUNT_QUERY = """
 SELECT
-    Industry,
     Accelerator__c,
-    Id,
-    Name,
-    Key_Account__c,
-    MS_Customer_Account_Assigment_Group__c,
-    MS_Customer_Tax_Category__c,
-    MS_Customer_Tax_Classification__c,
-    TXT_SAPId__c,
-    ms_Business_Function__c,
-    ms_TAX_id_Type__c,
-    CurrencyISOCode,
-    CreatedDate,
-    Tier__c,
-    PEC_Email__c,
-    Phone,
-    Fax,
-    Website,
-    CIF__c,
-    BillingCountryCode,
-    Business_Name__c,
     BillingAddress,
     BillingCity,
+    BillingCountryCode,
     BillingPostalCode,
-    BillingStreet,
-    LKP_MSCompanyInvoicing__r.PCK_Prefix__c,
-    LKP_MSCompanyInvoicing__r.TXT_BusinessName__c,
-    Payment_Terms__c,
     BillingStateCode,
-    MAIL_Invoicing__c,
-    Invoicing_Email__c,
+    BillingStreet,
     BQ_CustomerGroupId__c,
     BQ_CustomerSubgroupId__c,
-    LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.Name,
-    LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.DT_Start__c,
+    Business_Name__c,
+    CIF__c,
+    CreatedDate,
+    CurrencyISOCode,
+    Fax,
+    Id,
+    Industry,
+    Invoicing_Email__c,
+    Key_Account__c,
+    LKP_CustomerSubgroup__r.DT_End__c,
+    LKP_CustomerSubgroup__r.DT_Start__c,
     LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.DT_End__c,
-    LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.TXT_BQId__c,
-    LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.PCK_Type__c,
-    LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.MAIL_Supervisor__c,
+    LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.DT_Start__c,
     LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.MAIL_Owner__c,
+    LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.MAIL_Supervisor__c,
+    LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.Name,
+    LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.PCK_Type__c,
+    LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.TXT_BQId__c,
+    LKP_CustomerSubgroup__r.MAIL_Owner__c,
     LKP_CustomerSubgroup__r.Name,
-    LKP_CustomerSubgroup__r.DT_Start__c,
-    LKP_CustomerSubgroup__r.DT_End__c,
     LKP_CustomerSubgroup__r.TXT_BQId__c,
-    LKP_CustomerSubgroup__r.MAIL_Owner__c,
+    LKP_MSCompanyInvoicing__r.PCK_Prefix__c,
+    LKP_MSCompanyInvoicing__r.TXT_BusinessName__c,
+    MAIL_Invoicing__c,
+    ms_Business_Function__c,
+    MS_Customer_Account_Assigment_Group__c,
+    MS_Customer_Tax_Category__c,
+    MS_Customer_Tax_Classification__c,
+    ms_TAX_id_Type__c,
+    Name,
     Owner.Email,
-    Type
+    ToLabel(Payment_Method__c),
+    ToLabel(Payment_Terms__c),
+    PEC_Email__c,
+    Phone,
+    Risk_Assessment__c,
+    Risk_Assessment_Date__c,
+    Tier__c,
+    TXT_SAPId__c,
+    Type,
+    Website
 FROM
     Account
 """

{ms_salesforce_api-2.24.0.dev2 → ms_salesforce_api-2.24.0.dev4}/ms_salesforce_api/salesforce/api/account/dto/AccountDTO.py

@@ -53,6 +53,9 @@ class AccountDTO(object):
         owner_email,
         type,
         industry,
+        payment_method,
+        risk_assessment,
+        risk_assessment_date,
     ):
         self.id = id
         self.accelerator = accelerator
@@ -105,6 +108,9 @@ class AccountDTO(object):
         self.owner_email = owner_email
         self.type = type
         self.industry = industry
+        self.payment_method = payment_method
+        self.risk_assessment = risk_assessment
+        self.risk_assessment_date = risk_assessment_date
 
     @staticmethod
     def from_salesforce_record(record):
@@ -294,6 +300,7 @@ class AccountDTO(object):
             lkp_company_invoicing_business_name=_get_company_invoicing_business_name(),  # noqa: E501
             lkp_company_invoicing_country=_get_company_invoicing_country(),
             payment_terms=normalize_value(record["Payment_Terms__c"]),
+            payment_method=normalize_value(record["Payment_Method__c"]),
             billing_state_code=normalize_value(record["BillingStateCode"]),
             mail_invoincing=normalize_value(record["MAIL_Invoicing__c"]),
             invoincing_email=normalize_value(record["Invoicing_Email__c"]),
@@ -320,6 +327,9 @@ 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"]),
         )
 
     def to_dict(self):
@@ -371,4 +381,7 @@ class AccountDTO(object):
             "owner_email": self.owner_email,
             "type": self.type,
             "industry": self.industry,
+            "payment_method": self.payment_method,
+            "risk_assessment": self.risk_assessment,
+            "risk_assessment_date": self.risk_assessment_date,
         }

{ms_salesforce_api-2.24.0.dev2 → ms_salesforce_api-2.24.0.dev4}/ms_salesforce_api/salesforce/api/account/export_data/Bigquery.py

@@ -72,6 +72,9 @@ class BigQueryExporter:
                 "owner_email": "STRING",
                 "type": "STRING",
                 "industry": "STRING",
+                "payment_method": "STRING",
+                "risk_assessment": "STRING",
+                "risk_assessment_date": "STRING",
             },
         }
 

{ms_salesforce_api-2.24.0.dev2 → ms_salesforce_api-2.24.0.dev4}/ms_salesforce_api/salesforce/api/lead/constants.py

@@ -1,45 +1,46 @@
 DEFAULT_LEAD_QUERY = """
 SELECT
-    Id,
+    CreatedDate,
     Account__c,
     Account_Fiscal_Name__c,
-    LKP_AccountManager__c,
     Address,
     Billing_Address__c,
     Company,
     Contact__c,
+    Correo_electr_nico_solicitante__c,
     Description,
-    PCK_Division__c,
     Email,
     EventAttendance__c,
     EventName__c,
-    Primera_Interaccion_Humana__c,
     First_Meeting__c,
     HasEvents__c,
     Help_from_NB_Team_requested__c,
-    MonthlyAdvInvestingAmount__c,
+    Id,
     Industry,
     Invoicing_Email__c,
     Jira_Task__c,
     JiraTaskId__c,
-    RecordTypeId,
-    LeadSource,
     Lead_Source_Description__c,
-    Status,
+    LeadSource,
+    LKP_AccountManager__c,
     Market_Scope__c,
     Meeting__c,
     Mensaje__c,
     MobilePhone,
+    MonthlyAdvInvestingAmount__c,
     Name,
     Next_Steps__c,
     Opportunity_Description__c,
     Opportunity_Name_Short__c,
-    Correo_electr_nico_solicitante__c,
     Origin__c,
+    PCK_Division__c,
     Primary_Campaign_Source__c,
-    Servicios_Asociados__c,
+    Primera_Interaccion_Humana__c,
+    RecordTypeId,
     Risk_Assessment__c,
     Risk_Assessment_Date__c,
+    Servicios_Asociados__c,
+    Status,
     Title,
     Website
 FROM

{ms_salesforce_api-2.24.0.dev2 → 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.dev2 → 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.dev2 → 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.dev2 → 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.dev2 → 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.dev2 → 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.dev2 → ms_salesforce_api-2.24.0.dev4}/ms_salesforce_api/salesforce/api/project/__init__.py

@@ -85,7 +85,7 @@ class Project(SalesforceQueryExecutor):
                             billing_line_dto = (
                                 BillingLineDTO.from_salesforce_record(
                                     record,
-                                    opportunity.project_code,
+                                    opportunity.projectcode,
                                 )
                             )
 

{ms_salesforce_api-2.24.0.dev2 → ms_salesforce_api-2.24.0.dev4}/ms_salesforce_api/salesforce/api/project/constants.py

@@ -1,116 +1,113 @@
 DEFAULT_PROJECT_OPPORTUNITY_QUERY = """
 SELECT
-    RU_TotalAmount__c,
-    CurrencyIsoCode,
-    LKP_MSCompanyInvoicing__r.PCK_Prefix__c,
-    Operation_Coordinator__r.Name,
-    Operation_Coordinator_Sub__r.Name,
-    CreatedDate,
-    LastModifiedDate,
-    Opportunity__r.Opportunity_Name_Short__c,
-    Opportunity__r.StageName,
-    Opportunity__r.LeadSource,
-    Name,
-    Id,
-    DT_ProjectStartDate__c,
-    Operation_Coordinator__r.Controller__c,
-    Operation_Coordinator_Sub__r.Controller_SUB__c,
-    LKP_ProfitCenter__r.TXT_ProfitCenter__c,
-    LKP_CostCenter__r.Name,
-    Opportunity__r.Probability,
-    Opportunity__r.Tier_Short__c,
-    Opportunity__r.JiraComponentURL__c,
     Autorenewal__c,
     Comments__c,
+    CreatedDate,
+    CurrencyIsoCode,
     End_Date__c,
+    Id,
     International_Departments__c,
+    LastModifiedDate,
+    LKP_CostCenter__r.Name,
+    LKP_MSCompanyInvoicing__r.PCK_Prefix__c,
     LKP_OpportunityExtension__c,
+    LKP_ProfitCenter__c,
+    LKP_ProfitCenter__r.TXT_ProfitCenter__c,
     Maintenance_project__c,
     MS_Project_Id__c,
+    Name,
     Operation_Coordinator__c,
+    Operation_Coordinator__r.Controller__c,
+    Operation_Coordinator__r.Name,
     Operation_Coordinator_Sub__c,
+    Operation_Coordinator_Sub__r.Controller_SUB__c,
+    Operation_Coordinator_Sub__r.Name,
     Opportunity__c,
+    Opportunity__r.FRM_ProjectCode__c,
+    Opportunity__r.JiraComponentURL__c,
+    Opportunity__r.LeadSource,
+    Opportunity__r.Opportunity_Name_Short__c,
+    Opportunity__r.Probability,
+    Opportunity__r.StageName,
+    Opportunity__r.Tier_Short__c,
     Periodicity__c,
-    LKP_ProfitCenter__c,
     Project_Account__c,
-    Quote__c,
-    Revenue_Details__c,
-    Tolabel(PCK_ProjectStatus__c),
-    DT_ProjectEndDate__c,
-    TXT_InternalComment__c,
-    TXT_RejectionReason__c,
-    ProjectID__c,
-    Project_Account__r.Id,
-    Project_Account__r.Name,
-    Project_Account__r.MS_Customer_Account_Assigment_Group__c,
-    Project_Account__r.MS_Customer_Tax_Category__c,
-    Project_Account__r.MS_Customer_Tax_Classification__c,
-    Project_Account__r.TXT_SAPId__c,
-    Project_Account__r.ms_Business_Function__c,
-    Project_Account__r.ms_TAX_id_Type__c,
-    Project_Account__r.CurrencyISOCode,
-    Project_Account__r.CreatedDate,
-    Project_Account__r.Tier__c,
-    Project_Account__r.PEC_Email__c,
-    Project_Account__r.Phone,
-    Project_Account__r.Fax,
-    Project_Account__r.Website,
-    Project_Account__r.CIF__c,
-    Project_Account__r.BillingCountryCode,
-    Project_Account__r.Business_Name__c,
     Project_Account__r.BillingAddress,
     Project_Account__r.BillingCity,
+    Project_Account__r.BillingCountryCode,
     Project_Account__r.BillingPostalCode,
-    Project_Account__r.BillingStreet,
-    Project_Account__r.LKP_MSCompanyInvoicing__r.PCK_Prefix__c,
-    Project_Account__r.LKP_MSCompanyInvoicing__r.TXT_BusinessName__c,
-    Project_Account__r.Payment_Terms__c,
     Project_Account__r.BillingStateCode,
-    Project_Account__r.MAIL_Invoicing__c,
-    Project_Account__r.Invoicing_Email__c,
-
+    Project_Account__r.BillingStreet,
     Project_Account__r.BQ_CustomerGroupId__c,
     Project_Account__r.BQ_CustomerSubgroupId__c,
-    Project_Account__r.LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.Name,
-    Project_Account__r.LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.Id,
-    Project_Account__r.LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.DT_Start__c,
+    Project_Account__r.Business_Name__c,
+    Project_Account__r.CIF__c,
+    Project_Account__r.CreatedDate,
+    Project_Account__r.CurrencyISOCode,
+    Project_Account__r.Fax,
+    Project_Account__r.Id,
+    Project_Account__r.Invoicing_Email__c,
+    Project_Account__r.LKP_CustomerSubgroup__r.DT_End__c,
+    Project_Account__r.LKP_CustomerSubgroup__r.DT_Start__c,
+    Project_Account__r.LKP_CustomerSubgroup__r.Id,
     Project_Account__r.LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.DT_End__c,
-    Project_Account__r.LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.TXT_BQId__c,
-    Project_Account__r.LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.PCK_Type__c,
-    Project_Account__r.LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.MAIL_Supervisor__c,
+    Project_Account__r.LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.DT_Start__c,
+    Project_Account__r.LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.Id,
     Project_Account__r.LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.MAIL_Owner__c,
-
-    Project_Account__r.LKP_CustomerSubgroup__r.Id,
+    Project_Account__r.LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.MAIL_Supervisor__c,
+    Project_Account__r.LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.Name,
+    Project_Account__r.LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.PCK_Type__c,
+    Project_Account__r.LKP_CustomerSubgroup__r.LKP_CustomerGroup__r.TXT_BQId__c,
+    Project_Account__r.LKP_CustomerSubgroup__r.MAIL_Owner__c,
     Project_Account__r.LKP_CustomerSubgroup__r.Name,
-    Project_Account__r.LKP_CustomerSubgroup__r.DT_Start__c,
-    Project_Account__r.LKP_CustomerSubgroup__r.DT_End__c,
     Project_Account__r.LKP_CustomerSubgroup__r.TXT_BQId__c,
-    Project_Account__r.LKP_CustomerSubgroup__r.MAIL_Owner__c,
+    Project_Account__r.LKP_MSCompanyInvoicing__r.PCK_Prefix__c,
+    Project_Account__r.LKP_MSCompanyInvoicing__r.TXT_BusinessName__c,
+    Project_Account__r.MAIL_Invoicing__c,
+    Project_Account__r.ms_Business_Function__c,
+    Project_Account__r.MS_Customer_Account_Assigment_Group__c,
+    Project_Account__r.MS_Customer_Tax_Category__c,
+    Project_Account__r.MS_Customer_Tax_Classification__c,
+    Project_Account__r.ms_TAX_id_Type__c,
+    Project_Account__r.Name,
+    Project_Account__r.Payment_Terms__c,
+    Project_Account__r.PEC_Email__c,
+    Project_Account__r.Phone,
+    Project_Account__r.Tier__c,
+    Project_Account__r.TXT_SAPId__c,
+    Project_Account__r.Website,
+    Quote__c,
+    Revenue_Details__c,
+    RU_TotalAmount__c,
+    Start_Date__c,
+    ToLabel(Status__c),
+    TXT_InternalComment__c,
+    TXT_RejectionReason__c,
     (
         SELECT
-            Id,
+            Business_Unit__c,
+            Country__c,
             CreatedDate,
-            LastModifiedDate,
+            Department__c,
             Duration_months__c,
-            ProductNew__r.Name,
-            Starting_Date__c,
-            ProductNew__r.LKP_ProfitCenter__r.TXT_ProfitCenter__c,
+            Effort__c,
+            End_Date__c,
+            Ending_Date__c,
+            Id,
+            LastModifiedDate,
             LKP_CostCenter__r.Name,
-            Business_Unit__c,
+            MS_PLI_Name__c,
+            ProductNew__r.LKP_ProfitCenter__r.TXT_ProfitCenter__c,
+            ProductNew__r.Name,
+            Project__r.Opportunity__r.FRM_ProjectCode__c,
             Quantity__c,
-            UnitPrice__c,
-            Total_Price__c,
-            Ending_Date__c,
-            Department__c,
-            Sales_Order_Item__c,
-            End_Date__c,
             Revenue_Type__c,
-            Effort__c,
-            Total_Billing_Amount_Billing_Lines__c,
-            MS_PLI_Name__c,
+            Sales_Order_Item__c,
             SapNetAmount__c,
-            Country__c,
-            MS_Project_Code__c
+            Starting_Date__c,
+            Total_Billing_Amount_Billing_Lines__c,
+            Total_Price__c,
+            UnitPrice__c
         FROM
             Project_Line_Items__r
     )

{ms_salesforce_api-2.24.0.dev2 → ms_salesforce_api-2.24.0.dev4}/ms_salesforce_api/salesforce/api/project/dto/OpportunityDTO.py

@@ -23,7 +23,6 @@ class OpportunityDTO(object):
         stage,
         account_billing_country,
         lead_source,
-        project_code,
         project_id,
         project_name,
         project_start_date,
@@ -34,6 +33,7 @@ class OpportunityDTO(object):
         project_tier,
         jira_task_url,
         opportunity_percentage,
+        opportunity_project_code,
         account_assigment_group,
         account_tax_category,
         account_tax_classification,
@@ -93,7 +93,6 @@ class OpportunityDTO(object):
         status,
         internal_comment,
         rejection_reason,
-        projectid,
         quote,
         billing_lines=[],
         project_line_items=[],
@@ -112,7 +111,6 @@ class OpportunityDTO(object):
         self.stage = stage
         self.account_billing_country = account_billing_country
         self.lead_source = lead_source
-        self.project_code = project_code
         self.project_id = project_id
         self.project_name = project_name
         self.project_start_date = project_start_date
@@ -122,6 +120,7 @@ class OpportunityDTO(object):
         self.cost_center = cost_center
         self.project_tier = project_tier
         self.jira_task_url = jira_task_url
+        self.opportunity_project_code = opportunity_project_code
         self.opportunity_percentage = opportunity_percentage
         self.billing_lines = billing_lines
         self.project_line_items = project_line_items
@@ -186,7 +185,6 @@ class OpportunityDTO(object):
         self.status = status
         self.internal_comment = internal_comment
         self.rejection_reason = rejection_reason
-        self.projectid = projectid
         self.quote = quote
 
     @staticmethod
@@ -546,6 +544,12 @@ class OpportunityDTO(object):
             except (TypeError, KeyError):
                 return ""
 
+        def _get_opportunity_project_code():
+            try:
+                return normalize_value(record["Opportunity__r"]["FRM_ProjectCode__c"])
+            except (TypeError, KeyError):
+                return ""
+
         def _get_group_name():
             try:
                 return record["Project_Account__r"]["LKP_CustomerSubgroup__r"][
@@ -778,12 +782,6 @@ class OpportunityDTO(object):
             except KeyError:
                 return ""
 
-        def _get_projectid():
-            try:
-                return record["ProjectID__c"]
-            except KeyError:
-                return ""
-
         def _parse_created_date(created_date):
             try:
                 dt = datetime.strptime(
@@ -810,7 +808,6 @@ class OpportunityDTO(object):
             stage=_get_stage(),
             account_billing_country=_get_account_billing_country(),
             lead_source=_get_lead_source(),
-            project_code=record["FRM_MSProjectCode__c"],
             project_id=record["Id"],
             project_name=record["Name"],
             project_start_date=record["Start_Date__c"],
@@ -821,6 +818,7 @@ class OpportunityDTO(object):
             project_tier=_get_project_tier(),
             jira_task_url=_get_jira_task_url(),
             opportunity_percentage=_get_opportunity_percentage(),
+            opportunity_project_code=_get_opportunity_project_code(),
             project_line_items=project_line_items,
             account_assigment_group=_get_account_assigment_group(),
             account_tax_category=_get_account_tax_category(),
@@ -881,7 +879,6 @@ class OpportunityDTO(object):
             status=_get_status(),
             internal_comment=_get_internal_comment(),
             rejection_reason=_get_rejection_reason(),
-            projectid=_get_projectid(),
             quote=_get_quote(),
         )
 
@@ -900,7 +897,6 @@ class OpportunityDTO(object):
             "opportunity_name": self.opportunity_name,
             # "stage": self.stage,
             # "lead_source": self.lead_source,
-            "project_code": self.project_code,
             "project_id": self.project_id,
             "project_name": self.project_name,
             "project_start_date": self.project_start_date,
@@ -978,6 +974,6 @@ class OpportunityDTO(object):
             "status": self.status,
             # "internal_comment": self.internal_comment,
             # "rejection_reason": self.rejection_reason,
-            "projectid": self.projectid,
             "quote": self.quote,
+            "opportunity_project_code": self.opportunity_project_code,
         }

{ms_salesforce_api-2.24.0.dev2 → ms_salesforce_api-2.24.0.dev4}/ms_salesforce_api/salesforce/api/project/dto/ProjectLineItemDTO.py

@@ -16,8 +16,8 @@ class ProjectLineItemDTO:
         effort,
         ms_pli_name,
         country,
-        project_code,
         project_id,
+        opportunity_project_code,
     ):
         self.id = id
         self.created_date = created_date
@@ -31,8 +31,8 @@ class ProjectLineItemDTO:
         self.effort = effort
         self.ms_pli_name = ms_pli_name
         self.country = country
-        self.project_code = project_code
         self.project_id = project_id
+        self.opportunity_project_code = opportunity_project_code
 
     @classmethod
     def from_salesforce_record(cls, record, project_id):
@@ -67,8 +67,8 @@ class ProjectLineItemDTO:
             effort=record.get("Effort__c"),
             ms_pli_name=record.get("MS_PLI_Name__c"),
             country=record.get("Country__c"),
-            project_code=record.get("MS_Project_Code__c"),
             project_id=project_id,
+            opportunity_project_code=record.get("Project__r", {}).get("Opportunity__r", {}).get("FRM_ProjectCode__c"),
         )
 
     def to_dict(self):
@@ -86,5 +86,5 @@ class ProjectLineItemDTO:
             "total_price": self.total_price,
             "unit_price": self.unit_price,
             "project_id": self.project_id,
-            "ms_project_code": self.project_code,
+            "opportunity_project_code": self.opportunity_project_code,
         }

{ms_salesforce_api-2.24.0.dev2 → ms_salesforce_api-2.24.0.dev4}/ms_salesforce_api/salesforce/api/project/export_data/Bigquery.py

@@ -28,7 +28,7 @@ class BigQueryExporter:
                 "amount": "FLOAT",
                 "controller_email": "STRING",
                 "controller_sub_email": "STRING",
-                "cost_center": "INTEGER",
+                "cost_center": "STRING",
                 "created_at": "TIMESTAMP",
                 "currency": "STRING",
                 "invoicing_country_code": "STRING",
@@ -40,7 +40,6 @@ class BigQueryExporter:
                 "opportunity_name": "STRING",
                 # "opportunity_percentage": "FLOAT",
                 "profit_center": "INTEGER",
-                "project_code": "STRING",
                 "project_id": "STRING",
                 "project_name": "STRING",
                 "project_start_date": "DATE",
@@ -67,6 +66,7 @@ class BigQueryExporter:
                 # "rejection_reason": "STRING",
                 "projectid": "STRING",
                 "quote": "STRING",
+                "opportunity_project_code": "STRING",
             },
             "billing_lines": {
                 "billing_amount": "FLOAT",
@@ -99,11 +99,11 @@ class BigQueryExporter:
                 "product_name": "STRING",
                 "project_id": "STRING",
                 "project_code": "STRING",
-                "ms_project_code": "STRING",
                 "quantity": "FLOAT",
                 "starting_date": "DATE",
                 "total_price": "FLOAT",
                 "unit_price": "FLOAT",
+                "opportunity_project_code": "STRING",
             },
             "accounts": {
                 "assigment_group": "INTEGER",
@@ -130,7 +130,7 @@ class BigQueryExporter:
                 "phone": "STRING",
                 "project_id": "STRING",
                 "project_code": "STRING",
-                "sap_id": "INTEGER",
+                "sap_id": "STRING",
                 "tax_category": "STRING",
                 "tax_classification": "INTEGER",
                 "tax_id_type": "STRING",
@@ -201,11 +201,11 @@ class BigQueryExporter:
             # Store account data
             opportunity_account_data = {
                 "project_id": opportunity["project_id"],
-                "project_code": opportunity["project_code"],
+                "project_code": opportunity["projectcode"],
             }
             opportunity_group_data = {
                 "project_id": opportunity["project_id"],
-                "project_code": opportunity["project_code"],
+                "project_code": opportunity["projectcode"],
             }
             opportunity_subgroup_data = {}
             opportunity_copy = opportunity.copy()

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

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