SSCS-12059 - Revert code to use org name if present, missing first na… (#592)

* SSCS-12059 - Revert code to use org name if present, missing first name errors.

* SSCS-12059 - Revert code to use org name if present, missing first name errors.

---------

Co-authored-by: DGordonV1 <[email protected]>

Author: DGordonV1

src/main/java/uk/gov/hmcts/reform/sscs/helper/mapping/HearingsPartiesMapping.java

@@ -257,32 +257,30 @@ public static IndividualDetails getPartyIndividualDetails(Entity entity, Hearing
     }
 
     public static String getIndividualFirstName(Entity entity) throws ListingException {
-        String firstName = entity.getName().getFirstName();
+        String org = getIndividualOrganisation(entity);
+        if (isNotEmpty(org)) {
+            return ORGANISATION_NAME_REPLACEMENT;
+        }
 
+        String firstName = entity.getName().getFirstName();
         if (isEmpty(firstName)) {
             throw new ListingException("Missing first name");
         }
 
+        return firstName;
+    }
+
+    public static String getIndividualLastName(Entity entity) throws ListingException {
         String org = getIndividualOrganisation(entity);
         if (isNotEmpty(org)) {
             return ORGANISATION_NAME_REPLACEMENT;
         }
 
-        return firstName;
-    }
-
-    public static String getIndividualLastName(Entity entity) throws ListingException {
         String firstName = entity.getName().getLastName();
-
         if (isEmpty(firstName)) {
             throw new ListingException("Missing last name");
         }
 
-        String org = getIndividualOrganisation(entity);
-        if (!isEmpty(org)) {
-            return ORGANISATION_NAME_REPLACEMENT;
-        }
-
         return firstName;
     }