Deploy

.gitignore

@@ -6,4 +6,4 @@ node_modules
 PROMPTS.md 
 To-do.md
 Claude/
-.claude/
+.claude/

api-examples/signup.rest

@@ -1,8 +1,8 @@
-POST http://localhost:3000/auth/signup
+POST https://the-locals.deno.dev/auth/signup
 Content-Type: application/json
 
 {
-  "email": "Dkjdhsbfjewrbk@gmail.com",
-  "password": "securePassword123",
-  "username": "Donald-kjhsdbvcck"
+  "email": "Dkjdhsbfje@gmail.com",
+  "password": "securePasswod1",
+  "username": "Donald-kjhsdb"
 }

deno.json

@@ -8,7 +8,6 @@
     "event-test": "deno run --allow-read --allow-write testing/testScripts/event.utils.test.ts"
   },
   "imports": {
-    "models/": "./shared/src/models/",
     "mongodb": "npm:mongodb",
     "zod": "npm:zod",
     "@openai/openai": "jsr:@openai/openai@^4.98.0"

deps.ts

@@ -29,4 +29,8 @@ export type { Payload } from 'https://deno.land/x/djwt@v3.0.2/mod.ts';
 export { Db, MongoClient, ObjectId } from 'npm:mongodb@6.1.0';
 export type { OptionalId } from 'npm:mongodb@6.1.0';
 
-export { compare, hash } from 'https://deno.land/x/bcrypt@v0.4.1/mod.ts';
+//more stable version of bycrypt
+export {
+  compareSync,
+  hashSync,
+} from 'https://deno.land/x/bcrypt@v0.2.4/mod.ts';

src/app.ts

@@ -1,13 +1,18 @@
 import 'https://deno.land/std@0.224.0/dotenv/load.ts';
 import { Application, oakCors } from '../deps.ts';
 import './database/connect.ts';
+import './cron.ts';
 import router from './routes/index.ts';
 import logRequest from './middleware/logRequest.ts';
 
 const app = new Application();
 
 app.use(
-  oakCors({ origin: ['http://localhost:5173', 'http://127.0.0.1:5173'] }),
+  oakCors({
+    origin: ['https://the-locals.netlify.app', 'http://localhost:5173'],
+    credentials: true,
+    optionsSuccessStatus: 200, // For legacy browser support
+  }),
 ); // Allow local frontend to bypass cors requirement
 app.use(logRequest);
 app.use(router.routes());

src/controllers/auth.controller.ts

@@ -1,6 +1,9 @@
 // deno-lint-ignore-file require-await
 import { Context, RouterContext, Status } from '../../deps.ts';
-import { UserLogInSchema, UserSignUpSchema } from 'models/user.model.ts';
+import {
+  UserLogInSchema,
+  UserSignUpSchema,
+} from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/user.model.ts';
 import { authService } from '../services/auth.service.ts';
 
 export const getCurrentUser = async (ctx: Context) => {
@@ -19,9 +22,13 @@ export const getCurrentUser = async (ctx: Context) => {
 
 export const signUpUser = async (ctx: RouterContext<'/signup'>) => {
   const body = await ctx.request.body.json();
+  console.log('Request body:', body);
+
   const userInput = UserSignUpSchema.safeParse(body);
+  console.log('Validtion result:', userInput.success);
 
   if (!userInput.success) {
+    console.log('Validation Errors:', userInput.error);
     ctx.response.status = Status.BadRequest;
     ctx.response.body = { errors: userInput.error.flatten() };
     return;
@@ -33,6 +40,7 @@ export const signUpUser = async (ctx: RouterContext<'/signup'>) => {
   } catch (error) {
     ctx.response.status = Status.InternalServerError;
     if (error instanceof Error) {
+      console.log('Sign up user error:', error);
       ctx.response.body = { error: error.message };
     } else {
       ctx.response.body = { error: 'Unkown error creating user' };

src/controllers/event.controller.ts

@@ -1,27 +1,40 @@
 import { Context, ObjectId, RouterContext, Status } from '../../deps.ts';
 import { eventService } from '../services/event.service.ts';
-import { generateEvents } from '../services/openai.service.ts';
-import { eventFilterSchema, FullEvent } from 'models/event.model.ts';
+//import { generateEvents } from '../services/openai.service.ts';
+import {
+  eventFilterSchema,
+  FullEvent,
+} from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/event.model.ts';
+import { verifyToken } from '../utils/token.utils.ts';
+import { Payload } from '../../deps.ts';
+import { userService } from '../services/user.service.ts';
 
 export const getAllEvents = async (ctx: Context) => {
-  const params = ctx.request.url.searchParams;
+  const auth = ctx.request.headers.get('Authorization');
+  const token = auth && auth.split(' ')[1];
+
+  let userId: string | null = null;
+  if (token) {
+    try {
+      const user: Payload = await verifyToken(token);
+      userId = user._id as string;
+    } catch (error) {
+      console.warn('Invalid token in /events: ' + error);
+    }
+  }
 
+  const params = ctx.request.url.searchParams;
   const rawModes = params.getAll('mode');
-
   const normalizedModes = rawModes
     .flatMap((param) => param.split(','))
     .map((mode) => mode.trim().toLowerCase())
-    .filter(Boolean); // removes empty strings
+    .filter(Boolean);
 
   const parseResult = eventFilterSchema.safeParse({
     mode: normalizedModes.length > 0 ? normalizedModes : undefined,
   });
 
-  let allEvents;
-  if (parseResult.success) {
-    console.log(parseResult.data);
-    allEvents = await eventService.getAllEvents(parseResult.data);
-  } else {
+  if (!parseResult.success) {
     ctx.response.status = Status.BadRequest;
     ctx.response.body = {
       error: 'Invalid query parameters',
@@ -30,7 +43,21 @@ export const getAllEvents = async (ctx: Context) => {
     return;
   }
 
-  ctx.response.body = allEvents;
+  try {
+    const [allEvents, savedEvents] = await Promise.all([
+      eventService.getAllEvents(parseResult.data),
+      userId ? userService.getUserEvents(userId) : Promise.resolve([]),
+    ]);
+
+    ctx.response.body = {
+      events: allEvents,
+      savedEventIds: savedEvents.map((x) => x._id),
+    };
+  } catch (err) {
+    console.error('Error fetching combined event data:', err);
+    ctx.response.status = Status.InternalServerError;
+    ctx.response.body = { error: 'Internal server error' };
+  }
 };
 
 export const getEventById = async (ctx: RouterContext<'/:id'>) => {
@@ -64,8 +91,8 @@ export const updateEventById = async (ctx: RouterContext<'/:id'>) => {
   }
 
   const id: string = ctx.params.id;
-  const event: FullEvent = await ctx.request.body.json();
-
+  const event: Partial<FullEvent> = await ctx.request.body.json();
+  console.log(event);
   if (!ObjectId.isValid(id)) {
     ctx.response.status = Status.BadRequest;
     ctx.response.body = `Invalid event id "${id}"`;
@@ -129,33 +156,43 @@ export const saveNewEvent = async (ctx: Context) => {
   }
 };
 
-export const saveEventsCronHandler = async (ctx: Context) => {
-  console.log('Server pinged');
-  const token = ctx.request.headers.get('X-Daily-Token');
-
-  // Change this to appropriate .env or github secret
-  const expectedToken = Deno.env.get('DAILY_JOB_TOKEN');
-
-  if (token !== expectedToken) {
-    ctx.response.status = Status.Forbidden;
-    ctx.response.body = 'Forbidden';
-    return;
-  }
-
-  console.log('Daily task triggered');
-
-  const events = await generateEvents(
-    ['music', 'charity', 'sports', 'other'],
-    'Finsbury Park',
-  );
-
-  if (events !== null) {
-    await eventService.saveEvents(events);
-    ctx.response.body = 'Events saved sucessfully';
-    console.log('Events saved');
-  } else {
-    ctx.response.status = Status.NoContent;
-    ctx.response.body = 'No events to save';
-    console.log('There were no events to save');
-  }
-};
+// export const saveEventsCronHandler = async (ctx: Context) => {
+//   console.log('Called saveEventsCronHandler()');
+//   const token = ctx.request.headers.get('X-Daily-Token');
+
+//   // Change this to appropriate .env or github secret
+//   const expectedToken = Deno.env.get('DAILY_JOB_TOKEN');
+
+//   if (token !== expectedToken) {
+//     ctx.response.status = Status.Forbidden;
+//     ctx.response.body = 'Forbidden';
+//     return;
+//   }
+
+//   console.log('Daily task triggered');
+
+//   const events = await generateEvents(
+//     ['music', 'charity', 'sports', 'other'],
+//     'Finsbury Park',
+//   );
+
+//   if (events !== null) {
+//     await eventService.saveEvents(events);
+//     ctx.response.body = 'Events saved sucessfully';
+//     console.log('Events saved');
+//   } else {
+//     ctx.response.status = Status.NoContent;
+//     ctx.response.body = 'No events to save';
+//     console.log('There were no events to save');
+//   }
+// };
+
+// export const updateEvent = async (ctx: Context) => {
+//   // TODO: Update event in DB
+//   ctx.response.body = { message: `Update event of params.id` };
+// };
+
+// export const deleteEvent = async (ctx: Context) => {
+//   // TODO: Delete event from DB
+//   ctx.response.body = { message: `Delete event params.id` };
+// };

src/controllers/user.controller.ts

@@ -1,8 +1,8 @@
 // deno-lint-ignore-file require-await
-import { Context, RouterContext } from '../../deps.ts';
+import { Context, Payload, RouterContext } from '../../deps.ts';
 import { userService } from '../services/user.service.ts';
 import { Status } from '../../deps.ts';
-import { toSafeUser } from 'models/user.model.ts';
+import { toSafeUser } from 'https://raw.githubusercontent.com/fac-31/Pro0428-LocalEventShared/main/src/models/user.model.ts';
 export const getUserProfile = async (ctx: Context) => {
   // TODO: Get user data from ctx.state.user
   ctx.response.body = { message: 'Get user profile' };
@@ -17,7 +17,7 @@ export const deleteUserAccount = async (ctx: Context) => {
   // TODO: Call userService.deleteUser(ctx.state.user.id)
   ctx.response.body = { message: 'Delete user account' };
 };
-export const getAllUsers = async (ctx: RouterContext<'/:role'>) => {
+export const getAllUsers = async (ctx: RouterContext<'/getUsers:role'>) => {
   const role = ctx.params.role;
 
   if (role !== 'user' && role !== 'admin' && role !== 'all') {
@@ -40,3 +40,23 @@ export const getAllUsers = async (ctx: RouterContext<'/:role'>) => {
     }
   }
 };
+
+export const handleUserEvents = async (ctx: Context) => {
+  try {
+    const user: Payload = ctx.state.user;
+
+    if (!user || !user._id) {
+      ctx.response.status = Status.Unauthorized;
+      ctx.response.body = { message: 'Unauthorized: Invalid token' };
+      return;
+    }
+    const body = await ctx.request.body.json();
+    const { eventId, active } = body;
+    const userId = user._id as string;
+
+    await userService.handleUserEvents(eventId, userId, active);
+    return ctx.response.body = 'User event handled';
+  } catch (error) {
+    console.error('Issue saving user events: ' + error);
+  }
+};

src/cron.ts

@@ -0,0 +1,29 @@
+import { eventService } from './services/event.service.ts';
+import { generateEvents } from './services/openai.service.ts';
+
+Deno.cron('save events cron', '0 0 * * *', async () => {
+  console.log('executing cron job...');
+  try {
+    console.log('Daily task triggered');
+
+    const events = await generateEvents(
+      ['music', 'charity', 'sports', 'other'],
+      'Finsbury Park',
+    );
+
+    if (events !== null) {
+      await eventService.saveEvents(events);
+      console.log('Events saved successfully');
+    } else {
+      console.log('There were no events to save');
+    }
+  } catch (error) {
+    console.error('Cron job failed:', error);
+  }
+});
+
+//cron for every 10mins
+// "*/10 * * * *"
+
+// cron for midnight
+// "0 0 * * *"

src/routes/event.routes.ts

@@ -3,7 +3,7 @@ import {
   deleteEventById,
   getAllEvents,
   getEventById,
-  saveEventsCronHandler,
+  //saveEventsCronHandler,
   saveNewEvent,
   updateEventById,
 } from '../controllers/event.controller.ts';
@@ -20,7 +20,7 @@ router.get('/:id', getEventById);
 router.put('/:id', ProtectRoute, protectAdmin, updateEventById);
 router.delete('/:id', ProtectRoute, protectAdmin, deleteEventById);
 router.post('/save-event', saveNewEvent);
-router.post('/cron/save-events', saveEventsCronHandler);
+//router.post('/cron/save-events', saveEventsCronHandler);
 // router.post("/")
 
 // router.post("/generate", generateEvents) (using the openAi service)

src/routes/user.routes.ts

@@ -1,19 +1,13 @@
 import { Router } from '../../deps.ts';
 import protectAdmin from '../middleware/requireAdmin.ts';
 import ProtectRoute from '../middleware/protectRoute.ts';
-import { getAllUsers } from '../controllers/user.controller.ts';
-const router = new Router();
-
-// Routes under /users
+import {
+  getAllUsers,
+  handleUserEvents,
+} from '../controllers/user.controller.ts';
 
-// Temporary stub for testing
-router.get('/', (ctx) => {
-  ctx.response.body = 'User route root';
-});
-router.get('/:role', ProtectRoute, protectAdmin, getAllUsers);
-// -> to controllers
-// router.get("/me", getUserProfile)
-// router.put("/me", updateUserProfile)
-// router.delete("/me", deleteUserAccount)
+const router = new Router();
 
+router.get('/getUsers:role', ProtectRoute, protectAdmin, getAllUsers);
+router.post('/saveUserEvents', ProtectRoute, handleUserEvents);
 export default router;