added animal dashboard

controllers/usersViaSupabase.js

@@ -1,4 +1,5 @@
 import { getUsersData, getUserIdData, getAnimalsByUserId, handleUser, getFriendsForUser, getEventsOfUser, getEvent } from "../adapters/supabaseAdapter.js";
+import { getAuthDataFrom, getDashboardInfo, getDataFrom, getDataWithFunction } from "../dbHelper.js";
 export async function getUsers(req, res) {
   try {
     const data = await getUsersData();
@@ -78,3 +79,10 @@ export async function getUserEvents(req, res) {
   }
 }
 
+export async function getUserDashboard(req, res) {
+  getDashboardInfo(req, res, "get_user_dashboard", "given_id", req.params.id);
+}
+
+export async function getAnimalDashboard(req, res) {
+  getDashboardInfo(req, res, "get_animal_dashboard", "given_id", req.params.id);
+}

dbHelper.js

@@ -8,6 +8,11 @@ const supabase = createClient(
   process.env.SUPABASE_KEY
 );
 
+const serviceSupabase = createClient(
+  process.env.SUPABASE_URL,
+  process.env.SERVICE_KEY
+)
+
 export async function getCurrentSession(req) {
   const cookies = req.headers.cookie;
   if (cookies == null) return { code: 1, error: "cookies error"};
@@ -126,12 +131,12 @@ async function deleteData(supabaseInstance, tableName, column, condition) {
   return await supabaseInstance.from(tableName).delete().eq(column, condition);
 }
 
-async function getDataWithFunction(req, res, functionName, key = null, value = null) {
+export async function getDataWithFunction(req, res, functionName, key = null, value = null) {
   const {data, error} = await callSupabaseRPC(supabase, functionName, key, value);
   sendToClient(res, await data, await error);
 }
 
-async function getAuthDataWithFunction(req, res, functionName, key = null, value = null) {
+export async function getAuthDataWithFunction(req, res, functionName, key = null, value = null) {
   const session = await getCurrentSession(req);
   if (session['code'] == 1) res.send(`error in session: ${session['error']}`);
   else {
@@ -151,3 +156,12 @@ async function callSupabaseRPC(supabase, functionName, key, value) {
     })
   }
 }
+
+export async function getDashboardInfo(req, res, functionName, key = null, value = null) {
+  const session = await getCurrentSession(req);
+  if (session['code'] == 1) res.send(`error in session: ${session['error']}`);
+  else {
+    const {data, error} = await callSupabaseRPC(serviceSupabase, functionName, key, value);
+    sendToClient(res, await data, await error, true)
+  }
+}

routes/dashboard.js

@@ -0,0 +1,14 @@
+import express, { Router } from 'express';
+import cors from 'cors';
+import { getUsers, getUserId, getUserAnimals, postAuthDetails, getFriends, getUserEvents, getUserDashboard, getAnimalDashboard } from '../controllers/usersViaSupabase.js';
+
+const router = express.Router();
+
+
+
+router.get('/:id', cors(), getUserDashboard);
+router.get('/:id/animals', cors(), getAnimalDashboard);
+router.get('/:id/friends', cors(), getFriends)
+router.get('/:id/events', cors(), getUserEvents);
+
+export default router;

routes/index.js

@@ -23,11 +23,11 @@ router.options('/users', (req, res, next) => {
   }
 });
 
-router.get('/users', cors(), getUsers);
-router.get('/users/:number', cors(), getUserId);
-router.get('/users/:userId/animals', cors(), getUserAnimals);
-router.get('/users/:userId/friends', cors(), getFriends)
-router.get('/users/:userId/events', cors(), getUserEvents);
-router.post('/users', cors(), postAuthDetails);
+router.get('/', cors(), getUsers);
+router.get('/:number', cors(), getUserId);
+router.get('/:userId/animals', cors(), getUserAnimals);
+router.get('/:userId/friends', cors(), getFriends)
+router.get('/:userId/events', cors(), getUserEvents);
+router.post('/', cors(), postAuthDetails);
 
 export default router;

start.js

@@ -2,13 +2,15 @@ import express from 'express';
 import * as dotenv from 'dotenv';
 dotenv.config({ path: 'variables.env' });
 import indexRouter from './routes/index.js';
+import authRouter from './routes/dashboard.js';
 import { ErrorHandler } from './middleware/errorHandler.js';
 
 const app = express();
 
 app.use(express.json());
 app.use(express.urlencoded({ extended: true }));
-app.use('/', indexRouter);
+app.use('/users/auth', indexRouter);
+app.use('/users/dashboards', authRouter);
 
 app.use((req, res, next) => {
   try {