Use searchParams everywhere and use GET endpoints instead of client s…

…ide sorting
alianza · Jun 1, 2024 · bf9cf6f · bf9cf6f
1 parent 23b3b7f
commit bf9cf6f
Show file tree

Hide file tree

Showing 11 changed files with 129 additions and 101 deletions.
diff --git a/pages/api/combos/index.js b/pages/api/combos/index.js
@@ -2,6 +2,8 @@ import dbConnect from '../../../lib/dbConnect';
 import Combo from '../../../models/Combo';
 import { populateComboName, populateComboTrickName } from '../../../lib/commonUtils';
 import { requireAuth } from '../../../lib/serverUtils';
+import Grind from '../../../models/Grind';
+import Manual from '../../../models/Manual';
 
 export default async function handler(req, res) {
   const { method, query } = req;
@@ -12,18 +14,35 @@ export default async function handler(req, res) {
   switch (method) {
     case 'GET':
       try {
-        const extraQuery = { ...(query.landedOnly !== undefined && { landed: true }) };
+        const where = { ...authQuery };
 
-        if (query.countOnly !== undefined) {
-          const count = await Combo.countDocuments({ ...authQuery, ...extraQuery });
+        if (query.grind === 'true') {
+          where['trickArray.trickRef'] = Grind.modelName;
+        }
+
+        if (query.manual === 'true') {
+          where['trickArray.trickRef'] = where['trickArray.trickRef']
+            ? { $all: [where['trickArray.trickRef'], Manual.modelName] }
+            : Manual.modelName;
+        }
+
+        if (query.landed && query.landed !== 'any') {
+          where.landed = query.landed === 'true' ? true : { $ne: true }; // If landed is true, set landed to true, otherwise set landed to not true (if landed is false or undefined)
+        }
+
+        if (query.countOnly === 'true') {
+          const count = await Combo.countDocuments(where);
           return res.status(200).json({ success: true, data: count });
         }
 
-        let combos = await Combo.find({ ...authQuery, ...extraQuery })
-          .populate('trickArray.trick')
-          .lean();
-        combos = combos.map(populateComboTrickName); // Populate every trick name in the combo
-        combos = combos.map(populateComboName); // Populate every combo name
+        let combos = await Combo.find(where).populate('trickArray.trick').lean();
+
+        if (query.stance && query.stance !== 'all') {
+          combos = combos.filter(({ trickArray }) => trickArray[0].trick.stance === query.stance); // Filter after populating trickArray.trick to get the populated stance
+        }
+
+        combos = combos.map(populateComboTrickName);
+        combos = combos.map(populateComboName);
         res.status(200).json({ success: true, data: combos });
       } catch (error) {
         console.error(error);

diff --git a/pages/api/combos/search/index.js b/pages/api/combos/search/index.js
diff --git a/pages/api/flatgroundtricks/index.js b/pages/api/flatgroundtricks/index.js
@@ -12,14 +12,18 @@ export default async function handler(req, res) {
   switch (method) {
     case 'GET':
       try {
-        const extraQuery = { ...(query.landedOnly !== undefined && { landed: true }) };
+        const where = { ...authQuery };
 
-        if (query.countOnly !== undefined) {
-          const count = await FlatgroundTrick.countDocuments({ ...authQuery, ...extraQuery });
+        if (query.landed && query.landed !== 'any') {
+          query.landed === 'true' ? (where.landed = true) : (where.landed = { $ne: true }); // If landed is true, set landed to true, otherwise set landed to not true (if landed is false or undefined)
+        }
+
+        if (query.countOnly === 'true') {
+          const count = await FlatgroundTrick.countDocuments(where);
           return res.status(200).json({ success: true, data: count });
         }
 
-        const flatgroundTricks = await FlatgroundTrick.find({ ...authQuery, ...extraQuery }).lean();
+        const flatgroundTricks = await FlatgroundTrick.find(where).lean();
         const data = flatgroundTricks.map((flatgroundTrick) => ({
           ...flatgroundTrick,
           trick: getFullTrickName(flatgroundTrick),

diff --git a/pages/api/grinds/index.js b/pages/api/grinds/index.js
@@ -12,14 +12,18 @@ export default async function handler(req, res) {
   switch (method) {
     case 'GET':
       try {
-        const extraQuery = { ...(query.landedOnly !== undefined && { landed: true }) };
+        const where = { ...authQuery };
 
-        if (query.countOnly !== undefined) {
-          const count = await Grind.countDocuments({ ...authQuery, ...extraQuery });
+        if (query.landed && query.landed !== 'any') {
+          query.landed === 'true' ? (where.landed = true) : (where.landed = { $ne: true }); // If landed is true, set landed to true, otherwise set landed to not true (if landed is false or undefined)
+        }
+
+        if (query.countOnly === 'true') {
+          const count = await Grind.countDocuments(where);
           return res.status(200).json({ success: true, data: count });
         }
 
-        const grinds = await Grind.find({ ...authQuery, ...extraQuery }).lean();
+        const grinds = await Grind.find(where).lean();
         const data = grinds.map((grind) => ({ ...grind, trick: getFullGrindName(grind) }));
         res.status(200).json({ success: true, data });
       } catch (error) {

diff --git a/pages/api/manuals/index.js b/pages/api/manuals/index.js
@@ -12,14 +12,18 @@ export default async function handler(req, res) {
   switch (method) {
     case 'GET':
       try {
-        const extraQuery = { ...(query.landedOnly !== undefined && { landed: true }) };
+        const where = { ...authQuery };
 
-        if (query.countOnly !== undefined) {
-          const count = await Manual.countDocuments({ ...authQuery, ...extraQuery });
+        if (query.landed && query.landed !== 'any') {
+          query.landed === 'true' ? (where.landed = true) : (where.landed = { $ne: true }); // If landed is true, set landed to true, otherwise set landed to not true (if landed is false or undefined)
+        }
+
+        if (query.countOnly === 'true') {
+          const count = await Manual.countDocuments(where);
           return res.status(200).json({ success: true, data: count });
         }
 
-        const manuals = await Manual.find({ ...authQuery, ...extraQuery }).lean();
+        const manuals = await Manual.find(where).lean();
         const data = manuals.map((manual) => ({ ...manual, trick: getFullManualName(manual) }));
         res.status(200).json({ success: true, data });
       } catch (error) {

diff --git a/pages/api/wishlist/index.js b/pages/api/wishlist/index.js
@@ -0,0 +1,46 @@
+import dbConnect from '../../../lib/dbConnect';
+import FlatgroundTrick from '../../../models/FlatgroundTrick';
+import { getFullGrindName, getFullManualName, getFullTrickName } from '../../../lib/commonUtils';
+import { requireAuth } from '../../../lib/serverUtils';
+import Grind from '../../../models/Grind';
+import Manual from '../../../models/Manual';
+
+export default async function handler(req, res) {
+  const { method, query } = req;
+
+  await dbConnect();
+  const { authQuery } = await requireAuth(req, res);
+
+  switch (method) {
+    case 'GET':
+      try {
+        const where = { ...authQuery };
+
+        if (query.countOnly === 'true') {
+          const count = await FlatgroundTrick.countDocuments({ ...authQuery, ...extraQuery });
+          return res.status(200).json({ success: true, data: count });
+        }
+
+        const flatgroundTricks = await FlatgroundTrick.find({ ...authQuery, ...extraQuery }).lean();
+        const flatgroundTricksData = flatgroundTricks.map((flatgroundTrick) => ({
+          ...flatgroundTrick,
+          trick: getFullTrickName(flatgroundTrick),
+        }));
+
+        const grinds = await Grind.find({ ...authQuery, ...extraQuery }).lean();
+        const grindsData = grinds.map((grind) => ({ ...grind, trick: getFullGrindName(grind) }));
+
+        const manuals = await Manual.find({ ...authQuery, ...extraQuery }).lean();
+        const manualsData = manuals.map((manual) => ({ ...manual, trick: getFullManualName(manual) }));
+
+        res.status(200).json({ success: true, data });
+      } catch (error) {
+        console.error(error);
+        res.status(400).json({ success: false, error: error.message });
+      }
+      break;
+    default:
+      res.status(400).json({ success: false, error: `Unhandled request method: ${method}` });
+      break;
+  }
+}
diff --git a/pages/combos/index.jsx b/pages/combos/index.jsx
@@ -22,7 +22,8 @@ export default function CombosPage() {
 
   useAsyncEffect(async () => {
     try {
-      const { data } = await apiCall('combos/search', { method: 'POST', body: JSON.stringify(filters) });
+      const params = new URLSearchParams(stringifyValues(filters));
+      const { data } = await apiCall(`combos?${params}`, { method: 'GET' });
       setCombos(data);
     } catch (error) {
       setCombos([]);
@@ -46,9 +47,6 @@ export default function CombosPage() {
     }
   };
 
-  const filteredCombos =
-    filters.landed === 'any' ? combos : combos?.filter((combo) => filters.landed === (combo.landed ? 'yes' : 'no'));
-
   return (
     <div className="flex flex-col gap-12">
       <div>
@@ -103,15 +101,15 @@ export default function CombosPage() {
                 Any
               </option>
               <hr />
-              <option value="yes">Yes</option>
-              <option value="no">No</option>
+              <option value="true">Yes</option>
+              <option value="false">No</option>
             </select>
           </label>
         </Filters>
 
         <TransitionScroll hiddenStyle={hiddenStyle} baseStyle={baseStyle} className="flex flex-col">
           <GenericTable
-            objArray={filteredCombos}
+            objArray={combos}
             columns={[{ trick: { className: 'text-sm font-bold', alias: 'Combo name' } }, landedAtCol]}
             actions={getCommonActions('combos')}
             onAction={handleAction}

diff --git a/pages/dashboard.jsx b/pages/dashboard.jsx
@@ -43,7 +43,8 @@ export default function Index() {
   useAsyncEffect(async () => {
     const fetchAndSetData = async (endpoint, setData) => {
       try {
-        const { data } = await apiCall(`${endpoint}?landedOnly=true`, { method: 'GET' });
+        const params = new URLSearchParams({ landed: 'true' });
+        const { data } = await apiCall(`${endpoint}?${params}`, { method: 'GET' });
         setData((prevData) => ({ ...prevData, data }));
       } catch (error) {
         toast.error(`Failed to fetch ${endpoint}: ${error.message}`);
@@ -52,7 +53,8 @@ export default function Index() {
 
     const fetchAndSetCount = async (endpoint, setData) => {
       try {
-        const { data } = await apiCall(`${endpoint}?countOnly=true`, { method: 'GET' });
+        const params = new URLSearchParams({ countOnly: 'true' });
+        const { data } = await apiCall(`${endpoint}?${params}`, { method: 'GET' });
         setData((prevData) => ({ ...prevData, count: data }));
       } catch (error) {
         toast.error(`Failed to fetch total ${endpoint} count: ${error.message}`);
@@ -87,8 +89,9 @@ export default function Index() {
           if (!confirm(`Are you sure you want to delete "${obj.trick}"?`)) return;
           const [endpoint, setData] = endpointSetterMap[entityType];
           if (!endpoint) return toast.error(`Failed to delete ${obj.trick}: Invalid entity type: ${entityType}`);
+          const params = new URLSearchParams({ landed: 'true' });
           await apiCall(endpoint, { method: 'DELETE', id: obj._id });
-          const { data } = await apiCall(`${endpoint}?landedOnly=true`, { method: 'GET' });
+          const { data } = await apiCall(`${endpoint}?${params}`, { method: 'GET' });
           setData((prevData) => ({ ...prevData, data }));
           toast.success(`Successfully deleted ${obj.trick}`);
         } catch (error) {

diff --git a/pages/flatgroundtricks/index.jsx b/pages/flatgroundtricks/index.jsx
@@ -5,6 +5,7 @@ import { apiCall, baseStyle, getCommonActions, hiddenStyle, landedAtCol, trickCo
 import GenericTable from '../../components/common/genericTable/GenericTable';
 import TransitionScroll from 'react-transition-scroll';
 import Filters from '../../components/common/Filters';
+import { stringifyValues } from '../../lib/commonUtils';
 
 const defaultFilters = { landed: 'any' };
 
@@ -14,13 +15,14 @@ export default function FlatgroundTricksPage() {
 
   useAsyncEffect(async () => {
     try {
-      const { data } = await apiCall('flatgroundtricks', { method: 'GET' });
+      const searchParams = new URLSearchParams(stringifyValues(filters));
+      const { data } = await apiCall(`flatgroundtricks`, { method: 'GET', searchParams });
       setFlatgroundTricks(data);
     } catch (error) {
       setFlatgroundTricks([]);
       toast.error(`Failed to load Flatground Tricks: ${error.message}`);
     }
-  }, []);
+  }, [filters]);
 
   const handleAction = async (action, obj) => {
     switch (action) {
@@ -38,11 +40,6 @@ export default function FlatgroundTricksPage() {
     }
   };
 
-  const filteredFlatgroundTricks =
-    filters.landed === 'any'
-      ? flatgroundTricks
-      : flatgroundTricks?.filter((trick) => filters.landed === (trick.landed ? 'yes' : 'no'));
-
   return (
     <div className="flex flex-col gap-12">
       <div>
@@ -66,15 +63,15 @@ export default function FlatgroundTricksPage() {
                 Any
               </option>
               <hr />
-              <option value="yes">Yes</option>
-              <option value="no">No</option>
+              <option value="true">Yes</option>
+              <option value="false">No</option>
             </select>
           </label>
         </Filters>
 
         <TransitionScroll hiddenStyle={hiddenStyle} baseStyle={baseStyle} className="flex flex-col">
           <GenericTable
-            objArray={filteredFlatgroundTricks}
+            objArray={flatgroundTricks}
             columns={['stance', 'direction', 'rotation', 'name', trickCol, landedAtCol]}
             actions={getCommonActions('flatgroundtricks')}
             onAction={handleAction}

diff --git a/pages/grinds/index.jsx b/pages/grinds/index.jsx
@@ -5,6 +5,7 @@ import { apiCall, baseStyle, getCommonActions, hiddenStyle, landedAtCol, trickCo
 import GenericTable from '../../components/common/genericTable/GenericTable';
 import TransitionScroll from 'react-transition-scroll';
 import Filters from '../../components/common/Filters';
+import { stringifyValues } from '../../lib/commonUtils';
 
 const defaultFilters = { landed: 'any' };
 
@@ -14,13 +15,14 @@ export default function GrindsPage() {
 
   useAsyncEffect(async () => {
     try {
-      const { data } = await apiCall('grinds', { method: 'GET' });
+      const searchParams = new URLSearchParams(stringifyValues(filters));
+      const { data } = await apiCall('grinds', { method: 'GET', searchParams });
       setGrinds(data);
     } catch (error) {
       setGrinds([]);
       toast.error(`Failed to load grinds: ${error.message}`);
     }
-  }, []);
+  }, [filters]);
 
   const handleAction = async (action, obj) => {
     switch (action) {
@@ -37,8 +39,6 @@ export default function GrindsPage() {
         break;
     }
   };
-  const filteredGrinds =
-    filters.landed === 'any' ? grinds : grinds.filter((grind) => filters.landed === (grind.landed ? 'yes' : 'no'));
 
   return (
     <div className="flex flex-col gap-12">
@@ -60,15 +60,15 @@ export default function GrindsPage() {
                 Any
               </option>
               <hr />
-              <option value="yes">Yes</option>
-              <option value="no">No</option>
+              <option value="true">Yes</option>
+              <option value="false">No</option>
             </select>
           </label>
         </Filters>
 
         <TransitionScroll hiddenStyle={hiddenStyle} baseStyle={baseStyle} className="flex flex-col">
           <GenericTable
-            objArray={filteredGrinds}
+            objArray={grinds}
             columns={['stance', 'direction', 'name', trickCol, landedAtCol]}
             actions={getCommonActions('grinds')}
             entityName="grind"