Merge pull request #2 from advanced-computer-lab-2023/SprintOneMark

Sprint one mark

server/.env.example

@@ -1,6 +1,6 @@
 PORT=
 
-MONGO_URI=
+MONGO_URI=mongodb+srv://mark:s89sQCSg94VI3oO9@cluster0.hqmqtq1.mongodb.net/clinic?retryWrites=true&w=majority
 
 TOKEN_SECRET=
 

server/package.json

@@ -48,6 +48,7 @@
     "prettier": "^3.0.0",
     "supertest": "^6.3.3",
     "ts-jest": "^29.1.1",
+    "ts-node": "^10.9.1",
     "typescript": "^5.2.2"
   },
   "jest": {

server/src/app.ts

@@ -6,6 +6,17 @@ import helmet from 'helmet';
 import compression from 'compression';
 import { queryParser } from './middlewares';
 
+import {
+  authRouter,
+  appointmentRouter,
+  chatroomRouter,
+  contractRouter,
+  notificationRouter,
+  packageRouter,
+  prescriptionRouter,
+  userRouter
+} from './routes';
+
 const app = express();
 
 app.use(json());
@@ -26,12 +37,14 @@ app.use(compression());
 // );
 app.use(queryParser);
 
-app.use('/auth');
-app.use('/users');
-app.use('/products');
-app.use('/reviews');
-app.use('/cart');
-app.use('/orders');
+app.use('/auth', authRouter);
+app.use('/appointments', appointmentRouter);
+app.use('/chatrooms', chatroomRouter);
+app.use('/contracts', contractRouter);
+app.use('/notifications', notificationRouter);
+app.use('/packages', packageRouter);
+app.use('/prescriptions', prescriptionRouter);
+app.use('/users', userRouter);
 
 app.all('*', (req: Request, res: Response) => res.status(404).send('NOT FOUND'));
 

server/src/controllers/controller.ts

@@ -2,12 +2,11 @@ import { Response } from 'express';
 import { StatusCodes } from 'http-status-codes';
 import { HttpError } from '../utils';
 
-const controller = (res: Response, session?: any) => {
+const controller = (res: Response) => {
   return (service: Function) => {
     return async (...args: any[]) => {
       try {
         const result = await service(...args);
-        if (session && result.token) session.token = result.token;
 
         res.status(result.status).json(result);
       } catch (error: any) {

server/src/routes/appointment.route.ts

@@ -4,4 +4,4 @@ const router = express.Router();
 
 //
 
-module.exports = router;
+export default router;

server/src/routes/auth.route.ts

@@ -2,4 +2,5 @@ import express from 'express';
 const router = express.Router();
 // http methods required for this router
 
-module.exports = router;
+export default router;
+

server/src/routes/chatroom.route.ts

@@ -4,4 +4,5 @@ const router = express.Router();
 
 //
 
-module.exports = router;
+export default router;
+

server/src/routes/contract.route.ts

@@ -4,4 +4,5 @@ const router = express.Router();
 
 //
 
-module.exports = router;
+export default router;
+

server/src/routes/index.ts

@@ -0,0 +1,19 @@
+import authRouter from './auth.route';
+import appointmentRouter from './appointment.route';
+import chatroomRouter from './chatroom.route';
+import contractRouter from './contract.route';
+import notificationRouter from './notification.route';
+import packageRouter from './package.route';
+import prescriptionRouter from './prescription.route';
+import userRouter from './user.route';
+
+export {
+  authRouter,
+  appointmentRouter,
+  chatroomRouter,
+  contractRouter,
+  notificationRouter,
+  packageRouter,
+  prescriptionRouter,
+  userRouter
+};

server/src/routes/notification.route.ts

@@ -4,4 +4,4 @@ const router = express.Router();
 
 //
 
-module.exports = router;
+export default router;

server/src/routes/package.route.ts

@@ -4,4 +4,4 @@ const router = express.Router();
 
 //
 
-module.exports = router;
+export default router;

server/src/routes/prescription.route.ts

@@ -4,4 +4,4 @@ const router = express.Router();
 
 //
 
-module.exports = router;
+export default router;

server/src/routes/user.route.ts

@@ -1,7 +1,14 @@
 import express from 'express';
 const router = express.Router();
+
+import controller from '../controllers/controller';
+import { isAuthenticated, isAuthorized, queryParser } from '../middlewares';
+
+// import the user service
+import { getPatients, selectPatient } from '../services/userService';
 // http methods required for this router
 
-//
+router.get('/me/patient/', async (req, res) => controller(res)(getPatients)(req.query.doctorID));
+router.get('/me/patient/:id', async (req, res) => controller(res)(selectPatient)(req.query.doctorID, req.params.id));
 
-module.exports = router;
+export default router;