More handoff changes

backend/app/rest/log_records_routes.py

@@ -56,9 +56,15 @@ def get_log_records():
     except:
         pass
 
+    sort_direction = "DESC"
+    try:
+        sort_direction = request.args.get("sort_direction").upper()
+    except:
+        pass
+
     try:
         log_records = log_records_service.get_log_records(
-            page_number, return_all, results_per_page, filters
+            page_number, return_all, sort_direction, results_per_page, filters
         )
         return jsonify(log_records), 201
     except Exception as e:

backend/app/rest/residents_routes.py

@@ -54,7 +54,7 @@ def update_resident(resident_id):
         return (
             jsonify(
                 {
-                    "message": "Resident record with id {resident_id} updated sucessfully".format(
+                    "message": "Tenant record with id {resident_id} updated sucessfully".format(
                         resident_id=resident_id
                     )
                 }
@@ -119,16 +119,6 @@ def get_residents():
         page_number = int(request.args.get("page_number"))
     except:
         pass
-    try:
-        filters = json.loads(request.args.get("filters"))
-    except:
-        filters = None
-
-    filters = None
-    try:
-        filters = json.loads(request.args.get("filters"))
-    except:
-        pass
 
     filters = None
     try:

backend/app/services/implementations/log_records_service.py

@@ -77,7 +77,7 @@ def to_json_list(self, logs):
                             "first_name": log[2],
                             "last_name": log[3],
                         },
-                        "residents": log[4],
+                        "residents": log[4] if log[4] else [],
                         "attn_to": {
                             "id": log[5],
                             "first_name": log[6],
@@ -209,7 +209,12 @@ def join_tag_attributes(self):
                 ) t ON logs.log_id = t.log_id\n"
 
     def get_log_records(
-        self, page_number, return_all, results_per_page=10, filters=None
+        self,
+        page_number,
+        return_all,
+        sort_direction="DESC",
+        results_per_page=10,
+        filters=None,
     ):
         try:
             sql = "SELECT\n \
@@ -236,7 +241,7 @@ def get_log_records(
             sql += self.join_tag_attributes()
             sql += self.filter_log_records(filters)
 
-            sql += "\nORDER BY datetime DESC"
+            sql += f"\nORDER BY datetime {sort_direction}"
 
             if not return_all:
                 sql += f"\nLIMIT {results_per_page}"

backend/app/services/implementations/residents_service.py

@@ -8,7 +8,7 @@
     DuplicateResidentException,
 )
 from datetime import datetime
-from sqlalchemy.sql.expression import or_, and_
+from sqlalchemy.sql.expression import or_, and_, case
 from pytz import timezone
 
 
@@ -40,25 +40,15 @@ def to_resident_json(self, resident, current_date):
     def to_residents_json_list(self, residents, current_date):
         residents_json_list = []
         for result in residents:
-            resident, building = result[0], result[1]
+            resident, building, status = result[0], result[1], result[2]
 
             resident_dict = resident.to_dict()
             resident_dict["building"]["name"] = building
-            resident_dict["status"] = self.get_resident_status(
-                current_date, resident_dict["date_joined"], resident_dict["date_left"]
-            )
+            resident_dict["status"] = status
 
             residents_json_list.append(resident_dict)
         return residents_json_list
 
-    def get_resident_status(self, current_date, date_joined, date_left):
-        if current_date < date_joined:
-            return "Future"
-        elif date_left is None or current_date <= date_left:
-            return "Current"
-        else:
-            return "Past"
-
     def convert_to_date_obj(self, date):
         return datetime.strptime(date, "%Y-%m-%d")
 
@@ -78,7 +68,7 @@ def is_date_left_invalid_resident(self, resident):
 
         return False
 
-    def construct_filters(self, query, filters, current_date):
+    def construct_filters(self, query, filters, status_column):
         residents = filters.get("residents")
         buildings = filters.get("buildings")
         statuses = filters.get("statuses")
@@ -101,35 +91,12 @@ def construct_filters(self, query, filters, current_date):
         if residents is not None:
             query = query.filter(Residents.id.in_(residents))
         if statuses is not None:
-            conditions = []
-
-            # Construct the conditions for each case
-            for status in statuses:
-                if status == "Future":
-                    conditions.append(Residents.date_joined > current_date)
-                elif status == "Current":
-                    conditions.append(
-                        and_(
-                            Residents.date_joined <= current_date,
-                            or_(
-                                Residents.date_left.is_(None),
-                                Residents.date_left >= current_date,
-                            ),
-                        )
-                    )
-                elif status == "Past":
-                    conditions.append(Residents.date_left < current_date)
-
-            # OR them together and add to filter
-            query = query.filter(or_(*conditions))
-
+            query = query.filter(status_column.in_(statuses))
         if date_joined is not None:
             query = query.filter(Residents.date_joined >= date_joined)
         if date_left is not None:
             query = query.filter(Residents.date_left <= date_left)
 
-        query = query.order_by(Residents.last_modified.desc())
-
         return query
 
     def add_resident(self, resident):
@@ -163,7 +130,7 @@ def update_resident(self, resident_id, updated_resident):
                 ).update({Residents.date_left: None, **updated_resident})
             if not create_update_resident:
                 raise Exception(
-                    "Resident with id {resident_id} not found".format(
+                    "Tenant with id {resident_id} not found".format(
                         resident_id=resident_id
                     )
                 )
@@ -214,23 +181,44 @@ def get_residents(self, return_all, page_number, results_per_page, filters=None)
         try:
             current_date = datetime.now(timezone("US/Eastern")).strftime("%Y-%m-%d")
 
+            # add a status column based on the current date
+            status_column = case(
+                (
+                    and_(
+                        Residents.date_joined <= current_date,
+                        or_(
+                            Residents.date_left.is_(None),
+                            Residents.date_left >= current_date,
+                        ),
+                    ),
+                    "Current",
+                ),
+                (Residents.date_joined > current_date, "Future"),
+                (Residents.date_left < current_date, "Past"),
+            ).label("status")
+
             residents_results = Residents.query.join(
                 Buildings, Buildings.id == Residents.building_id
-            ).with_entities(Residents, Buildings.name.label("building"))
+            ).with_entities(Residents, Buildings.name.label("building"), status_column)
             if filters:
                 residents_results = self.construct_filters(
-                    residents_results, filters, current_date
+                    residents_results, filters, status_column
                 )
 
             if not return_all:
                 residents_results = (
-                    residents_results.order_by(Residents.last_modified.desc())
+                    residents_results.order_by(
+                        status_column,
+                        case((Residents.date_left.is_(None), 0), else_=1),
+                        Residents.room_num,
+                        Residents.initial,
+                    )
                     .limit(results_per_page)
                     .offset((page_number - 1) * results_per_page)
                 )
             else:
                 residents_results = residents_results.order_by(
-                    Residents.last_modified.desc()
+                    Residents.room_num, Residents.initial
                 ).all()
 
             return {
@@ -244,14 +232,31 @@ def get_residents(self, return_all, page_number, results_per_page, filters=None)
 
     def count_residents(self, filters):
         try:
+            current_date = datetime.now(timezone("US/Eastern")).strftime("%Y-%m-%d")
+
+            # add a status column based on the current date
+            status_column = case(
+                (
+                    and_(
+                        Residents.date_joined <= current_date,
+                        or_(
+                            Residents.date_left.is_(None),
+                            Residents.date_left >= current_date,
+                        ),
+                    ),
+                    "Current",
+                ),
+                (Residents.date_joined > current_date, "Future"),
+                (Residents.date_left < current_date, "Past"),
+            ).label("status")
+
             residents_results = Residents.query.join(
                 Buildings, Buildings.id == Residents.building_id
-            ).with_entities(Residents, Buildings.name.label("building"))
+            ).with_entities(Residents, Buildings.name.label("building"), status_column)
 
             if filters:
