Ported all backend to TS

Builds without issues and works perfectly with the existing frontend.

Author: ricky-daniel13

index.ts

@@ -39,14 +39,12 @@ app.get("/authed", (request: Request, response: Response) => {
 import inv from "./src/routes/invoices";
 app.use('/invoices', inv);
 
-/*
+import products from "./src/routes/products";
+app.use('/products', products);
 
-var clients = require('./src/routes/clients.js');
+import clients from "./src/routes/clients";
 app.use('/clients', clients);
 
-var products = require('./src/routes/products.js');
-app.use('/products', products); */
-
 //Internal function for hashing passwords.
 /*
 app.post("/pass", async (request, response) => {
@@ -68,7 +66,6 @@ app.post("/pass", async (request, response) => {
 });*/
 
 
-
 //Error Handler
 const jsonErrorHandler = (err: Error, req: Request, res: Response, next: NextFunction) => {
   console.log("Error: ", err);

src/middleware/auth.ts

@@ -1,5 +1,4 @@
-import express, { Express, Request, Response, NextFunction } from "express";
-import bcrypt from "bcrypt";
+import {Request, Response, NextFunction } from "express";
 import jwt, { VerifyOptions } from "jsonwebtoken"
 import dbConn from "../db/connection";
 import { RowDataPacket } from "mysql2";

src/routes/clients.js src/routes/clients.ts

@@ -1,51 +1,48 @@
-var express = require('express');
-var router = express.Router();
-
+import express, { Express, Request, Response, NextFunction } from "express";
+import { RowDataPacket } from "mysql2";
+import dbConn from "../db/connection";
+import { Client } from "../types/clients";
+const router = express.Router();
 
 //Routes will go here
-module.exports = router;
+export default router;
 
-router.get('/', async function (req, res, next) {
-    if(req.user.isClient){
+router.get('/', async function (req: Request, res: Response, next: NextFunction) {
+    if(req.user!.isClient){
         res.status(403).send({ error: 'User isn\'t allowed to make this action' });
         return;
     }
 
     try {
-        const con = require('../db/connection.js')().promise();
+        const con = dbConn().promise();
 
         let baseQuery = "SELECT clients.user_email, clients.name, MIN(invoices.date) AS oldest_invoice_date, MAX(total_amount) AS most_expensive_invoice_total FROM clients LEFT JOIN (\
 SELECT invoices.client_email, invoices.id, SUM((invoices_products.unit_price * invoices_products.quantity) * (1 - (invoices.discount / 100))) AS total_amount FROM invoices\
  LEFT JOIN invoices_products ON invoices.id = invoices_products.invoice_id GROUP BY invoices.id ) AS invoice_totals ON clients.user_email = invoice_totals.client_email LEFT JOIN\
  invoices ON invoice_totals.id = invoices.id GROUP BY clients.user_email";
 
         try {
-            const [rows] = await con.query(baseQuery);
-
-            console.log("Result: ", rows);
-
-            const clients = [];
-
-            
+            const [rows] = await con.query<RowDataPacket[]>(baseQuery);
+            const clients: Client[] = [];
 
             rows.forEach(row => {
                 let allowedDiscount = 0;
 
-                if(row.most_expensive_invoice_total!=null){
-                    if(row.most_expensive_invoice_total > 2000)
+                if(row['most_expensive_invoice_total']!=null){
+                    if(row['most_expensive_invoice_total'] > 2000)
                         allowedDiscount = 45;
-                    if(row.most_expensive_invoice_total < 1000)
+                    if(row['most_expensive_invoice_total'] < 1000)
                         allowedDiscount = 10;
                 }
 
-                let dateDif = new Date(Date.now() - (row.oldest_invoice_date == null ? Date.now() : row.oldest_invoice_date.getTime())).getUTCFullYear() - 1970; //restamos la unix timestamp de hoy y la de la fecha de la compra mas vieja. Eso nos da la diferencia de años + 1970
+                let dateDif = new Date(Date.now() - (row['oldest_invoice_date'] == null ? Date.now() : row['oldest_invoice_date'].getTime())).getUTCFullYear() - 1970; //restamos la unix timestamp de hoy y la de la fecha de la compra mas vieja. Eso nos da la diferencia de años + 1970
 
                 if(dateDif>=3)
                     allowedDiscount = 30;
 
                 clients.push({
-                    email : row.user_email,
-                    name : row.name,
+                    email : row['user_email'],
+                    name : row['name'],
                     allowedDiscount : allowedDiscount
                 });
             });
@@ -55,7 +52,7 @@ SELECT invoices.client_email, invoices.id, SUM((invoices_products.unit_price * i
             console.log(error);
             res.status(500).send({error:"Internal Server Error"});
         } finally {
-            con.close();
+            con.end();
         }
 
     } catch (error) {

src/routes/products.js

@@ -0,0 +1,46 @@
+import express, { Express, Request, Response, NextFunction } from "express";
+import { Product } from "../types/product";
+import { RowDataPacket } from "mysql2";
+import dbConn from "../db/connection";
+const router = express.Router();
+
+
+//Routes will go here
+export default router;
+
+router.get('/', async function (req: Request, res: Response, next: NextFunction) {
+    if(req.user!.isClient){
+        res.status(403).send({ error: 'User isn\'t allowed to make this action' });
+        return;
+    }
+
+    try {
+        const con = dbConn().promise();
+
+        let baseQuery = "SELECT * FROM products";
+
+        try {
+            const [rows] = await con.query<RowDataPacket[]>(baseQuery);
+            console.log("Result: ", rows);
+            const products: Product[] = [];
+            rows.forEach(row => {
+                products.push({
+                    id : row['id'],
+                    name : row['name'],
+                    price : row['price']
+                });
+            });
+
+            res.status(200).send(products);
+        } catch (error) {
+            console.log(error);
+            res.status(500).send({error:"Internal Server Error"});
+        } finally {
+            con.end();
+        }
+
+    } catch (error) {
+        next(error);
+        return;
+    }
+});

src/routes/products.ts

@@ -0,0 +1,5 @@
+export type Client = {
+    email : string,
+    name : string,
+    allowedDiscount : number
+}

src/types/clients.ts

@@ -1,4 +1,4 @@
-import { InvoiceProduct } from "./product"
+import { InvoiceProduct } from "./invoiceproduct"
 
 export type Invoice = {
     id: number,

src/types/invoice.ts

@@ -0,0 +1,6 @@
+export type InvoiceProduct = {
+    id: number,
+    quantity: number,
+    unitPrice: number,
+    name: string
+}

src/types/invoiceproduct.ts

@@ -1,6 +1,5 @@
-export type InvoiceProduct = {
+export type Product = {
     id: number,
-    quantity: number,
-    unitPrice: number,
+    price: number,
     name: string
 }