Full name split into first and last name on sign up and members backend

js/src/features/member-profile/api/schemas.ts

@@ -1,7 +1,8 @@
 import { z } from "zod";
 
 export const memberProfileSchema = z.object({
-  fullName: z.string().min(1, "Full Name is required."),
+  firstName: z.string().min(1, "First Name is required."),
+  lastName: z.string().min(1, "Last Name is required."),
   email: z
     .string()
     .min(1, "Email Address is required.")

js/src/features/member-profile/types.ts

@@ -1,5 +1,6 @@
 export interface MemberProfileValues {
-  fullName: string;
+  firstName: string;
+  lastName: string;
   email: string;
   linkedInUrl: string;
   introduction: string;

js/src/features/sign-up/components/SignUpForm.tsx

@@ -28,7 +28,8 @@ const industryPrefOptions = INDUSTRIES.map((v) => ({ value: v, label: v }));
 
 // Define initial values
 const initialFormValues: MemberProfileValues = {
-  fullName: "",
+  firstName: "",
+  lastName: "",
   email: "",
   linkedInUrl: "",
   introduction: "",
@@ -153,15 +154,25 @@ export function SignUpForm() {
           <Title order={3}>Contact</Title>
           <TextInput
             required
-            label="Full Name"
-            value={values.fullName}
+            label="First Name"
+            value={values.firstName}
             onChange={(event) =>
-              handleFieldChange("fullName", event.target.value)
+              handleFieldChange("firstName", event.target.value)
             }
-            onBlur={() => handleFieldBlur("fullName")}
-            error={errors.fullName}
+            onBlur={() => handleFieldBlur("firstName")}
+            error={errors.firstName}
             autoFocus
           />
+          <TextInput
+            required
+            label="Last Name"
+            value={values.lastName}
+            onChange={(event) =>
+              handleFieldChange("lastName", event.target.value)
+            }
+            onBlur={() => handleFieldBlur("lastName")}
+            error={errors.lastName}
+          />
           <TextInput
             required
             type="email"

src/main/java/org/patinanetwork/patchats/api/member/MemberService.java

@@ -23,7 +23,8 @@ public MemberDto createMember(CreateMemberRequest request) {
         }
         Member member = Member.builder()
                 .id(UUID.randomUUID())
-                .fullName(request.fullName())
+                .firstName(request.firstName())
+                .lastName(request.lastName())
                 .email(request.email())
                 .linkedInUrl(request.linkedInUrl())
                 .introduction(request.introduction())
@@ -42,8 +43,11 @@ public MemberDto createMember(CreateMemberRequest request) {
     public MemberDto updateMember(UpdateMemberRequest request, UUID id) {
         Member member = memberRepo.getMemberById(id).orElseThrow(() -> new MemberNotFoundException(id));
 
-        if (request.fullName() != null) {
-            member.setFullName(request.fullName());
+        if (request.firstName() != null) {
+            member.setFirstName(request.firstName());
+        }
+        if (request.lastName() != null) {
+            member.setLastName(request.lastName());
         }
         if (request.email() != null) {
             member.setEmail(request.email());

src/main/java/org/patinanetwork/patchats/api/member/db/models/Member.java

@@ -18,7 +18,10 @@ public class Member {
     private UUID id;
 
     @Setter
-    private String fullName;
+    private String firstName;
+
+    @Setter
+    private String lastName;
 
     @Setter
     private String email;

src/main/java/org/patinanetwork/patchats/api/member/db/repos/MemberRepo.java

@@ -10,7 +10,8 @@ public interface MemberRepo {
      * @param member - required fields:
      *     <ul>
      *       <li>id
-     *       <li>fullName
+     *       <li>firstName
+     *       <li>lastName
      *       <li>email
      *       <li>introduction
      *       <li>active
@@ -24,7 +25,8 @@ public interface MemberRepo {
      * @note - The provided object's methods will be overridden with any returned data from the database.
      * @param member - overridden fields:
      *     <ul>
-     *       <li>fullName
+     *       <li>firstName
+     *       <li>lastName
      *       <li>email
      *       <li>linkedInUrl
      *       <li>introduction

src/main/java/org/patinanetwork/patchats/api/member/db/repos/MemberSqlRepo.java

@@ -19,7 +19,8 @@ public class MemberSqlRepo implements MemberRepo {
     private Member parseResultSetToMember(final ResultSet rs) throws SQLException {
         return Member.builder()
                 .id(UUID.fromString(rs.getString("id")))
-                .fullName(rs.getString("full_name"))
+                .firstName(rs.getString("first_name"))
+                .lastName(rs.getString("last_name"))
                 .email(rs.getString("email"))
                 .linkedInUrl(rs.getString("linked_in_url"))
                 .introduction(rs.getString("introduction"))
@@ -40,7 +41,8 @@ public Member createMember(Member member) {
         String sql = """
             INSERT INTO "members" (
                 "id",
-                "full_name",
+                "first_name",
+                "last_name",
                 "email",
                 "linked_in_url",
                 "introduction",
@@ -54,7 +56,8 @@ public Member createMember(Member member) {
             )
             VALUES(
                 :id,
-                :full_name,
+                :first_name,
+                :last_name,
                 :email,
                 :linked_in_url,
                 :introduction,
@@ -71,7 +74,8 @@ public Member createMember(Member member) {
         """;
         return jdbc.sql(sql)
                 .param("id", member.getId())
-                .param("full_name", member.getFullName())
+                .param("first_name", member.getFirstName())
+                .param("last_name", member.getLastName())
                 .param("email", member.getEmail())
                 .param("linked_in_url", member.getLinkedInUrl())
                 .param("introduction", member.getIntroduction())

src/main/java/org/patinanetwork/patchats/api/member/dto/CreateMemberRequest.java

@@ -4,7 +4,8 @@
 import jakarta.validation.constraints.NotBlank;
 
 public record CreateMemberRequest(
-        @NotBlank String fullName,
+        @NotBlank String firstName,
+        @NotBlank String lastName,
         @NotBlank @Email String email,
         String linkedInUrl,
         @NotBlank String introduction,

src/main/java/org/patinanetwork/patchats/api/member/dto/MemberDto.java

@@ -19,7 +19,10 @@ public class MemberDto {
     private UUID id;
 
     @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    private String fullName;
+    private String firstName;
+
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
+    private String lastName;
 
     // TODO: Changes to email require verification after authentication is implemented
     @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@@ -61,7 +64,8 @@ public class MemberDto {
     public static MemberDto from(final Member member) {
         return MemberDto.builder()
                 .id(member.getId())
-                .fullName(member.getFullName())
+                .firstName(member.getFirstName())
+                .lastName(member.getLastName())
                 .email(member.getEmail())
                 .linkedInUrl(member.getLinkedInUrl())
                 .introduction(member.getIntroduction())

src/main/java/org/patinanetwork/patchats/api/member/dto/UpdateMemberRequest.java

@@ -3,7 +3,8 @@
 import jakarta.validation.constraints.Email;
 
 public record UpdateMemberRequest(
-        String fullName,
+        String firstName,
+        String lastName,
         // TODO: Changes to email require verification after authentication is implemented
         @Email String email,
         String linkedInUrl,

src/test/java/org/patinanetwork/patchats/api/member/MemberControllerTest.java

@@ -34,7 +34,8 @@ class MemberControllerTest {
     @Test
     void createMember_ReturnsOkAndMemberDto() throws Exception {
         final CreateMemberRequest request = new CreateMemberRequest(
-                "John Doe",
+                "John",
+                "Doe",
                 "john.doe@example.com",
                 "https://www.linkedin.com/in/johndoe",
                 "Hello, I'm John!",
@@ -48,7 +49,8 @@ void createMember_ReturnsOkAndMemberDto() throws Exception {
         when(memberService.createMember(any()))
                 .thenReturn(MemberDto.builder()
                         .id(UUID.randomUUID())
-                        .fullName(request.fullName())
+                        .firstName(request.firstName())
+                        .lastName(request.lastName())
                         .email(request.email())
                         .linkedInUrl(request.linkedInUrl())
                         .introduction(request.introduction())
@@ -64,10 +66,11 @@ void createMember_ReturnsOkAndMemberDto() throws Exception {
                         post("/api/members")
                                 .contentType(MediaType.APPLICATION_JSON)
                                 .content(
-                                        "{\"fullName\":\"John Doe\",\"email\":\"john.doe@example.com\",\"linkedInUrl\":\"https://www.linkedin.com/in/johndoe\",\"introduction\":\"Hello, I'm John!\",\"referralSource\":\"Friend\",\"matchPref\":\"Mentor - I am looking for guidance from someone with more experience\",\"industryPref\":\"Technology\",\"rolePref\":\"Software Engineer\",\"topics\":\"College, Career Development\",\"extraNotes\":\"I want to be meet someone in person in NYC\"}"))
+                                        "{\"firstName\":\"John\",\"lastName\":\"Doe\",\"email\":\"john.doe@example.com\",\"linkedInUrl\":\"https://www.linkedin.com/in/johndoe\",\"introduction\":\"Hello, I'm John!\",\"referralSource\":\"Friend\",\"matchPref\":\"Mentor - I am looking for guidance from someone with more experience\",\"industryPref\":\"Technology\",\"rolePref\":\"Software Engineer\",\"topics\":\"College, Career Development\",\"extraNotes\":\"I want to be meet someone in person in NYC\"}"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.success").value(true))
-                .andExpect(jsonPath("$.payload.fullName").value(request.fullName()))
+                .andExpect(jsonPath("$.payload.firstName").value(request.firstName()))
+                .andExpect(jsonPath("$.payload.lastName").value(request.lastName()))
                 .andExpect(jsonPath("$.payload.email").value(request.email()))
                 .andExpect(jsonPath("$.payload.linkedInUrl").value(request.linkedInUrl()))
                 .andExpect(jsonPath("$.payload.introduction").value(request.introduction()))
@@ -82,12 +85,12 @@ void createMember_ReturnsOkAndMemberDto() throws Exception {
     }
 
     @Test
-    void createMember_returnsBadRequestWhenFullNameIsBlank() throws Exception {
+    void createMember_returnsBadRequestWhenFirstNameIsBlank() throws Exception {
         mockMvc.perform(
                         post("/api/members")
                                 .contentType(MediaType.APPLICATION_JSON)
                                 .content(
-                                        "{\"fullName\":\"\",\"email\":\"john.doe@example.com\",\"linkedInUrl\":\"https://www.linkedin.com/in/johndoe\",\"introduction\":\"Hello, I'm John!\",\"referralSource\":\"Friend\",\"matchPref\":\"Mentor - I am looking for guidance from someone with more experience\",\"industryPref\":\"Technology\",\"rolePref\":\"Software Engineer\",\"topics\":\"College, Career Development\",\"extraNotes\":\"I want to be meet someone in person in NYC\"}"))
+                                        "{\"firstName\":\"\",\"lastName\":\"Doe\",\"email\":\"john.doe@example.com\",\"linkedInUrl\":\"https://www.linkedin.com/in/johndoe\",\"introduction\":\"Hello, I'm John!\",\"referralSource\":\"Friend\",\"matchPref\":\"Mentor - I am looking for guidance from someone with more experience\",\"industryPref\":\"Technology\",\"rolePref\":\"Software Engineer\",\"topics\":\"College, Career Development\",\"extraNotes\":\"I want to be meet someone in person in NYC\"}"))
                 .andExpect(status().isBadRequest())
                 .andExpect(jsonPath("$.success").value(false));
     }
@@ -99,7 +102,7 @@ void createMember_returnsConflictOnDuplicateEmail() throws Exception {
                         post("/api/members")
                                 .contentType(MediaType.APPLICATION_JSON)
                                 .content(
-                                        "{\"fullName\":\"John Doe\",\"email\":\"john.doe@example.com\",\"linkedInUrl\":\"https://www.linkedin.com/in/johndoe\",\"introduction\":\"Hello, I'm John!\",\"referralSource\":\"Friend\",\"matchPref\":\"Mentor - I am looking for guidance from someone with more experience\",\"industryPref\":\"Technology\",\"rolePref\":\"Software Engineer\",\"topics\":\"College, Career Development\",\"extraNotes\":\"I want to be meet someone in person in NYC\"}"))
+                                        "{\"firstName\":\"John\",\"lastName\":\"Doe\",\"email\":\"john.doe@example.com\",\"linkedInUrl\":\"https://www.linkedin.com/in/johndoe\",\"introduction\":\"Hello, I'm John!\",\"referralSource\":\"Friend\",\"matchPref\":\"Mentor - I am looking for guidance from someone with more experience\",\"industryPref\":\"Technology\",\"rolePref\":\"Software Engineer\",\"topics\":\"College, Career Development\",\"extraNotes\":\"I want to be meet someone in person in NYC\"}"))
                 .andExpect(status().isConflict())
                 .andExpect(jsonPath("$.success").value(false));
     }