[DHL Parcel DE] Bug: "Address Line 2" always omitted, "Name" duplicated when company is empty

[MarcoWel]

Example 1: "Address Line 2" always omitted

Recipient:

Result:

---

Example 2: "Name" duplicated when company is empty

Recipient:

Result:

[danh91]

At first glance

• Name duplication is one of those instances where the company name is required by DHL Parcel DE, and the choice is between letting the request fail when it is missing or reusing the contact name as a fallback to make the request pass 🤔. @MarcoWel, what do you suggest here?

• Regarding "Address Line 2", it is indeed not assigned
  

  karrio/modules/connectors/dhl_parcel_de/karrio/providers/dhl_parcel_de/shipment/create.py

  Lines 101 to 134 in c3c7ffc

  	shipper=dhl_parcel_de.ShipperType(
  	name1=shipper.company_name or shipper.person_name or "N/A",
  	name2=shipper.person_name,
  	name3=None,
  	addressStreet=shipper.street_name,
  	addressHouse=shipper.street_number,
  	postalCode=shipper.postal_code,
  	city=shipper.city,
  	country=units.CountryCode.map(shipper.country_code).value_or_key,
  	contactName=shipper.person_name,
  	email=shipper.email,
  	),
  	consignee=dhl_parcel_de.ConsigneeType(
  	name1=recipient.company_name or recipient.person_name or "N/A",
  	name2=recipient.person_name,
  	name3=None,
  	dispatchingInformation=None,
  	addressStreet=recipient.street_name,
  	addressHouse=recipient.street_number,
  	additionalAddressInformation1=None,
  	additionalAddressInformation2=None,
  	postalCode=recipient.postal_code,
  	city=recipient.city,
  	state=recipient.state_code,
  	country=units.CountryCode.map(recipient.country_code).value_or_key,
  	contactName=recipient.person_name,
  	phone=recipient.phone_number,
  	email=recipient.email,
  	name=recipient.contact,
  	lockerID=options.locker_id.state,
  	postNumber=options.post_number.state,
  	retailID=options.retail_id.state,
  	poBoxID=options.po_box_id.state,
  	),

karrio/modules/sdk/karrio/core/units.py

Line 1438 in c3c7ffc

class ComputedAddress(models.Address):

The general observation here is that the EU addresses mapping needs more work to adapt properly with the API.

[MarcoWel]

Please refer to DHL API docs here:
https://developer.dhl.com/api-reference/parcel-de-shipping-post-parcel-germany-v2?lang=en#operations-Shipments_and_Labels-createOrders > POST /orders > Request body > Show Data Schema

• Only name1 is required, name2 and name3 are optional. There is no "Company" field for DHL, only a contactName which is optional as well.
• address_line2 should for sure be printed on the label, it can contain the Postnummer as well.
• addressStreet can contain street name including house number, which should be karrio's address_line1, correct?

Suggest the following (I believe I did this before for the old dpdhl implementation, but all the issues including this documentation are gone):

 shipper=dhl_parcel_de.ShipperType( 
     name1=shipper.company_name  if shipper.company_name else shipper.person_name, # Changed
     name2=shipper.person_name   if shipper.company_name else shipper.address_line2, # Changed
     name3=shipper.address_line2 if shipper.company_name else None, # Changed
     addressStreet=shipper.address_line1, # Changed
     addressHouse=None, # Removed, optional if stated in addressStreet
     postalCode=shipper.postal_code, 
     city=shipper.city, 
     country=units.CountryCode.map(shipper.country_code).value_or_key, 
     contactName=shipper.person_name, 
     email=shipper.email, 
 ), 
 consignee=dhl_parcel_de.ConsigneeType( 
     name1=recipient.company_name  if recipient.company_name else recipient.person_name, # Changed
     name2=recipient.person_name   if recipient.company_name else recipient.address_line2, # Changed
     name2=recipient.address_line2 if recipient.company_name else None, # Changed
     dispatchingInformation=None, 
     addressStreet=shipper.address_line1, # Changed
     addressHouse=None, # Removed, optional if stated in addressStreet
     additionalAddressInformation1=None, 
     additionalAddressInformation2=None, 
     postalCode=recipient.postal_code, 
     city=recipient.city, 
     state=recipient.state_code, 
     country=units.CountryCode.map(recipient.country_code).value_or_key, 
     contactName=recipient.person_name, 
     phone=recipient.phone_number, 
     email=recipient.email, 
     name=recipient.contact, 
     lockerID=options.locker_id.state, 
     postNumber=options.post_number.state, 
     retailID=options.retail_id.state, 
     poBoxID=options.po_box_id.state, 
 ),