updated Rprofile to use new queries

hkam0006 · Sep 18, 2024 · 6a8b541 · 6a8b541
1 parent 7e23187
commit 6a8b541
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 38 deletions.
diff --git a/frontend/src/manager-components/profile_page/Rprofile.jsx b/frontend/src/manager-components/profile_page/Rprofile.jsx
@@ -12,26 +12,19 @@ import { supabase } from '../../supabase';
 import useSubscribeRenterCommentByRenterID from '../../subscribers/Renter Comment/useSubscribeRenterCommentByRenterID';
 import useGetPropertiesByPropertyIDs from "../../queries/Property/useGetPropertiesByPropertyIDs";
 import AppLoader from "../property_page/AppLoader";
-
-// to stop linter
-async function fetchApplications(rID) {
-
-}
+import useGetUserID from "../../queries/useGetUserID";
 
 export default function RprofileForPM() {
     const { rID } = useParams()
+    const {userID, loading: userLoading} = useGetUserID();
     const navigate = useNavigate();
-    const fetchRenter = useGetRenterByRenterID();
-    const [renter, setRenter] = useState({});
-    //const [applications, setApplications] = useState([]);
+    const {renter: renterData, loading: renterLoading} = useGetRenterByRenterID(rID);
     const {applications: baseApplications, loading: appLoading} = useGetApplicationsByRenterID(rID);
-    const fetchRenterComments = useGetRenterCommentsWithPMInfoByRenterID();
-    const [renterComments, setRenterComments] = useState([{}]);
+    const {comments: commentData, loading: commentsLoading} = useGetRenterCommentsWithPMInfoByRenterID(rID);
     const fetchProperty = useGetPropertyByPropertyID();
     const [dialogueOpen, setDialogueOpen] = useState(false);
     const addComment = useAddRenterComment();
-    const [property_manager, setPropertyManager] = useState({});
-    const fetchPropertyManager = useGetPropertyManagerByPropertyManagerID();
+    const {propertyManager: pmData, loading: pmLoading} = useGetPropertyManagerByPropertyManagerID(userID);
 
     // get all applications from renter
     // get the properties from applications
@@ -46,7 +39,24 @@ export default function RprofileForPM() {
             applications.push([app, address])
         })
     }
