filters

client/src/api/apartments.ts

@@ -1,11 +1,56 @@
 import { apartmentsApi } from "./urls";
 import ky from "ky";
 
-async function getApartments(token: string | null) {
-  // const token =
-  //   "1000.04c54423a172cff4f2075ef60dc46403.b4a66d1663ed3b39fa86c9b28dbed2fa";
+async function getApartments(
+  token: string | null,
+  roveHomeFilters: string[],
+  apartmentTypeFilters: string[],
+  viewFilters: string[],
+  totalAreaFilter: number[],
+  floorFilter: number[],
+  sortBy: string | undefined,
+  page: number,
+  perPage: number
+) {
+  const roveHomeQuery =
+    roveHomeFilters.length !== 0
+      ? `rove_home=${roveHomeFilters.join(",")}`
+      : "";
+  const apartmentQuery =
+    apartmentTypeFilters.length !== 0
+      ? `apartment_type=${apartmentTypeFilters.join(",")}`
+      : "";
+  const viewQuery =
+    viewFilters.length !== 0 ? `views=${viewFilters.join(",")}` : "";
+  const totalAreaSliderQuery =
+    totalAreaFilter.length !== 0
+      ? `total_area_between=${totalAreaFilter[0]},${totalAreaFilter[1]}`
+      : "";
+  const floorQuery =
+    floorFilter.length !== 0
+      ? `floor_between=${floorFilter[0]},${floorFilter[1]}`
+      : "";
 
-  const res = await ky.get(apartmentsApi, {
+  const sortByQuery = sortBy ? `sort_by=${sortBy}` : "";
+
+  const pageQuery = `page=${page}`;
+  const perPageQuery = `per_page=${perPage}`;
+
+  const query = [
+    apartmentQuery,
+    roveHomeQuery,
+    totalAreaSliderQuery,
+    floorQuery,
+    viewQuery,
+    sortByQuery,
+    pageQuery,
+    perPageQuery,
+  ]
+    .filter((q) => q.length !== 0)
+    .join("&");
+
+  const url = `${apartmentsApi}?${query}`;
+  const res = await ky.get(url, {
     headers: {
       Authorization: `Zoho-oauthtoken ${token}`,
     },

client/src/api/updateAccessToken.ts

@@ -6,10 +6,11 @@ async function updateAccessToken() {
   try {
     const res = await ky.get(updateAccessTokenApi);
 
-    res.json().then((data) => {
+    return res.json().then((data) => {
       const accessToken = (data as IUpdateAccessToken).accessToken;
 
       localStorage.setItem("ACCESS_TOKEN", accessToken);
+      return accessToken;
     });
   } catch (error) {
     console.log("error", error);