Merge pull request #111 from uwblueprint/kathleen-megan/api-constants…

…-residents API constants residents
uwblueprint · Oct 24, 2024 · 71bd6c4 · 71bd6c4
2 parents c737b2a + 5715ba9
commit 71bd6c4
Show file tree

Hide file tree

Showing 4 changed files with 294 additions and 6 deletions.
diff --git a/frontend/src/APIClients/Mutations/ResidentsMutations.ts b/frontend/src/APIClients/Mutations/ResidentsMutations.ts
@@ -0,0 +1,67 @@
+import { gql } from "@apollo/client";
+
+export const ADD_RESIDENT = gql`
+  mutation AddResident($resident: CreateResidentDTO!) {
+    addResident(resident: $resident) {
+      userId
+      residentId
+      email
+      phoneNumber
+      firstName
+      lastName
+      displayName
+      profilePictureURL
+      isActive
+      birthDate
+      roomNumber
+      credits
+      dateJoined
+      dateLeft
+      notes
+    }
+  }
+`;
+
+export const UPDATE_RESIDENT = gql`
+  mutation UpdateResident($userId: ID!, $resident: UpdateResidentDTO!) {
+    updateResident(userId: $userId, resident: $resident) {
+      userId
+      residentId
+      email
+      phoneNumber
+      firstName
+      lastName
+      displayName
+      profilePictureURL
+      isActive
+      birthDate
+      roomNumber
+      credits
+      dateJoined
+      dateLeft
+      notes
+    }
+  }
+`;
+
+export const DELETE_RESIDENT = gql`
+  mutation DeleteResident($userId: ID!) {
+    deleteResident(userId: $userId) {
+      userId
+      residentId
+      email
+      phoneNumber
+      firstName
+      lastName
+      displayName
+      profilePictureURL
+      isActive
+      birthDate
+      roomNumber
+      credits
+      dateJoined
+      dateLeft
+      notes
+    }
+  }
+`;
diff --git a/frontend/src/APIClients/Queries/ResidentsQueries.ts b/frontend/src/APIClients/Queries/ResidentsQueries.ts
@@ -0,0 +1,67 @@
+import { gql } from "@apollo/client";
+
+export const GET_RESIDENTS_BY_ID = gql`
+  query GetResidentsByIds($userIds: [ID!]) {
+    getResidentsByIds(userIds: $userIds) {
+      userId
+      residentId
+      email
+      phoneNumber
+      firstName
+      lastName
+      displayName
+      profilePictureURL
+      isActive
+      birthDate
+      roomNumber
+      credits
+      dateJoined
+      dateLeft
+      notes
+    }
+  }
+`;
+
+export const GET_ALL_RESIDENTS = gql`
+  query GetAllResidents {
+    getAllResidents {
+      userId
+      residentId
+      email
+      phoneNumber
+      firstName
+      lastName
+      displayName
+      profilePictureURL
+      isActive
+      birthDate
+      roomNumber
+      credits
+      dateJoined
+      dateLeft
+      notes
+    }
+  }
+`;
+
+export const GET_ACTIVE_RESIDENTS = gql`
+  query GetActiveResidents {
+    getActiveResidents {
+      userId
+      residentId
+      email
+      phoneNumber
+      firstName
+      lastName
+      displayName
+      profilePictureURL
+      isActive
+      birthDate
+      roomNumber
+      credits
+      dateJoined
+      dateLeft
+      notes
+    }
+  }
+`;
diff --git a/frontend/src/APIClients/Types/ResidentsType.ts b/frontend/src/APIClients/Types/ResidentsType.ts
@@ -0,0 +1,51 @@
+export type UserResponse = {
+  userId: number;
+  residentId: number;
+  email: string;
+  phoneNumber?: string;
+  firstName: string;
+  lastName: string;
+  displayName?: string;
+  profilePictureURL?: string;
+  isActive: boolean;
+  birthDate: string;
+  roomNumber: number;
+  credits: number;
+  dateJoined: string;
+  dateLeft?: Date;
+  notes?: string;
+};
+
+export type UserRequest = {
+  email: string;
+  password: string;
+  phoneNumber?: string;
+  firstName: string;
+  lastName: string;
+  displayName?: string;
+  profilePictureURL?: string;
+  residentId: number;
+  birthDate: string;
+  roomNumber: number;
+  credits: number;
+  dateJoined: string;
+  dateLeft?: Date;
+  notes?: string;
+};
+
+export type UserRequestUpdate = {
+  email?: string;
+  password?: string;
+  phoneNumber?: string;
+  firstName?: string;
+  lastName?: string;
+  displayName?: string;
+  profilePictureURL?: string;
+  residentId?: number;
+  birthDate?: string;
+  roomNumber?: number;
+  credits?: number;
+  dateJoined?: string;
+  dateLeft?: Date;
+  notes?: string;
+};
diff --git a/frontend/src/components/pages/residents/ResidentsPage.tsx b/frontend/src/components/pages/residents/ResidentsPage.tsx
@@ -8,14 +8,32 @@ import {
   InputLeftElement,
 } from "@chakra-ui/react";
 import { Add, Search } from "@mui/icons-material";
