Folder structure changes for shared files in Sign up and User Profile

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

@@ -1,9 +1,9 @@
-import { signUpFormSchema } from "@/features/sign-up/api/schemas";
 import {
   INDUSTRIES,
   MATCHING_PREFERENCES,
 } from "@/features/sign-up/components/signUpFormConfig";
-import { SignUpFormValues } from "@/features/sign-up/types";
+import { userProfileSchema } from "@/features/user-profile/api/schemas";
+import { UserProfileValues } from "@/features/user-profile/types";
 import {
   Alert,
   Button,
@@ -27,7 +27,7 @@ const matchingPreferenceOptions = MATCHING_PREFERENCES.map((v) => ({
 const industryOptions = INDUSTRIES.map((v) => ({ value: v, label: v }));
 
 // Define initial values
-const initialFormValues: SignUpFormValues = {
+const initialFormValues: UserProfileValues = {
   fullName: "",
   email: "",
   linkedin: "",
@@ -42,12 +42,12 @@ const initialFormValues: SignUpFormValues = {
 
 export function SignUpForm() {
   // State management
-  const [values, setValues] = useState<SignUpFormValues>(() => ({
+  const [values, setValues] = useState<UserProfileValues>(() => ({
     ...initialFormValues,
   }));
 
   const [errors, setErrors] = useState<
-    Partial<Record<keyof SignUpFormValues, string>>
+    Partial<Record<keyof UserProfileValues, string>>
   >({});
 
   const [isSubmitting, setIsSubmitting] = useState(false);
@@ -65,9 +65,9 @@ export function SignUpForm() {
   };
 
   // Handlers
-  const handleFieldChange = <K extends keyof SignUpFormValues>(
+  const handleFieldChange = <K extends keyof UserProfileValues>(
     field: K,
-    value: SignUpFormValues[K],
+    value: UserProfileValues[K],
   ) => {
     setValues((current) => ({ ...current, [field]: value }));
     setErrors((current) => ({ ...current, [field]: undefined }));
@@ -76,11 +76,11 @@ export function SignUpForm() {
   };
 
   const handleFieldBlur = (
-    field: keyof SignUpFormValues,
+    field: keyof UserProfileValues,
     overrideValue?: string,
   ) => {
     const valueToValidate = overrideValue ?? values[field];
-    const fieldSchema = signUpFormSchema.pick({ [field]: true } as Record<
+    const fieldSchema = userProfileSchema.pick({ [field]: true } as Record<
       typeof field,
       true
     >);
@@ -92,15 +92,15 @@ export function SignUpForm() {
   };
 
   // Validation logic
-  const validateForm = (values: SignUpFormValues) => {
-    const result = signUpFormSchema.safeParse(values);
+  const validateForm = (values: UserProfileValues) => {
+    const result = userProfileSchema.safeParse(values);
     const fieldErrors =
       result.success ? {} : result.error?.flatten().fieldErrors;
-    const errors = {} as Partial<Record<keyof SignUpFormValues, string>>;
+    const errors = {} as Partial<Record<keyof UserProfileValues, string>>;
     for (const key in fieldErrors) {
-      if (fieldErrors[key as keyof SignUpFormValues]?.[0]) {
-        errors[key as keyof SignUpFormValues] =
-          fieldErrors[key as keyof SignUpFormValues]?.[0];
+      if (fieldErrors[key as keyof UserProfileValues]?.[0]) {
+        errors[key as keyof UserProfileValues] =
+          fieldErrors[key as keyof UserProfileValues]?.[0];
       }
     }
     return errors;
@@ -211,7 +211,7 @@ export function SignUpForm() {
             onChange={(value) =>
               handleFieldChange(
                 "matchingPreference",
-                (value || "") as SignUpFormValues["matchingPreference"],
+                (value || "") as UserProfileValues["matchingPreference"],
               )
             }
             onBlur={() => handleFieldBlur("matchingPreference")}
@@ -225,7 +225,7 @@ export function SignUpForm() {
             onChange={(value) =>
               handleFieldChange(
                 "industry",
-                (value || "") as SignUpFormValues["industry"],
+                (value || "") as UserProfileValues["industry"],
               )
             }
             onBlur={() => handleFieldBlur("industry")}

js/src/features/sign-up/components/signUpFormConfig.ts

@@ -5,14 +5,6 @@ export const MATCHING_PREFERENCES = [
   "No Preference - I am open to any type of match",
 ] as const;
 
-export const TALKING_POINTS = [
-  "Career journey",
-  "Advice",
-  "Current events",
-  "Hobbies",
-  "Other",
-] as const;
-
 export const INDUSTRIES = [
   "Technology",
   "Finance",

js/src/features/user-profile/UserProfile.page.tsx

@@ -0,0 +1,9 @@
+import { Stack, Title } from "@mantine/core";
+
+export function UserProfilePage() {
+  return (
+    <Stack gap="xl">
+      <Title order={2}>User Profile</Title>
+    </Stack>
+  );
+}

js/src/features/sign-up/api/schemas.ts → js/src/features/user-profile/api/schemas.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 
-export const signUpFormSchema = z.object({
+export const userProfileSchema = z.object({
   fullName: z.string().min(1, "Full Name is required."),
   email: z
     .string()

js/src/features/sign-up/types.ts → js/src/features/user-profile/types.ts

@@ -1,4 +1,4 @@
-export interface SignUpFormValues {
+export interface UserProfileValues {
   fullName: string;
   email: string;
   linkedin: string;

pom.xml

@@ -298,6 +298,9 @@
                     <schemas>
                         <schema>public</schema>
                     </schemas>
+                    <locations>
+                        <location>filesystem:db/migration</location>
+                    </locations>
                     <validateMigrationNaming>true</validateMigrationNaming>
                 </configuration>
                 <dependencies>

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

@@ -0,0 +1,48 @@
+package org.patinanetwork.patchats.api.member;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.patinanetwork.patchats.api.member.dto.CreateMemberRequest;
+import org.patinanetwork.patchats.api.member.dto.MemberDto;
+import org.patinanetwork.patchats.common.dto.ApiResponder;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/members")
+@Tag(name = "Member")
+@RequiredArgsConstructor
+public class MemberController {
+
+    private final MemberService memberService;
+
+    @PostMapping
+    public ResponseEntity<ApiResponder<MemberDto>> createMember(@Valid @RequestBody final CreateMemberRequest request) {
+        final MemberDto response = memberService.createMember(request);
+        return ResponseEntity.ok(ApiResponder.success("Member created successfully", response));
+    }
+
+    // TODO: Implement these endpoints after createMember is fully functional and tested
+    // @PatchMapping("/{id}")
+    // public ResponseEntity<ApiResponder<MemberDto>> updateMember(
+    //         @Valid @RequestBody final UpdateMemberRequest request, @PathVariable final UUID id) {
+    //     final MemberDto response = memberService.updateMember(request, id);
+    //     return ResponseEntity.ok(ApiResponder.success("Member updated successfully", response));
+    // }
+
+    // @GetMapping("/{id}")
+    // public ResponseEntity<ApiResponder<MemberDto>> getMember(@PathVariable final UUID id) {
+    //     final MemberDto response = memberService.getMemberById(id);
+    //     return ResponseEntity.ok(ApiResponder.success("Member retrieved successfully", response));
+    // }
+
+    // @DeleteMapping("/{id}")
+    // public ResponseEntity<ApiResponder<MemberDto>> deactivateMember(@PathVariable final UUID id) {
+    //     final MemberDto response = memberService.deactivateMemberById(id);
+    //     return ResponseEntity.ok(ApiResponder.success("Member deactivated successfully", response));
+    // }
+}

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

@@ -0,0 +1,81 @@
+package org.patinanetwork.patchats.api.member;
+
+import java.util.UUID;
+import lombok.RequiredArgsConstructor;
+import org.patinanetwork.patchats.api.member.db.models.Member;
+import org.patinanetwork.patchats.api.member.db.repos.MemberRepo;
+import org.patinanetwork.patchats.api.member.dto.CreateMemberRequest;
+import org.patinanetwork.patchats.api.member.dto.MemberDto;
+import org.patinanetwork.patchats.api.member.dto.UpdateMemberRequest;
+import org.patinanetwork.patchats.common.web.exception.MemberDuplicateException;
+import org.patinanetwork.patchats.common.web.exception.MemberNotFoundException;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
+
+@Service
+@RequiredArgsConstructor
+public class MemberService {
+
+    private final MemberRepo memberRepo;
+
+    public MemberDto createMember(CreateMemberRequest request) {
+        if (memberRepo.getMemberByEmail(request.email()).isPresent()) {
+            throw new MemberDuplicateException(request.email());
+        }
+        Member member = Member.builder()
+                .id(UUID.randomUUID())
+                .fullName(request.fullName())
+                .email(request.email())
+                .linkedInUrl(request.linkedInUrl())
+                .introduction(request.introduction())
+                .referralSource(request.referralSource())
+                .active(true)
+                .matchPref(request.matchPref())
+                .industryPref(request.industryPref())
+                .rolePref(request.rolePref())
+                .topics(request.topics())
+                .extraNotes(request.extraNotes())
+                .build();
+        Member createdMember = memberRepo.createMember(member);
+        return MemberDto.from(createdMember);
+    }
+
+    public MemberDto updateMember(UpdateMemberRequest request, UUID id) {
+        if (memberRepo.getMemberById(id).isEmpty()) {
+            throw new MemberNotFoundException(id);
+        }
+        // TODO: Implement partial update instead of full update
+        Member member = Member.builder()
+                .id(id)
+                .fullName(request.fullName())
+                .email(request.email())
+                .linkedInUrl(request.linkedInUrl())
+                .introduction(request.introduction())
+                .matchPref(request.matchPref())
+                .industryPref(request.industryPref())
+                .rolePref(request.rolePref())
+                .topics(request.topics())
+                .extraNotes(request.extraNotes())
+                .build();
+        Member updatedMember = memberRepo
+                .updateMember(member)
+                .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Member not found"));
+        return MemberDto.from(updatedMember);
+    }
+
+    // TODO: Implement these methods after createMember and updateMember is fully functional and tested
+    // public MemberDto getMemberById(UUID id) {
+    //     return memberRepo
+    //             .getMemberById(id)
+    //             .map(MemberDto::from)
+    //             .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Member not found"));
+    // }
+
+    // public MemberDto deactivateMemberById(UUID id) {
+    //     return memberRepo
+    //             .deactivateMemberById(id)
+    //             .map(MemberDto::from)
+    //             .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Member not found"));
+    // }
+}

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

@@ -0,0 +1,55 @@
+package org.patinanetwork.patchats.api.member.db.models;
+
+import java.time.Instant;
+import java.util.UUID;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Builder
+@ToString
+@EqualsAndHashCode
+public class Member {
+
+    private UUID id;
+
+    @Setter
+    private String fullName;
+
+    @Setter
+    private String email;
+
+    @Setter
+    private String linkedInUrl;
+
+    @Setter
+    private String introduction;
+
+    @Setter
+    private String referralSource;
+
+    @Setter
+    private boolean active;
+
+    @Setter
+    private String matchPref;
+
+    @Setter
+    private String industryPref;
+
+    @Setter
+    private String rolePref;
+
+    @Setter
+    private String topics;
+
+    @Setter
+    private String extraNotes;
+
+    private Instant createdAt;
+
+    private Instant updatedAt;
+}

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

@@ -0,0 +1,47 @@
+package org.patinanetwork.patchats.api.member.db.repos;
+
+import java.util.Optional;
+import java.util.UUID;
+import org.patinanetwork.patchats.api.member.db.models.Member;
+
+public interface MemberRepo {
+    /**
+     * @note - The provided object's methods will be overridden with any returned data from the database.
+     * @param member - required fields:
+     *     <ul>
+     *       <li>id
+     *       <li>fullName
+     *       <li>email
+     *       <li>introduction
+     *       <li>active
+     *       <li>createdAt
+     *       <li>updatedAt
+     *     </ul>
+     */
+    Member createMember(Member member);
+
+    /**
+     * @note - The provided object's methods will be overridden with any returned data from the database.
+     * @param member - overridden fields:
+     *     <ul>
+     *       <li>fullName
+     *       <li>email
+     *       <li>linkedInUrl
+     *       <li>introduction
+     *       <li>referralSource
+     *       <li>active
+     *       <li>matchPref
+     *       <li>industryPref
+     *       <li>rolePref
+     *       <li>topics
+     *       <li>extraNotes
+     *     </ul>
+     */
+    Optional<Member> updateMember(Member member);
+
+    Optional<Member> getMemberById(UUID id);
+
+    Optional<Member> getMemberByEmail(String email);
+
+    Optional<Member> deactivateMemberById(UUID id);
+}