Removing First and Last name (#2997)

Author: annagav

authentication/pipeline/user_test.py

@@ -68,8 +68,6 @@ def mock_create_user_strategy(mocker):
         "password": "password1",
         "username": "custom-username",
         "legal_address": {
-            "first_name": "Jane",
-            "last_name": "Doe",
             "country": "US",
             "state": "US-MA",
         },
@@ -344,8 +342,6 @@ def test_create_user_via_email_with_shorter_name(mocker, mock_email_backend):
         "password": "password1",
         "username": "custom-username",
         "legal_address": {
-            "first_name": "Jane",
-            "last_name": "Doe",
             "country": "US",
         },
     }
@@ -589,7 +585,6 @@ def test_create_ol_oidc_user(  # noqa: PLR0913
     }
     details = {
         **base_details,
-        "first_name": "Test",
         "fullname": "Test Admin",
         "last_name": "Admin",
         "profile": {

b2b/management/commands/b2b_list.py

@@ -364,7 +364,7 @@ def handle_list_learners(self, *args, **kwargs):  # noqa: ARG002
         for learner in learners:
             learners_table.add_row(
                 learner.email,
-                f"{learner.first_name} {learner.last_name}",
+                f"{learner.name}",
             )
         self.console.print(learners_table)
 

ecommerce/mail_api.py

@@ -51,12 +51,7 @@ def send_ecommerce_order_receipt(order_record):
                     },
                     "receipt": receipt,
                     "purchaser": {
-                        "name": " ".join(
-                            [
-                                purchaser.get("first_name"),
-                                purchaser.get("last_name"),
-                            ]
-                        ),
+                        "name": purchaser.get("name"),
                         "email": purchaser.get("email"),
                         "street_address": purchaser.get("street_address"),
                         "state_code": purchaser.get("state_or_territory").split("-")[

ecommerce/mail_api_test.py

@@ -56,10 +56,7 @@ def test_mail_api_receipt_generation(  # noqa: PLR0913
 
     rendered_template = mock_send_message.call_args[0][0]
 
-    assert (
-        f"{order.purchaser.legal_address.first_name} {order.purchaser.legal_address.last_name}"
-        in rendered_template.body
-    )
+    assert f"{order.purchaser.name}" in rendered_template.body
     assert order.reference_number in rendered_template.body
 
     lines = order.lines.all()
@@ -90,9 +87,6 @@ def test_mail_api_refund_email_generation(
 
     rendered_template = mock_send_message.call_args[0][0]
 
-    assert (
-        f"{order.purchaser.legal_address.first_name} {order.purchaser.legal_address.last_name}"
-        in rendered_template.body
-    )
+    assert f"{order.purchaser.name}" in rendered_template.body
     assert order.reference_number in rendered_template.body
     assert str(refund_amount.quantize(Decimal("0.01"))) in rendered_template.body

ecommerce/serializers.py

@@ -722,8 +722,7 @@ def to_representation(self, instance):
         transaction = super().to_representation(instance).data
 
         fields = {
-            "first_name": instance.purchaser.legal_address.first_name,
-            "last_name": instance.purchaser.legal_address.last_name,
+            "name": instance.purchaser.name,
             "country": instance.purchaser.legal_address.country,
             "email": instance.purchaser.email,
             "street_address": [],

ecommerce/serializers_test.py

@@ -299,8 +299,7 @@ def get_test_order_data(order, receipt_data):
             "reference_number": order.reference_number,
         },
         "purchaser": {
-            "first_name": order.purchaser.legal_address.first_name,
-            "last_name": order.purchaser.legal_address.last_name,
+            "name": order.purchaser.name,
             "email": order.purchaser.email,
             "country": order.purchaser.legal_address.country,
             "state_or_territory": "",

ecommerce/templates/mail/order_refund_message/body.html

@@ -7,7 +7,7 @@
           <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
               <tr>
                   <td style="padding: 20px; font-family: sans-serif; font-size: 15px; line-height: 20px; color: #555555;">
-                      <p style="margin: 0 0 10px;">Dear {{ order.purchaser.legal_address.first_name }} {{ order.purchaser.legal_address.last_name }},</p>
+                      <p style="margin: 0 0 10px;">Dear {{ order.purchaser.name }},</p>
                       <p style="margin: 0 0 10px;">
                         We've processed your request for a refund of order {{order.reference_number}}. You should receive your credit in the amount of ${{transaction_amount}} for the course {{readable_id}} {{title}} within 5-10 business days.</p>
 

fixtures/common.py

@@ -86,8 +86,6 @@ def mock_context(mocker, user):
 def valid_address_dict():
     """Yields a dict that will deserialize into a valid legal address"""
     return dict(  # noqa: C408
-        first_name="Test",
-        last_name="User",
         country="US",
         state="US-MA",
     )
@@ -97,8 +95,6 @@ def valid_address_dict():
 def invalid_address_dict():
     """Yields a dict that will deserialize into an invalid US legal address"""
     return dict(  # noqa: C408
-        first_name="Test",
-        last_name="User",
         country="US",
         state="XX",
     )
@@ -108,8 +104,6 @@ def invalid_address_dict():
 def address_no_state_dict():
     """Yields a dict that will deserialize into a US legal address with no state"""
     return dict(  # noqa: C408
-        first_name="Test",
-        last_name="User",
         country="US",
         state=None,
     )
@@ -120,7 +114,6 @@ def intl_address_dict():
     """Yields a dict that will deserialize into an valid non-US/CA legal address"""
 
     return dict(  # noqa: C408
-        first_name="Test",
         last_name="User",
         country="JP",
     )

flexiblepricing/mail_api.py

@@ -62,7 +62,7 @@ def generate_flexible_price_email(flexible_price):
                 flexible_price.user.email,
                 {
                     "subject": subject,
-                    "first_name": flexible_price.user.legal_address.first_name,
+                    "first_name": flexible_price.user.name,
                     "message": message,
                     "program_name": program_name,
                 },
@@ -83,7 +83,7 @@ def send_financial_assistance_request_denied_email(
                 financial_assistance_request.user.email,
                 {
                     "subject": email_subject,
-                    "first_name": financial_assistance_request.user.legal_address.first_name,
+                    "first_name": financial_assistance_request.user.name,
                     "message": email_body,
                     "program_name": financial_assistance_request.courseware_object.title,
                 },

flexiblepricing/templates/mail/flexible_price/body.html

@@ -3,7 +3,7 @@
 {% block content %}
     <br>
     <div style="text-align: left; font-weight: normal; margin: 0 0 20px;">
-        <p>Dear {{ first_name }},</p>
+        <p>Dear {{ name }},</p>
         <p>{{ message }}</p>
         <p>Thank you,<br> "The {{program_name}} MITxOnline team"</p>
     </div>