-    console.log(properties)
+
+    // get renter data
+    let renter = {}
+    if (!renterLoading) {
+        renter = renterData[0];
+    }
+
+    // get pm data
+    let property_manager = {};
+    if (!pmLoading) {
+        property_manager = pmData[0];
+    }
+
+    // setup comments
+    const [renterComments, setRenterComments] = useState([]);
+    if (!commentsLoading && renterComments.length === 0) {
+        setRenterComments(commentData);
+    }
 
     /*
     useEffect(() => {
@@ -104,7 +114,6 @@ export default function RprofileForPM() {
         setDialogueOpen(true);
     }
 
-    console.log(propLoading)
 
     return (
         <NavigationMenu>

diff --git a/frontend/src/mutators/Renter Comment/useAddRenterComment.js b/frontend/src/mutators/Renter Comment/useAddRenterComment.js
@@ -3,7 +3,7 @@ import { supabase } from "../../supabase";
 const useAddRenterComment = () =>{
   const addRenterComment = async (property_manager_id, renter_id, company_id, renter_comment_contents) => {
     const { data, error } = await supabase
-      .from("RENTER COMMENT")
+      .from("RENTER-COMMENT")
       .insert({
         property_manager_id: property_manager_id,
         renter_id: renter_id,

diff --git a/frontend/src/queries/Application/useGetApplicationsByRenterID.js b/frontend/src/queries/Application/useGetApplicationsByRenterID.js
@@ -9,7 +9,6 @@ import {useEffect, useState} from "react";
 const useGetApplicationsByRenterID = (renter_id) => {
     const [applications, setApplications] = useState([]);
     const [loading, setLoading] = useState(true);
-    console.log("apps run")
 
     useEffect(() => {
         const fetchApplications = async () => {
@@ -24,7 +23,6 @@ const useGetApplicationsByRenterID = (renter_id) => {
                     console.error('Error finding applications:', error);
                     setApplications([]); // Handle the error case by setting applications to an empty array
                 } else {
-                    console.log(data)
                     setApplications(data || []); // Ensure data is always an array
                 }
                 setLoading(false);

diff --git a/frontend/src/queries/Property Manager/useGetPropertyManagerByPropertyManagerID.js b/frontend/src/queries/Property Manager/useGetPropertyManagerByPropertyManagerID.js
@@ -1,15 +1,34 @@
 import { supabase } from "../../supabase";
+import {useEffect, useState} from "react";
 
-const useGetPropertyManagerByPropertyManagerID = () =>{
-  const fetchPropertyManager = async (account_id) => {
-    const { data, error } = await supabase
-      .from("PROPERTY MANAGER")
-      .select("*")
-      .eq("property_manager_id", account_id);
+const useGetPropertyManagerByPropertyManagerID = (pm_id) =>{
+    const [propertyManager, setPropertyManager] = useState([]);
+    const [loading, setLoading] = useState(true);
 
-    return {data, error}
-  };
-  return fetchPropertyManager
+    useEffect(() => {
+        const fetchPropertyManager = async () => {
+            if (pm_id) {
+                setLoading(true);
+                const { data, error } = await supabase
+                    .from("PROPERTY MANAGER")
+                    .select("*")
+                    .eq("property_manager_id", pm_id);
+
+                if (error) {
+                    setLoading(false);
+                    setPropertyManager([]);
+                } else {
+                    setLoading(false);
+                    setPropertyManager(data || []);
+                }
+            } else {
+                setLoading(false);
+                setPropertyManager([]);
+            }
+        }
+        fetchPropertyManager();
+    }, [pm_id]);
+    return {propertyManager, loading};
 };
 
 export default useGetPropertyManagerByPropertyManagerID;
diff --git a/frontend/src/queries/Property/useGetPropertiesByPropertyIDs.js b/frontend/src/queries/Property/useGetPropertiesByPropertyIDs.js
@@ -12,7 +12,6 @@ import { useState, useEffect } from 'react';
 const useGetPropertiesByPropertyIDs = (property_ids) => {
     const [properties, setProperties] = useState([]);
     const [loading, setLoading] = useState(true);
-    console.log("props run")
 
     useEffect(() => {
         const fetchProperties = async () => {

diff --git a/frontend/src/queries/Renter Comment/useGetRenterCommentsWithPMInfoByRenterID.js b/frontend/src/queries/Renter Comment/useGetRenterCommentsWithPMInfoByRenterID.js
@@ -1,17 +1,36 @@
 import { supabase } from "../../supabase";
+import {useEffect, useState} from "react";
 
-const useGetRenterCommentsWithPMInfoByRenterID = () =>{
-  const fetchComments = async (renter_id) => {
-    const { data, error } = await supabase
-      .from("RENTER COMMENT")
-      .select(
-        '*, "PROPERTY MANAGER"(*)'
-      )
-      .eq("renter_id", renter_id);
+const useGetRenterCommentsWithPMInfoByRenterID = (renter_id) =>{
+    const [comments, setComments] = useState([]);
+    const [loading, setLoading] = useState(true);
 
-    return {data, error}
-  };
-  return fetchComments
+    useEffect(() => {
+        const fetchComments = async () => {
+            if (renter_id) {
+                setLoading(true);
+                const { data, error } = await supabase
+                    .from("RENTER-COMMENT")
+                    .select(
+                        '*, "PROPERTY MANAGER"(*)'
+                    )
+                    .eq("renter_id", renter_id);
+
+                if (error) {
+                    setLoading(false);
+                    setComments([]);
+                } else {
+                    setLoading(false);
+                    setComments(data || []);
+                }
+            } else {
+                setLoading(false);
+                setComments([]);
+            }
+        }
+        fetchComments()
+    }, [renter_id]);
+    return {comments, loading};
 };
 
 export default useGetRenterCommentsWithPMInfoByRenterID;