Unique Resident IDs

backend/app/rest/residents_routes.py

@@ -21,6 +21,16 @@ def add_resident():
             400,
         )
 
+    # Check for the existence of a resident prior to adding them
+    fmt_resident_id = resident.get("initial") + str(resident.get("room_num"))
+    try:
+        res = residents_service.get_residents(False, 1, 10, fmt_resident_id)
+        if len(res["residents"]) > 0:
+            return jsonify({"error": "Resident already with id {fmt_resident_id} already exists".format(fmt_resident_id=fmt_resident_id)}), 409
+    except Exception as e:
+        error_message = getattr(e, "message", None)
+        return jsonify({"error": (error_message if error_message else str(e))}), 500
+
     try:
         created_resident = residents_service.add_resident(resident)
         return jsonify(created_resident), 201
@@ -41,6 +51,17 @@ def update_resident(resident_id):
             jsonify({"date_left_error": "date_left cannot be less than date_joined"}),
             400,
         )
+
+    # Check for the existence of a resident prior to adding them
+    fmt_resident_id = updated_resident.get("initial") + str(updated_resident.get("room_num"))
+    try:
+        res = residents_service.get_residents(False, 1, 10, fmt_resident_id)
+        if len(res["residents"]) == 1 and res["residents"][0]["id"] != resident_id:
+            return jsonify({"error": "Resident with id {fmt_resident_id} already exists".format(fmt_resident_id=fmt_resident_id)}), 409
+    except Exception as e:
+        error_message = getattr(e, "message", None)
+        return jsonify({"error": (error_message if error_message else str(e))}), 500
+
 
     try:
         updated_resident = residents_service.update_resident(

frontend/src/APIClients/ResidentAPIClient.ts

@@ -6,6 +6,7 @@ import {
   CountResidentsResponse,
   CreateResidentParams,
   EditResidentParams,
+  ErrorResponse,
 } from "../types/ResidentTypes";
 import { getLocalStorageObjProperty } from "../utils/LocalStorageUtils";
 import baseAPIClient from "./BaseAPIClient";
@@ -60,7 +61,7 @@ const createResident = async ({
   roomNum,
   dateJoined,
   buildingId,
-}: CreateResidentParams): Promise<boolean> => {
+}: CreateResidentParams): Promise<boolean | ErrorResponse> => {
   try {
     const bearerToken = `Bearer ${getLocalStorageObjProperty(
       AUTHENTICATED_USER_KEY,
@@ -73,6 +74,13 @@ const createResident = async ({
     );
     return true;
   } catch (error) {
+    const axiosErr = (error as any) as AxiosError;
+
+    if (axiosErr.response && axiosErr.response.status === 409) {
+      return {
+        errMessage: "Resident with the specified user ID already exists."
+      };
+    }
     return false;
   }
 };
@@ -103,7 +111,7 @@ const editResident = async ({
   dateJoined,
   buildingId,
   dateLeft,
-}: EditResidentParams): Promise<boolean> => {
+}: EditResidentParams): Promise<boolean | ErrorResponse> => {
   try {
     const bearerToken = `Bearer ${getLocalStorageObjProperty(
       AUTHENTICATED_USER_KEY,
@@ -116,6 +124,13 @@ const editResident = async ({
     );
     return true;
   } catch (error) {
+    const axiosErr = (error as any) as AxiosError;
+
+    if (axiosErr.response && axiosErr.response.status === 409) {
+      return {
+        errMessage: "Resident with the specified user ID already exists."
+      };
+    }
     return false;
   }
 };

frontend/src/components/forms/CreateResident.tsx

@@ -24,11 +24,13 @@ import {
 import { AddIcon } from "@chakra-ui/icons";
 import { SingleDatepicker } from "chakra-dayzed-datepicker";
 import { Col, Row } from "react-bootstrap";
+import CreateToast from "../common/Toasts";
 
 import selectStyle from "../../theme/forms/selectStyles";
 import { singleDatePickerStyle } from "../../theme/forms/datePickerStyles";
 import ResidentAPIClient from "../../APIClients/ResidentAPIClient";
 import { convertToString } from "../../helper/dateHelpers";
+import isResidentErrorResponse from "../../helper/residentError";
 
 type Props = {
   getRecords: (pageNumber: number) => Promise<void>;
@@ -61,17 +63,30 @@ const CreateResident = ({
   const [isOpen, setIsOpen] = useState(false);
   const [showAlert, setShowAlert] = useState(false);
 
+  const newToast = CreateToast();
+
   const ROOM_ERROR_TEXT = `Room Number is required and must only contain numbers.`;
   const addResident = async () => {
-    await ResidentAPIClient.createResident({
+    const res = await ResidentAPIClient.createResident({
       initial: initials.toUpperCase(),
       roomNum: parseInt(roomNumber, 10),
       dateJoined: convertToString(moveInDate),
       buildingId,
     });
-    getRecords(1);
-    countResidents();
-    setUserPageNum(1);
+
+    if (isResidentErrorResponse(res)) {
+      newToast(
+        "Error creating resident",
+        res.errMessage,
+        "error"
+      )
+    }
+    else if (res) {
+      getRecords(1);
+      countResidents();
+      setUserPageNum(1);
+      setShowAlert(true)
+    }
   };
 
   const handleInitialsChange = (e: { target: { value: unknown } }) => {
@@ -146,7 +161,6 @@ const CreateResident = ({
 
     addResident();
     setIsOpen(false);
-    setShowAlert(true);
   };
 
   // Timer to remove alert

frontend/src/components/forms/EditResident.tsx

@@ -34,6 +34,7 @@ import selectStyle from "../../theme/forms/selectStyles";
 import { singleDatePickerStyle } from "../../theme/forms/datePickerStyles";
 import CreateToast from "../common/Toasts";
 import { convertToDate, convertToString } from "../../helper/dateHelpers";
+import isResidentErrorResponse from '../../helper/residentError'
 
 // TODO: Connect to Buidings table
 const BUILDINGS = [
@@ -80,14 +81,22 @@ const EditResident = ({
       dateLeft: moveOutDate ? convertToString(moveOutDate) : undefined,
     });
 
-    if (res != null) {
+    if (isResidentErrorResponse(res)) {
+      newToast(
+        "Error updating resident",
+        res.errMessage,
+        "error"
+      )
+    }
+    else if (res !== null && res) {
       newToast(
         "Resident updated",
         "Resident has been successfully updated",
         "success",
       );
       getRecords(userPageNum)
-    } else {
+    }
+    else {
       newToast(
         "Error updating resident",
         "Resident was unable to be updated",

frontend/src/helper/residentError.ts

@@ -0,0 +1,9 @@
+import {
+  ErrorResponse,
+} from "../types/ResidentTypes";
+
+const isResidentErrorResponse = (res: boolean | ErrorResponse) : res is ErrorResponse => {
+  return (typeof res !== 'boolean' && 'errMessage' in res);
+}
+
+export default isResidentErrorResponse

frontend/src/types/ResidentTypes.ts

@@ -34,3 +34,7 @@ export type CreateResidentParams = Omit<
 export type EditResidentParams = Omit<Resident, "residentId" | "building"> & {
   buildingId: number;
 };
+
+export type ErrorResponse = {
+  errMessage: string;
+}