Soph/admin routes

.gitignore

@@ -2,4 +2,5 @@ node_modules/
 .DS_Store
 *.lock
 backend/build/
-frontend/build/
+frontend/build/
+**/.env

backend/.prettierrc

@@ -1,4 +1,5 @@
 {
+  "tabWidth": 4,
   "semi": true,
   "trailingComma": "none",
   "singleQuote": true,

backend/example.env

@@ -0,0 +1,10 @@
+TOKEN_KEY=
+JWT_PRIVATE_KEY=
+
+# SEED OPTIONS
+SEED_DEFAULT_ADMIN_EMAIL=admin@example.com
+SEED_DEFAULT_ADMIN_PASSWORD=pw
+SEED_DEFAULT_VOLUNTEER_EMAIL=volunteer@example.com
+SEED_DEFAULT_VOLUNTEER_PASSWORD=pw
+SEED_NUM_CLIENTS=10
+SEED_NUM_VOLUNTEERS=10

backend/src/ExampleEntity.ts

@@ -4,12 +4,12 @@ import { Entity, PrimaryGeneratedColumn, Column } from 'typeorm';
 // Entity is a class that maps to a database table : https://orkhan.gitbook.io/typeorm/docs/entities
 @Entity()
 export class ExampleEntity {
-  @PrimaryGeneratedColumn()
-  id: number;
+    @PrimaryGeneratedColumn()
+    id: number;
 
-  @Column()
-  stringColumn: string;
+    @Column()
+    stringColumn: string;
 
-  @Column()
-  boolColumn: boolean;
+    @Column()
+    boolColumn: boolean;
 }

backend/src/app.ts

@@ -14,7 +14,12 @@ const app = express();
 
 // Using third party middleware
 app.use(bodyParser.json()); // body-parser is which allows express to read the body and then parse that into a Json object that we can understand.
-app.use(cors()); //
+app.use(
+    cors({
+        credentials: true,
+        origin: ['http://localhost:5173']
+    })
+);
 
 // Routes go here
 // Creating route : https://expressjs.com/en/guide/routing.html

backend/src/controllers/admin.ts

@@ -1,42 +1,34 @@
 import { Request, Response } from 'express';
-import { AppDataSource } from '../data-source';
-import { AdminEntity } from '../entities/AdminEntity';
 import { StatusCode } from './statusCode';
-import * as bcrypt from 'bcryptjs';
-import * as jwt from 'jsonwebtoken';
-
-require('dotenv').config();
-const TOKEN_KEY = process.env.TOKEN_KEY;
+import AdminService from '../services/admin';
 
 export default class AdminController {
-  private AdminRepository = AppDataSource.getRepository(AdminEntity);
-
-  login = async (request: Request, response: Response) => {
-    console.log(request);
-    const { email, password } = request.body;
-    if (!(email && password)) {
-      console.log('missing params');
-    }
+    static login = async (request: Request, response: Response) => {
+        const { email, password } = request.body;
 
-    const adminUser = await this.AdminRepository.findOne({ where: { email } });
+        if (!(email && password)) {
+            response
+                .status(StatusCode.BAD_REQUEST)
+                .json({ message: 'No email or password' });
+        }
 
-    // User not found
-    if (!adminUser)
-      return response
-        .status(StatusCode.NOT_FOUND)
-        .json({ message: 'User not found' });
+        try {
+            await AdminService.getAdminByEmail(email)
+        } catch {
+            response
+                .status(StatusCode.NOT_FOUND)
+                .json({ message: 'User not found' });
+        }
 
-    if (await bcrypt.compare(password, adminUser.password)) {
-      const token = jwt.sign({ email: email }, TOKEN_KEY, {
-        expiresIn: '2h'
-      });
-      // Login successful
-      return response.status(StatusCode.OK).json({ token: token });
-    } else {
-      // Wrong password
-      return response
-        .status(StatusCode.UNAUTHORIZED)
-        .json({ message: 'Invalid Credentials' });
-    }
-  };
+        try {
+            const token = await AdminService.login(email, password)
+            response
+                .status(StatusCode.OK)
+                .json({ token: token});
+        } catch {
+            response
+                .status(StatusCode.UNAUTHORIZED)
+                .json({ message: 'Invalid credentials' });
+        }
+    };
 }

backend/src/controllers/clients.ts

@@ -1,78 +1,40 @@
 import { Request, Response } from 'express';
-import { AppDataSource } from '../data-source';
-import { ClientEntity } from '../entities/ClientEntity';
-// import { TaskEntity } from '../entities/TaskEntity';
-import { RouteDeliveryEntity } from '../entities/RouteDeliveryEntity';
 import { StatusCode } from './statusCode';
-import { ProgramType, MealType } from '../entities/types';
+import ClientService from '../services/clients';
+import { Client, CreateClientProps, UpdateClientProps } from '../types/clients';
 
 export default class ClientController {
-  private ClientRepository = AppDataSource.getRepository(ClientEntity);
-  private RouteDeliveryRepository =
-    AppDataSource.getRepository(RouteDeliveryEntity);
-
-  getClients = async (request: Request, response: Response) => {
-    const clients = await this.ClientRepository.find();
-    response.status(StatusCode.OK).json({ clients: clients });
-  };
-
-  createClient = async (request: Request, response: Response) => {
-    const client = await this.ClientRepository.create({
-      name: request.body.name,
-      email: request.body.email,
-      phoneNumber: request.body.phoneNumber,
-      address: request.body.address,
-      mealType: request.body.mealType,
-      sts: request.body.sts,
-      map: request.body.map
-    });
-    const savedClient = await this.ClientRepository.save(client);
-
-    if (client.sts) {
-      const stsRouteDelivery = new RouteDeliveryEntity();
-      stsRouteDelivery.client = savedClient;
-      stsRouteDelivery.routeNumber = 0;
-      stsRouteDelivery.routePosition = 0;
-      stsRouteDelivery.mealType = savedClient.mealType;
-      stsRouteDelivery.program = ProgramType.STS;
-
-      await this.RouteDeliveryRepository.save(stsRouteDelivery);
-    }
-
-    if (client.map) {
-      const mapRouteDelivery = new RouteDeliveryEntity();
-      mapRouteDelivery.client = savedClient;
-      mapRouteDelivery.routeNumber = 0;
-      mapRouteDelivery.routePosition = 0;
-      mapRouteDelivery.mealType = savedClient.mealType;
-      mapRouteDelivery.program = ProgramType.MAP;
-
-      await this.RouteDeliveryRepository.save(mapRouteDelivery);
-    }
-
-    response.status(StatusCode.OK).json({ client });
-  };
-
-  getClient = async (request: Request, response: Response) => {
-    const client = await this.ClientRepository.findOne({
-      where: { id: parseInt(request.params.id) }
-    });
-    response.status(StatusCode.OK).json({ client: client });
-  };
-
-  editClient = async (request: Request, response: Response) => {
-    const client = await this.ClientRepository.update(
-      { id: parseInt(request.params.id) },
-      {
-        name: request.body.name,
-        email: request.body.email,
-        phoneNumber: request.body.phoneNumber,
-        address: request.body.address,
-        mealType: request.body.mealType,
-        sts: request.body.sts,
-        map: request.body.map
-      }
-    );
-    response.status(StatusCode.OK).json({ client });
-  };
+    static getClients = async (request: Request, response: Response) => {
+        const clients = await ClientService.getAllClients();
+        response.status(StatusCode.OK).json({ clients: clients });
+    };
+
+    static createClient = async (request: Request, response: Response) => {
+        const props: CreateClientProps = request.body;
+        const client = await ClientService.createClient(props);
+        response.status(StatusCode.OK).json({ client: client });
+    };
+
+    static getClient = async (request: Request, response: Response) => {
+        const id = parseInt(request.params.id);
+        const client = await ClientService.getClient(id);
+
+        if (client == null) {
+            response.status(StatusCode.NOT_FOUND);
+        } else {
+            response.status(StatusCode.OK).json({ client: client });
+        }
+    };
+
+    static updateClient = async (request: Request, response: Response) => {
+        const id = parseInt(request.params.id);
+        const props: UpdateClientProps = request.body;
+        const client = await ClientService.updateClient(id, props);
+
+        if (client == null) {
+            response.status(StatusCode.NOT_FOUND);
+        } else {
+            response.status(StatusCode.OK).json({ client: client });
+        }
+    };
 }