+import { useQuery } from "@apollo/client";
+// import {
+//   ADD_RESIDENT,
+//   UPDATE_RESIDENT,
+//   DELETE_RESIDENT,
+// } from "../../../APIClients/Mutations/ResidentsMutations";
+
+import {
+  // GET_RESIDENTS_BY_ID,
+  GET_ALL_RESIDENTS,
+  // GET_ACTIVE_RESIDENTS,
+} from "../../../APIClients/Queries/ResidentsQueries";
+
+// import {
+//   UserResponse,
+//   UserRequest,
+//   UserRequestUpdate,
+// } from "../../../APIClients/Types/ResidentsType";
 
 import CommonTable, {
   ColumnInfoTypes,
   TableData,
 } from "../../common/CommonTable";
 import ResidentModal from "./ResidentModal";
 import ResidentEditModal, { ResidentEditInfo } from "./ResidentEditModal";
-import { residentsMockData } from "../../../mocks/residents";
+// import { residentsMockData } from "../../../mocks/residents";
 
 const columnTypes: ColumnInfoTypes[] = [
   {
@@ -41,10 +59,88 @@ const ResidentsPage = (): React.ReactElement => {
   const [isModalOpen, setIsModalOpen] = useState("none");
   const [residentEditInfo, setEditInfo] = useState<ResidentEditInfo>();
 
+  // const [addResident] = useMutation<{ addResident: UserResponse }>(
+  //   ADD_RESIDENT,
+  // );
+
+  // const [updateResident] = useMutation<{
+  //   userId: number;
+  //   resident: UserResponse;
+  // }>(UPDATE_RESIDENT);
+
+  // const [deleteResident] = useMutation<{ userId: number }>(DELETE_RESIDENT);
+
+  // const handleAddResident = async () => {
+  //   try {
+  //     const date = new Date();
+  //     const formattedDate = date.toISOString().split("T")[0];
+
+  //     const resident: UserRequest = {
+  //       email: "[email protected]",
+  //       password: "qe8e9r789ewr",
+  //       firstName: "Bob",
+  //       lastName: "Bob",
+  //       residentId: 1248120,
+  //       birthDate: formattedDate,
+  //       roomNumber: 3,
+  //       credits: 500,
+  //       dateJoined: formattedDate,
+  //     };
+  //     await addResident({ variables: { resident } });
+  //   } catch (e) {
+  //     console.log(e);
+  //   }
+  // };
+
+  // const handleUpdateResident = async () => {
+  //   try {
+  //     const userId = 5;
+  //     const resident: UserRequestUpdate = {
+  //       lastName: "NEW NAME",
+  //       roomNumber: 3,
+  //       credits: 10,
+  //     };
+  //     await updateResident({ variables: { userId, resident } });
+  //   } catch (e) {
+  //     console.log(e);
+  //   }
+  // };
+
+  // const handleDeleteResident = async () => {
+  //   try {
+  //     const userId = 1;
+  //     await deleteResident({ variables: { userId } });
+  //   } catch (e) {
+  //     console.log(e);
+  //   }
+  // };
+
+  // const ids = [4];
+  // const {
+  //   loading: residentIdLoading,
+  //   error: residentIdError,
+  //   data: residentIdData,
+  // } = useQuery<{ userIds: [number] }>(GET_RESIDENTS_BY_ID, {
+  //   variables: { userIds: ids },
+  // });
+
+  // const {
+  //   loading: residentActiveLoading,
+  //   error: residentActiveError,
+  //   data: residentActiveData,
+  // } = useQuery(GET_ACTIVE_RESIDENTS);
+
+  const {
+    // loading: residentAllLoading, MAY NEED TO ADD LOADING ICON/STATE
+    // error: residentAllError,
+    data: residentAllData,
+  } = useQuery(GET_ALL_RESIDENTS);
+
   useEffect(() => {
-    // TODO: Fetch residents from API
-    setResidents(residentsMockData);
-  }, []);
+    if (residentAllData?.getAllResidents) {
+      setResidents(residentAllData.getAllResidents);
+    }
+  }, [residentAllData]);
 
   const handleResidentEdit = (row: any) => {
     setIsModalOpen("edit");
@@ -77,11 +173,18 @@ const ResidentsPage = (): React.ReactElement => {
         </Button>
       </Flex>
       <CommonTable
-        data={residents}
+        data={residents.map((item: TableData) => {
+          return {
+            roomNumber: item.roomNumber,
+            arrivalDate: item.dateJoined,
+            departureDate: item.dateLeft ? item.dateLeft : "",
+            residentId: item.residentId,
+            password: "1231874",
+          };
+        })}
         columnInfo={columnTypes}
         onEdit={handleResidentEdit}
       />
-
       <ResidentModal
         isOpen={isModalOpen === "add"}
         setIsOpen={() => setIsModalOpen("none")}