-                current_date = datetime.now(timezone("US/Eastern")).strftime("%Y-%m-%d")
                 residents_results = self.construct_filters(
-                    residents_results, filters, current_date
+                    residents_results, filters, status_column
                 )
 
             count = residents_results.count()

backend/app/services/implementations/tags_service.py

@@ -23,13 +23,13 @@ def __init__(self, logger):
 
     def get_tags(self, return_all, page_number, results_per_page):
         try:
-            tags_results = Tag.query.order_by(Tag.last_modified.desc())
-
             if return_all:
-                tags_results = tags_results.all()
+                tags_results = Tag.query.order_by(Tag.name).all()
             else:
-                tags_results = tags_results.limit(results_per_page).offset(
-                    (page_number - 1) * results_per_page
+                tags_results = (
+                    Tag.query.order_by(Tag.last_modified.desc())
+                    .limit(results_per_page)
+                    .offset((page_number - 1) * results_per_page)
                 )
 
             tags_results = list(map(lambda tag: tag.to_dict(), tags_results))

backend/app/services/implementations/user_service.py

@@ -115,7 +115,7 @@ def get_auth_id_by_user_id(self, user_id):
     def get_users(self, return_all, page_number, results_per_page):
         try:
             if return_all:
-                users = User.query.order_by(User.last_modified.desc()).all()
+                users = User.query.order_by(User.last_name).all()
             else:
                 users = (
                     User.query.order_by(User.last_modified.desc())

backend/app/services/interfaces/log_records_service.py

@@ -26,7 +26,12 @@ def add_record(self, log_record):
 
     @abstractmethod
     def get_log_records(
-        self, page_number, return_all, results_per_page=10, filters=None
+        self,
+        page_number,
+        return_all,
+        sort_direction="desc",
+        results_per_page=10,
+        filters=None,
     ):
         """
         Get all log records

backend/app/utilities/exceptions/duplicate_entity_exceptions.py

@@ -24,5 +24,5 @@ class DuplicateResidentException(Exception):
     """
 
     def __init__(self, resident_id):
-        message = f"Resident with ID {resident_id} already exists."
+        message = f"Tenant with ID {resident_id} already exists."
         super().__init__(message)

frontend/public/index.html

@@ -7,7 +7,7 @@
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
-      content="Resident management system for Supportive Housing of Waterloo"
+      content="Tenant management system for Supportive Housing of Waterloo"
     />
     <!--
       manifest.json provides metadata used when your web app is installed on a
@@ -23,7 +23,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>SHOW Resident Management</title>
+    <title>SHOW Tenant Management</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

frontend/src/APIClients/LogRecordAPIClient.ts

@@ -57,6 +57,7 @@ const filterLogRecords = async ({
   returnAll = false,
   pageNumber,
   resultsPerPage,
+  sortDirection,
 }: LogRecordFilters): Promise<GetLogRecordsReponse> => {
   try {
     const bearerToken = `Bearer ${getLocalStorageObjProperty(
@@ -77,6 +78,7 @@ const filterLogRecords = async ({
         returnAll,
         pageNumber,
         resultsPerPage,
+        sortDirection,
       },
       headers: { Authorization: bearerToken },
     });

frontend/src/APIClients/ResidentAPIClient.ts

@@ -105,11 +105,11 @@ const createResident = async ({
       return {
         errMessage:
           axiosErr.response.data.error ??
-          `Resident with the specified user ID already exists.`,
+          `Tenant with the specified user ID already exists.`,
       };
     }
     return {
-      errMessage: "Unable to add resident.",
+      errMessage: "Unable to add tenant.",
     };
   }
 };
@@ -159,11 +159,11 @@ const editResident = async ({
       return {
         errMessage:
           axiosErr.response.data.error ??
-          "Resident with the specified user ID already exists.",
+          "Tenant with the specified user ID already exists.",
       };
     }
     return {
-      errMessage: "Unable to update resident.",
+      errMessage: "Unable to update tenant.",
     };
   }
 };

frontend/src/components/common/NavigationBar.tsx

@@ -94,7 +94,7 @@ const NavigationBar = (): React.ReactElement => {
               variant="link button-navbar"
               onClick={navigateToResidentDirectory}
             >
-              Resident Directory
+              Tenant Directory
             </Button>
 
             {authenticatedUser?.role === "Admin" && (