Merge branch 'main' into david/refactoring

calblueprint · Apr 9, 2024 · 675593e · 675593e
2 parents 81144b2 + d0dce7e
commit 675593e
Show file tree

Hide file tree

Showing 23 changed files with 979 additions and 173 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts
@@ -164,7 +164,7 @@ export async function fetchOrderProductsbyOrderId(
       fetchOrderProductById(orderProductId),
     ),
   );
-  console.log(newOrderProducts);
+
   const orderProducts = await Promise.all(
     newOrderProducts.map(async orderProduct =>
       fetchProductWithQuantityById(orderProduct.product_id),

diff --git a/src/api/supabase/queries/pickup_queries.ts b/src/api/supabase/queries/pickup_queries.ts
@@ -59,7 +59,7 @@ export async function fetchNRecentPickupTimes(n: number): Promise<Pickup[]> {
   const { data: getTimes, error } = await supabase
     .from('pickup_times')
     .select('*')
-    .order('start_time', { ascending: false })
+    .order('start_time', { ascending: true })
     .limit(n);
 
   if (error) {

diff --git a/src/api/supabase/queries/product_queries.ts b/src/api/supabase/queries/product_queries.ts
@@ -1,4 +1,4 @@
-import { Product } from '../../../schema/schema';
+import { Product, StorefrontButtons } from '../../../schema/schema';
 import supabase from '../createClient';
 import { fetchUser } from './user_queries';
 
@@ -85,14 +85,31 @@ export async function filterProduct(productType: string): Promise<Product[]> {
   return products;
 }
 
+export async function convertCategoryToNumber(
+  productType: string,
+): Promise<StorefrontButtons> {
+  const { data: buttonVal, error } = await supabase
+    .from('storefront_buttons')
+    .select('*')
+    .eq('name', productType)
+    .single();
+
+  if (error) {
+    throw new Error(`Error fetching products: ${error.message}`);
+  }
+  return buttonVal.id;
+}
+
 export async function fetchUnprescribedCategory(
   productType: string,
 ): Promise<Product[]> {
+  const productTypeConverted = await convertCategoryToNumber(productType);
+
   const { data: products, error } = await supabase
     .from('product')
     .select('*')
     .eq('prescribed', false)
-    .eq('category', productType);
+    .eq('category', productTypeConverted);
   if (error) {
     throw new Error(`Error fetching products: ${error.message}`);
   }

diff --git a/src/api/supabase/queries/user_queries.ts b/src/api/supabase/queries/user_queries.ts
@@ -1,7 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-/* eslint-disable no-console */
-//
-
 import supabase from '../createClient';
 import { User, Product } from '../../../schema/schema';
 import { fetchProductByID } from './product_queries';
@@ -119,8 +115,6 @@ export async function fetchUserAddress(uuid: string) {
       .eq('user_id', uuid)
       .single();
 
-    console.log('test', error);
-
     if (error) {
       console.error('Error fetching user data:', error);
     }
@@ -143,7 +137,9 @@ export async function fetchCurrentUserAddress() {
       .from('address')
       .select('*')
       .eq('user_id', user.id)
+      .limit(1)
       .single();
+    console.log(address);
 
     if (error) {
       console.error('Error fetching user data:', error);