From d5742d7d309d8ba554f5671b49c6e85d4d16d85a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=20Ka=C3=9Feb=C3=B6hmer?= Date: Fri, 16 May 2025 12:13:54 +0200 Subject: [PATCH] asset warranty saves --- .gitignore | 5 +- __pycache__/sf_auth.cpython-313.pyc | Bin 2176 -> 2743 bytes .../FillServiceContractFields.py | 2 +- .../extract_via_simple_salesforce.py | 102 ++++++++++------ prepared_steps/1_extract_data/queries.json | 6 +- .../2_transform_via_script/TransformScript.py | 113 +++++++++++++----- sf_auth.py | 80 +++++++------ 7 files changed, 204 insertions(+), 104 deletions(-) diff --git a/.gitignore b/.gitignore index a65adcc..804eb5d 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,7 @@ ServiceContract_beforetransform.csv failed_records_*.csv successful_records_*.csv failed_records.csv -successful_records.csv \ No newline at end of file +successful_records.csv +server.key +server.crt +AssetWarranty.csv \ No newline at end of file diff --git a/__pycache__/sf_auth.cpython-313.pyc b/__pycache__/sf_auth.cpython-313.pyc index b01a6309568fe1004fae72eed3cefa5f93dbe7f0..4a0041a289e58e3bb11c31fe7f7b582126cd2926 100644 GIT binary patch literal 2743 zcmaJ@O>7&-6`tktpA;!dvi>Qr9Yr!Fm3Hg+Cw3B;5h~oqagX)e`pK0^tD?k;vr`VZAHI&ANzdmM6Tx zzWJPc)wNI=@a&%f?E@sCLi;GQfOhVnLmEWa_UB4^HBN%aF5N>&@gRsy;zZ9lST8f5 zb`!nlS{^mmGT0n6$>nGTwCr`X1-~O5^@Y%p>_|>L-RRoe2-RQ@t8Ymtf<)h0m&9KN zvl8g$IuVliLWeW!sCR6g7(_n{?Ehx&`F={WGn)hVAtWG)8%2pg{bKMcHiaU=C9IjM zQZ@wGV?hzt)OD;0MO`!Tho-Pf^on5K#zGQGBdn@r9Ly)Y)GvvdLOwN@q5c~wQM@@{ zNYjXznU)IKg(Z1mK9|YU$b8{yDxdv9Y9TwH&!%a3dOj~obD4si%Pi68jY4)YwU7Z> zp2=R%Q1^|(e44sVY?#!Wo}Wu)^K~~{mAYkdM*j9c&=NlCsa30(5I3YvSgEK>H>eNH zRHAFtqnfy4P>)e9t0u(hYvn;hZHZDpn9D2|%HPHJsb^g&*D#G7naH3vSaAirQFZ## ziezA7tdP5kVc=W(im@t}@VX41R_4?-qL`|#tyCOIURM>_SS?j*D^-H43hc6Mn7C@J zd{>5TB}&nhONyziB$KC;N#;zcnYWYG`!u?SP5CGigN#5JtjNZ1;I)DF{3zP{)5<56 zPxXzf@NsOQ+0)+~9AW?c!_A@N&pUkG-i_Q|7xG89#&&%DO<`;^v~{iFkH7Gu&Y|t| zJJFLH*PgngTmC2R0nqgg{QS<(?(FuCHG0Rs>OJ*IaFcIFj%_Y&m8{Uvw((`?WHT=O za_JXKkH#MjJRY^iFYLrG{;sPLe`h!Tek1<=PCUJtZ%&-vj_icTpZic>VlRloeU`g- zA3{bip*8>t8?~Kq&L5!VL(EFZIn#hlz$!~wbcuY@rMUpxhp1#851NA|(S3+wkK_`) z48BcxmPED=W9`A)gMG56q9eG#^%RbYK%@HuEE(>3ofqtplr= zZ53KRlXjKJGT#?jze1XgPe4BcoyEI6@k~9Cb8ekIhoYmSc`a;+?s$zivmy zoY<@JDSnk(Mep**(JGhducw031S=*Mj#!^@k%o&5V8SiMz$F2M7OtlRliXLeHDUJV z0GqL)Yntf;r7R}@tvY)1%7seUqL z0)tdd$0vg&6aGN5*YZ#U{Y86ZvQP60WsOu0j$Tq7Gb{W*CW|VT7xw)kj?+T_a zRDn6}>7*pQ#wYbVqlDeKG@_F=MN{kcs@W1@hl)lFT&xk*yf2&jU98p5=CKOV5y8>J zDxeoM;PLkPLN+Zx&g*Ikm+Dh_T>!pQUkRg)bB?Tq83kyv#KLb?fr)Lksk<%-`Cq|( zV)GRBl=XX*&Lj;kGM3E{q7xd(d|1S=$xw~x^kH=m#(2Xd2{-A3 zIi#OW3;;Ua=h33fUW?<`7!#}j=9`-D9--LR% zez+SNdvw{laBX)o`!pQ0dd@$-_gJ;Mt~?2+n&D%+;o(MjxG79N$~T0|%{P+P=_`#l zQn0{CN-UAMy5|M@J`vyV7P@o6M(33d=)bp3hSy79rEX1=&+jV$a$ zB+D=Tdyi*E|1#c$P5pJsJ3Wkke=aoy-RH3odk+WG9{%&O!8GFkfIJ{4{G^)|2hhcS z(An3tePPp>p;oG8EE|VE>Fl#%pB=k!WCA7SG delta 1208 zcmb_bU1$?o6u$F6xv7(Eo3u@0%T29KM`95FR-*{6Xe&}>8=``s%x11_FqzRilUB31 z$>PIq5h-CF)~D4s(I?;ZN$}l=go1{ltO~vgk(Pb--k9k6u;7CS=A3)aIp4YWp7YI< zX#EFmW6Kr@sO)$@w)k3UXsb}7JAr;1nZ|>(z-NTU`Y)m-+F0}bSqJ$zm~ zM3YP&fVnULdC~ign~BNif6mJ(>Yt;*AV46`O#(eoec}DX9jL*hWWmWoM5SO`F23%f zX~!jc79HztEu)OlG|nt!(kOM!*qx&0DzVL!4&gj@E5z#I&0@i&FoI2NxkaPoAm%CB zmO*Zy<)XWYDh?*BTpC?99B0`k=4cujmWdo(sF0$2!&&c-ZMcT3=ghWSE}{dH^bw9Sq{*G~oSah*ij&`vNs(#~5jZH(al`5(NGD^s80Cx-b}rkbfa%1& z6**Re-;o4gs%O#Bio3|DP@u<}U!QAPxJwOKP0rPdj#IQ2P~kt!q4(?aF^hbW@r|%< z5;h4EpsFhF-<{c|i@w@tm9O?$!aVQhX07dE&L99xWsR;ni0ADukvQf0i zHWro%W0fx$rIIf%8Knw#e0Y}G= TODAY AND Country__c = '{country}' limit 3" + },{ + "sobject": "WarrantyTerm", + "useREST": true, + "query": "SELECT Id, WarrantyTermName, WarrantyDuration, WarrantyType, pricebook2.country__c FROM WarrantyTerm WHERE Pricebook2Id = null OR pricebook2.Country__c = '{country}'" } ] } \ No newline at end of file diff --git a/prepared_steps/2_transform_via_script/TransformScript.py b/prepared_steps/2_transform_via_script/TransformScript.py index 4ae200c..95017f3 100644 --- a/prepared_steps/2_transform_via_script/TransformScript.py +++ b/prepared_steps/2_transform_via_script/TransformScript.py @@ -40,10 +40,11 @@ read_df_address_iot = pd.read_csv('../1_extract_data/results/Address.csv', heade read_df_location_iot = pd.read_csv('../1_extract_data/results/ParentLocation.csv', header=0, keep_default_na=False, dtype=str) read_df_servicecontracttemplates = pd.read_csv('../1_extract_data/results/ContractTemplates.csv', header=0, keep_default_na=False, dtype=str) read_df_servicecontracts = pd.read_csv('../1_extract_data/results/SCContract__c.csv', header=0, keep_default_na=False, dtype=str) +read_df_warrantyterm = pd.read_csv('../1_extract_data/results/WarrantyTerm.csv', header=0, keep_default_na=False, dtype=str) # Columns for reindexing reindex_columns = ['Id','City__c','Country__c','GeoY__c','GeoX__c','PostalCode__c','Street__c','Extension__c','HouseNo__c','FlatNo__c','Floor__c'] -reindex_columns_ib = ['Id','Name','CommissioningDate__c','InstallationDate__c','ProductEnergy__c','ProductUnitClass__c','ArticleNo__c','SerialNo__c','SerialNoException__c','ProductUnitType__c','InstalledBaseLocation__c'] +reindex_columns_ib = ['Id', 'Name', 'CommissioningDate__c', 'InstallationDate__c', 'ProductEnergy__c', 'ProductUnitClass__c', 'ArticleNo__c', 'SerialNo__c', 'SerialNoException__c', 'ProductUnitType__c', 'InstalledBaseLocation__c', 'WarrantyDuration__c', 'GuaranteeStandard__c', 'GuaranteeExtended__c'] reindex_columns_product2 = ['Id','Main_Product_Group__c','Family','MaterialType__c','Name','Product_Code__c','ProductCode','EAN_Product_Code__c'] reindex_columns_ibr = ['Id', 'InstalledBaseLocation__c', 'Role__c', 'ValidFrom__c', 'ValidTo__c', 'Account__c'] reindex_columns_pricelist = ['Id', 'Name', 'Brand__r.Name', 'Country__c'] @@ -53,6 +54,7 @@ reindex_columns_address_iot = ['Id', 'Country', 'CountryCode', 'Street', 'City', reindex_columns_location_iot = ['Id', 'Name'] reindex_columns_servicecontracttemplates = ['Id', 'Name', 'TemplateName__c', 'Status__c', 'Brand__r.Name', 'Country__c', 'Runtime__c'] reindex_columns_servicecontracts = ['Id', 'Name', 'Template__c', 'Status__c', 'Brand__r.Name', 'Country__c', 'Runtime__c', 'EndDate__c', 'StartDate__c', 'Account__c', 'AccountOwner__c', 'IoT_Registration_Status__c'] +reindex_columns_warrantyterm = ['Id', 'WarrantyTermName', 'WarrantyDuration', 'WarrantyType', 'Pricebook2'] # Reindex the columns to match the desired format df = read_df.reindex(reindex_columns, axis=1) @@ -66,6 +68,7 @@ df_address_iot = read_df_address_iot.reindex(reindex_columns_address_iot, axis=1 df_location_iot = read_df_location_iot.reindex(reindex_columns_location_iot, axis=1) df_servicecontracttemplates = read_df_servicecontracttemplates.reindex(reindex_columns_servicecontracttemplates, axis=1) df_servicecontract = read_df_servicecontracts.reindex(reindex_columns_servicecontracts, axis=1) +df_warrantyterm = read_df_warrantyterm.reindex(reindex_columns_warrantyterm, axis=1) ##--------------------------------------------------------------------------## ## Update for IoT Addresses and Locations @@ -112,30 +115,6 @@ df['PKey__c'] = ( df['Country__c'].astype(str) ) -# Merge df_ib with df including additional columns -merged_df_ib = pd.merge(df_ib, - df[['Id', 'PKey__c', 'Extension__c', 'FlatNo__c', 'Floor__c']], - left_on='InstalledBaseLocation__c', - right_on='Id', - how='left') - -print(merged_df_ib.columns) - -# If there are missing values (no match found), you can fill them with a placeholder -#merged_df_ib['PKey__c'].fillna('Not Found', inplace=True) -#merged_df_ib = merged_df_ib['PKey__c'].fillna('Not Found') - -merged_df_ib['PKey__c'] = ( - merged_df_ib['PKey__c'].astype(str) + ';' + - merged_df_ib['Extension__c'].astype(str) + ';' + - merged_df_ib['FlatNo__c'].astype(str) + ';' + - merged_df_ib['Floor__c'].astype(str) -) - -merged_df_ib = merged_df_ib.drop('Extension__c', axis=1) -merged_df_ib = merged_df_ib.drop('FlatNo__c', axis=1) -merged_df_ib = merged_df_ib.drop('Floor__c', axis=1) - ## 1. Address.csv # Columns needed for Address table based on the input CSV structure address_columns = ['City__c', 'Country__c', @@ -224,6 +203,84 @@ child_df['IsInventoryLocation'] = 'false' child_df['IsMobile'] = 'false' child_df['LocationType'] = 'Site' +##--------------------------------------------------------------------------## +## Asset, AssociatedLocation, Asset Warranty +##--------------------------------------------------------------------------## + +# Merge df_ib with df including additional columns +merged_df_ib = pd.merge(df_ib, + df[['Id', 'PKey__c', 'Extension__c', 'FlatNo__c', 'Floor__c']], + left_on='InstalledBaseLocation__c', + right_on='Id', + how='left') + +print(merged_df_ib.columns) + +#Fetching data for standard warranty +df_assetwarranty_standard = df_ib[['Id', 'InstallationDate__c', 'GuaranteeStandard__c']] + +# Filter df_warrantyterm to get only standard warranty type rows +standard_warranty = df_warrantyterm[df_warrantyterm['WarrantyType'] == 'Standard'] + +# Add the warranty term ID to df_assetwarranty_standard +df_assetwarranty_standard['WarrantyTermId'] = standard_warranty['Id'].iloc[0] +print(df_assetwarranty_standard) + +# Rename columns for asset warranty +df_assetwarranty_standard.columns = ['Asset.PKey__c', 'StartDate', 'EndDate', 'WarrantyTerm.Id'] + +#Fetching data for extended warranty where GuaranteeExtended__c is filled and different from GuaranteeStandard__c +df_assetwarranty_extended = df_ib[ + (df_ib['GuaranteeExtended__c'].notna()) & + (df_ib['GuaranteeExtended__c'] != df_ib['GuaranteeStandard__c']) +][['Id', 'GuaranteeExtended__c', 'WarrantyDuration__c']] + +if(not df_assetwarranty_extended.empty): + # Calculate start date for extended warranty based on warranty duration + df_assetwarranty_extended['StartDate'] = pd.to_datetime(df_assetwarranty_extended['GuaranteeExtended__c']) - pd.to_timedelta(df_assetwarranty_extended['WarrantyDuration__c'].astype(float) * 30, unit='D') + + # Filter df_warrantyterm to get only extended warranty type rows + # Filter for extended warranty and matching warranty duration + extended_warranty = df_warrantyterm[(df_warrantyterm['WarrantyType'] == 'Extended') & + (df_warrantyterm['WarrantyDuration'] == df_assetwarranty_extended['WarrantyDuration__c'].iloc[0])] + + # If multiple or no warranty terms found, set WarrantyTermId to empty + if len(extended_warranty) != 1: + df_assetwarranty_extended['WarrantyTermId'] = '' + else: + df_assetwarranty_extended['WarrantyTermId'] = extended_warranty['Id'].iloc[0] + + df_assetwarranty_extended = df_assetwarranty_extended.drop('WarrantyDuration__c', axis=1) + + print(df_assetwarranty_extended) + + # Rename columns for asset warranty + df_assetwarranty_extended.columns = ['Asset.PKey__c', 'StartDate', 'EndDate', 'WarrantyTerm.Id'] + + # Add them to a merged df for saving purposes + df_assetwarranty_save = pd.concat(df_assetwarranty_standard, df_assetwarranty_extended) +else: + df_assetwarranty_save = df_assetwarranty_standard + +merged_df_ib = merged_df_ib.drop('GuaranteeStandard__c', axis=1) +merged_df_ib = merged_df_ib.drop('GuaranteeExtended__c', axis=1) +merged_df_ib = merged_df_ib.drop('WarrantyDuration__c', axis=1) + +# If there are missing values (no match found), you can fill them with a placeholder +#merged_df_ib['PKey__c'].fillna('Not Found', inplace=True) +#merged_df_ib = merged_df_ib['PKey__c'].fillna('Not Found') + +merged_df_ib['PKey__c'] = ( + merged_df_ib['PKey__c'].astype(str) + ';' + + merged_df_ib['Extension__c'].astype(str) + ';' + + merged_df_ib['FlatNo__c'].astype(str) + ';' + + merged_df_ib['Floor__c'].astype(str) +) + +merged_df_ib = merged_df_ib.drop('Extension__c', axis=1) +merged_df_ib = merged_df_ib.drop('FlatNo__c', axis=1) +merged_df_ib = merged_df_ib.drop('Floor__c', axis=1) + ## 4. Assets.csv #ArticleNo__c,CommissioningDate__c,Id,InstallationDate__c,InstalledBaseLocation__c,InstalledBaseLocation__r.Extension__c,InstalledBaseLocation__r.FlatNo__c,InstalledBaseLocation__r.Floor__c,InstalledBaseLocation__r.Id,Name,ProductEnergy__c,ProductUnitClass__c,ProductUnitType__c,SerialNo__c,SerialNoException__c @@ -468,13 +525,12 @@ df_servicecontract['Pricebook2.Name'] = ( "SERVICE" ) -df_servicecontract = df_servicecontract.drop('Name', axis=1) df_servicecontract = df_servicecontract.drop('Brand__r.Name', axis=1) -df_servicecontract.columns = ['PKey__c', 'TemplateId__r.PKey__c', 'Status', 'BillingCountryCode', 'Term', 'EndDate', 'StartDate', 'AccountId', 'Service_Recipient__c', 'IoT_Registration_Status__c', 'Pricebook2.Name'] +df_servicecontract.columns = ['PKey__c', 'Name', 'TemplateId__r.PKey__c', 'Status', 'BillingCountryCode', 'Term', 'EndDate', 'StartDate', 'AccountId', 'Service_Recipient__c', 'IoT_Registration_Status__c', 'Pricebook2.Name'] df_servicecontract['IoT_Registration_Status__c'] = df_servicecontract['IoT_Registration_Status__c'].replace('', 'Open') -df_servicecontract['Name'] = df_servicecontract['PKey__c'] +#df_servicecontract['Name'] = df_servicecontract['PKey__c'] df_servicecontract['TemplateCountry__c'] = df_servicecontract['BillingCountryCode'] #df_servicecontract = df_servicecontract.drop('TemplateId__r.PKey__c', axis=1) @@ -498,6 +554,7 @@ df_pricelistitem.to_csv('../12_insert_pricebook2_and_pricebookentries/PricebookE merged_df_location_iot.to_csv('../3_update_address_and_location_data_for_migration/Location.csv', index=False) df_servicecontracttemplates.to_csv('../13_insert_servicecontracttemplates_dummies/ServiceContract.csv', index=False) df_servicecontract.to_csv('../15_insert_servicecontract/ServiceContract_beforetransform.csv', index=False) +df_assetwarranty_save.to_csv('../8_upsert_assets/AssetWarranty.csv', index=False) ## end mapping print('Data has been successfully transformed and saved to CSV files.') \ No newline at end of file diff --git a/sf_auth.py b/sf_auth.py index 36536ed..b0ee50f 100644 --- a/sf_auth.py +++ b/sf_auth.py @@ -5,20 +5,17 @@ from simple_salesforce import Salesforce def get_credentials(context): """ Get credentials for a given context from the .env file - - Args: - context (str): Context name (e.g., 'qa2', 'prod') - - Returns: - dict: Credentials dictionary with username, password, and security_token """ context = context.upper() - # Initialize credentials dictionary + # Initialize credentials dictionary with all possible auth methods credentials = { 'USERNAME': None, 'PASSWORD': None, - 'SECURITY_TOKEN': None + 'SECURITY_TOKEN': None, + 'ORGANIZATIONID': None, + 'CONSUMER_KEY': None, + 'PRIVATEKEY_FILE': None } if context != 'PROD': @@ -29,9 +26,7 @@ def get_credentials(context): load_dotenv(env_file) # Load all environment variables - env_vars = os.environ - - for key, value in env_vars.items(): + for key, value in os.environ.items(): if f'{context}_SF_' in key: credential_key = key.split(f'{context}_SF_')[-1].upper() credentials[credential_key] = value @@ -40,31 +35,46 @@ def get_credentials(context): def get_sf_connection(context): """ - Create Salesforce connection based on context - - Args: - context (str): Context name (e.g., 'qa2', 'prod') - - Returns: - Salesforce: Authenticated Salesforce connection + Create Salesforce connection based on context, trying JWT first """ credentials = get_credentials(context) - if not all(credentials.values()): - raise ValueError(f"Missing credentials for context: {context}") + # Common parameters for all auth methods + sf_params = { + 'username': credentials['USERNAME'], + 'version': '62.0' + } - if context.lower() == 'prod': - return Salesforce( - username=credentials['USERNAME'], - password=credentials['PASSWORD'], - security_token=credentials['SECURITY_TOKEN'], - version='62.0' - ) - else: - return Salesforce( - username=credentials['USERNAME'], - password=credentials['PASSWORD'], - security_token=credentials['SECURITY_TOKEN'], - domain=credentials['DOMAIN'], - version='62.0' - ) \ No newline at end of file + # Add domain for non-prod environments + if context.lower() != 'prod': + sf_params['domain'] = 'test' + + try: + # Try JWT authentication first + if credentials['CONSUMER_KEY'] and credentials['PRIVATEKEY_FILE']: + print(f"Attempting JWT authentication for {context}") + sf_params.update({ + 'consumer_key': credentials['CONSUMER_KEY'], + 'privatekey_file': credentials['PRIVATEKEY_FILE'] + }) + return Salesforce(**sf_params) + + # Fall back to password + security token or org ID + elif credentials['PASSWORD']: + print(f"Falling back to password authentication for {context}") + sf_params['password'] = credentials['PASSWORD'] + + if credentials['ORGANIZATIONID']: + sf_params['organizationId'] = credentials['ORGANIZATIONID'] + elif credentials['SECURITY_TOKEN']: + sf_params['security_token'] = credentials['SECURITY_TOKEN'] + else: + raise ValueError("Neither security token nor organization ID provided") + + return Salesforce(**sf_params) + + else: + raise ValueError("No valid authentication credentials provided") + + except Exception as e: + raise ConnectionError(f"Failed to connect to Salesforce {context}: {str(e)}") \ No newline at end of file