Backend/package.json

@@ -11,9 +11,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@types/cookie-parser": "^1.4.2",
     "bcrypt": "^5.0.1",
-    "cookie-parser": "^1.4.5",
     "cors": "^2.8.5",
     "dotenv": "^8.2.0",
     "express": "^4.17.1",

Backend/src/index.ts

@@ -14,9 +14,6 @@ import {vendorsRouter} from './models/vendors/vendors.router';
 import {errorHandler} from './middleware/error.middleware';
 import {notFoundHandler} from './middleware/notFound.middleware';
 import {usersRouter} from './models/users/users.router';
-import {pricealarmsRouter} from './models/pricealarms/pricealarms.router';
-
-const cookieParser = require('cookie-parser');
 
 dotenv.config();
 
@@ -41,14 +38,12 @@ const app = express();
 app.use(helmet());
 app.use(cors());
 app.use(express.json());
-app.use(cookieParser());
 app.use('/products', productsRouter);
 app.use('/categories', categoriesRouter);
 app.use('/manufacturers', manufacturersRouter);
 app.use('/prices', pricesRouter);
 app.use('/users', usersRouter);
 app.use('/vendors', vendorsRouter);
-app.use('/pricealarms', pricealarmsRouter);
 
 app.use(errorHandler);
 app.use(notFoundHandler);

Backend/src/middleware/error.middleware.ts

@@ -1,5 +1,5 @@
-import HttpException from '../common/http-exception';
+import HttpException from "../common/http-exception";
-import {Request, Response, NextFunction} from 'express';
+import { Request, Response, NextFunction } from "express";
 
 export const errorHandler = (
     error: HttpException,
@@ -9,7 +9,7 @@ export const errorHandler = (
 ) => {
     const status = error.statusCode || 500;
     const message =
-        error.message || 'It\'s not you. It\'s us. We are having some problems.';
+        error.message || "It's not you. It's us. We are having some problems.";
 
     response.status(status).send(message);
 };

Backend/src/middleware/notFound.middleware.ts

@@ -1,4 +1,4 @@
-import {Request, Response, NextFunction} from 'express';
+import { Request, Response, NextFunction } from "express";
 
 export const notFoundHandler = (
     request: Request,
@@ -6,7 +6,7 @@ export const notFoundHandler = (
     next: NextFunction
 ) => {
 
-    const message = 'Resource not found';
+    const message = "Resource not found";
 
     response.status(404).send(message);
 };

Backend/src/models/categories/categories.router.ts

@@ -27,7 +27,7 @@ categoriesRouter.get('/', async (req: Request, res: Response) => {
         res.status(200).send(categories);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });
 
@@ -46,7 +46,7 @@ categoriesRouter.get('/:id', async (req: Request, res: Response) => {
         res.status(200).send(category);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });
 
@@ -65,6 +65,6 @@ categoriesRouter.get('/search/:term', async (req: Request, res: Response) => {
         res.status(200).send(categories);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });

Backend/src/models/categories/categories.service.ts

@@ -23,9 +23,6 @@ import {Categories} from './categories.interface';
  * Service Methods
  */
 
-/**
- * Fetches and returns all known categories
- */
 export const findAll = async (): Promise<Categories> => {
     let conn;
     let categRows = [];
@@ -57,10 +54,6 @@ export const findAll = async (): Promise<Categories> => {
     return categRows;
 };
 
-/**
- * Fetches and returns the category with the specified id
- * @param id The id of the category to fetch
- */
 export const find = async (id: number): Promise<Category> => {
     let conn;
     let categ: any;
@@ -84,10 +77,6 @@ export const find = async (id: number): Promise<Category> => {
     return categ;
 };
 
-/**
- * Fetches and returns all categories that match the search term
- * @param term the term to match
- */
 export const findBySearchTerm = async (term: string): Promise<Categories> => {
     let conn;
     let categRows = [];
@@ -111,3 +100,36 @@ export const findBySearchTerm = async (term: string): Promise<Categories> => {
 
     return categRows;
 };
+
+// export const create = async (newItem: Product): Promise<void> => {
+//     let conn;
+//     try {
+//         conn = await pool.getConnection();
+//         await conn.query("");
+//
+//     } catch (err) {
+//         throw err;
+//     } finally {
+//         if (conn) conn.end();
+//     }
+// };
+//
+// export const update = async (updatedItem: Product): Promise<void> => {
+//     if (models.products[updatedItem.product_id]) {
+//         models.products[updatedItem.product_id] = updatedItem;
+//         return;
+//     }
+//
+//     throw new Error("No record found to update");
+// };
+//
+// export const remove = async (id: number): Promise<void> => {
+//     const record: Product = models.products[id];
+//
+//     if (record) {
+//         delete models.products[id];
+//         return;
+//     }
+//
+//     throw new Error("No record found to delete");
+// };

Backend/src/models/manufacturers/manufacturers.router.ts

@@ -27,7 +27,7 @@ manufacturersRouter.get('/', async (req: Request, res: Response) => {
         res.status(200).send(manufacturers);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });
 
@@ -46,11 +46,11 @@ manufacturersRouter.get('/:id', async (req: Request, res: Response) => {
         res.status(200).send(manufacturer);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });
 
-// GET items/:term
+// GET items/:name
 manufacturersRouter.get('/search/:term', async (req: Request, res: Response) => {
     const term: string = req.params.term;
 
@@ -65,6 +65,6 @@ manufacturersRouter.get('/search/:term', async (req: Request, res: Response) =>
         res.status(200).send(manufacturer);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });

Backend/src/models/manufacturers/manufacturers.service.ts

@@ -23,9 +23,6 @@ import {Manufacturers} from './manufacturers.interface';
  * Service Methods
  */
 
-/**
- * Fetches and returns all known manufacturers
- */
 export const findAll = async (): Promise<Manufacturers> => {
     let conn;
     let manRows = [];
@@ -57,10 +54,6 @@ export const findAll = async (): Promise<Manufacturers> => {
     return manRows;
 };
 
-/**
- * Fetches and returns the manufacturer with the specified id
- * @param id The id of the manufacturer to fetch
- */
 export const find = async (id: number): Promise<Manufacturer> => {
     let conn;
     let man: any;
@@ -84,10 +77,6 @@ export const find = async (id: number): Promise<Manufacturer> => {
     return man;
 };
 
-/**
- * Fetches and returns all manufacturers that match the search term
- * @param term the term to match
- */
 export const findBySearchTerm = async (term: string): Promise<Manufacturers> => {
     let conn;
     let manRows = [];
@@ -111,3 +100,36 @@ export const findBySearchTerm = async (term: string): Promise<Manufacturers> =>
 
     return manRows;
 };
+
+// export const create = async (newItem: Product): Promise<void> => {
+//     let conn;
+//     try {
+//         conn = await pool.getConnection();
+//         await conn.query("");
+//
+//     } catch (err) {
+//         throw err;
+//     } finally {
+//         if (conn) conn.end();
+//     }
+// };
+//
+// export const update = async (updatedItem: Product): Promise<void> => {
+//     if (models.products[updatedItem.product_id]) {
+//         models.products[updatedItem.product_id] = updatedItem;
+//         return;
+//     }
+//
+//     throw new Error("No record found to update");
+// };
+//
+// export const remove = async (id: number): Promise<void> => {
+//     const record: Product = models.products[id];
+//
+//     if (record) {
+//         delete models.products[id];
+//         return;
+//     }
+//
+//     throw new Error("No record found to delete");
+// };

Backend/src/models/pricealarms/pricealarm.interface.ts

@@ -1,6 +0,0 @@
-export interface PriceAlarm {
-    alarm_id: number;
-    user_id: number;
-    product_id: number;
-    defined_price: number;
-}

Backend/src/models/pricealarms/pricealarms.interface.ts

@@ -1,5 +0,0 @@
-import {PriceAlarm} from './pricealarm.interface';
-
-export interface PriceAlarms {
-    [key: number]: PriceAlarm;
-}

Backend/src/models/pricealarms/pricealarms.router.ts

@@ -1,102 +0,0 @@
-/**
- * Required External Modules and Interfaces
- */
-
-import express, {Request, Response} from 'express';
-import * as PriceAlarmsService from './pricealarms.service';
-import {PriceAlarm} from './pricealarm.interface';
-import {PriceAlarms} from './pricealarms.interface';
-import * as UserService from '../users/users.service';
-
-
-/**
- * Router Definition
- */
-export const pricealarmsRouter = express.Router();
-
-
-/**
- * Controller Definitions
- */
-
-//GET pricealarms/
-pricealarmsRouter.get('/', async (req: Request, res: Response) => {
-    try {
-        // Authenticate user
-        const user_ip = req.connection.remoteAddress ?? '';
-        const user = await UserService.checkSessionWithCookie(req.cookies.betterauth, user_ip);
-
-        const priceAlarms = await PriceAlarmsService.getPriceAlarms(user.user_id);
-
-        res.status(200).send(priceAlarms);
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});
-
-// POST pricealarms/create
-pricealarmsRouter.post('/create', async (req: Request, res: Response) => {
-    try {
-        // Authenticate user
-        const user_ip = req.connection.remoteAddress ?? '';
-        const user = await UserService.checkSessionWithCookie(req.cookies.betterauth, user_ip);
-
-        // Get info for price alarm creation
-        const product_id = req.body.product_id;
-        const defined_price = req.body.defined_price;
-
-        if (!product_id || !defined_price) {
-            // Missing
-            res.status(400).send(JSON.stringify({message: 'Missing parameters'}));
-            return;
-        }
-
-        // Create price alarm
-        const success = await PriceAlarmsService.createPriceAlarm(user.user_id, product_id, defined_price);
-
-        if (success) {
-            res.status(201).send(JSON.stringify({success: true}));
-            return;
-        } else {
-            res.status(500).send(JSON.stringify({success: false}));
-            return;
-        }
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});
-
-// PUT pricealarms/update
-pricealarmsRouter.put('/update', async (req: Request, res: Response) => {
-    try {
-        // Authenticate user
-        const user_ip = req.connection.remoteAddress ?? '';
-        const user = await UserService.checkSessionWithCookie(req.cookies.betterauth, user_ip);
-
-        // Get info for price alarm creation
-        const alarm_id = req.body.alarm_id;
-        const defined_price = req.body.defined_price;
-
-        if (!alarm_id || !defined_price) {
-            // Missing
-            res.status(400).send(JSON.stringify({message: 'Missing parameters'}));
-            return;
-        }
-
-        // Create price alarm
-        const success = await PriceAlarmsService.updatePriceAlarm(alarm_id, user.user_id, defined_price);
-
-        if (success) {
-            res.status(201).send(JSON.stringify({success: true}));
-            return;
-        } else {
-            res.status(500).send(JSON.stringify({success: false}));
-            return;
-        }
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});

Backend/src/models/pricealarms/pricealarms.service.ts

@@ -1,106 +0,0 @@
-import * as dotenv from 'dotenv';
-
-dotenv.config();
-
-const mariadb = require('mariadb');
-const pool = mariadb.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.DB_DATABASE,
-    connectionLimit: 5
-});
-
-/**
- * Data Model Interfaces
- */
-
-import {PriceAlarm} from './pricealarm.interface';
-import {PriceAlarms} from './pricealarms.interface';
-
-
-/**
- * Service Methods
- */
-
-/**
- * Creates a price alarm for the given user for the product with the defined price
- * @param user_id The id of the user to create the price alarm for
- * @param product_id The id of the product to create the price alarm for
- * @param defined_price The defined price for the price alarm
- */
-export const createPriceAlarm = async (user_id: number, product_id: number, defined_price: number): Promise<Boolean> => {
-    let conn;
-    try {
-        conn = await pool.getConnection();
-        const res = await conn.query('INSERT INTO price_alarms (user_id, product_id, defined_price) VALUES (?, ?, ?)', [user_id, product_id, defined_price]);
-
-        if (res.affectedRows === 1) {
-            return true;
-        } else {
-            return false;
-        }
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-
-    return false;
-};
-
-/**
- * Fetches and returns all price alarms for the given user
- * @param user_id
- */
-export const getPriceAlarms = async (user_id: number): Promise<PriceAlarms> => {
-    let conn;
-    let priceAlarms = [];
-    try {
-        conn = await pool.getConnection();
-        const rows = await conn.query('SELECT alarm_id, user_id, product_id, defined_price FROM price_alarms WHERE user_id = ?', user_id);
-        for (let row in rows) {
-            if (row !== 'meta') {
-                priceAlarms.push(rows[row]);
-            }
-        }
-
-        return priceAlarms;
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-};
-
-/**
- * Updates the given price alarm with the given fields
- * @param alarm_id The id of the price alarm to update
- * @param user_id The id of the user that wants to update the price alarm
- * @param defined_price The defined price for the price alarm
- */
-export const updatePriceAlarm = async (alarm_id: number, user_id: number, defined_price: number): Promise<Boolean> => {
-    let conn;
-    try {
-        conn = await pool.getConnection();
-        const res = await conn.query('UPDATE price_alarms SET defined_price = ? WHERE alarm_id = ? AND user_id = ?', [defined_price, alarm_id, user_id]);
-
-        if (res.affectedRows === 1) {
-            return true;
-        } else {
-            return false;
-        }
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-
-    return false;
-};

Backend/src/models/prices/prices.router.ts

@@ -40,7 +40,7 @@ pricesRouter.get('/', async (req: Request, res: Response) => {
         res.status(200).send(prices);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });
 
@@ -59,7 +59,7 @@ pricesRouter.get('/:id', async (req: Request, res: Response) => {
         res.status(200).send(price);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });
 
@@ -78,7 +78,7 @@ pricesRouter.get('/bestDeals/:amount', async (req: Request, res: Response) => {
         res.status(200).send(prices);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });
 
@@ -97,6 +97,6 @@ pricesRouter.get('/byProduct/list/:ids', async (req: Request, res: Response) =>
         res.status(200).send(prices);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });

Backend/src/models/prices/prices.service.ts

@@ -23,15 +23,12 @@ import {Prices} from './prices.interface';
  * Service Methods
  */
 
-/**
- * Fetches and returns all known prices
- */
 export const findAll = async (): Promise<Prices> => {
     let conn;
     let priceRows = [];
     try {
         conn = await pool.getConnection();
-        const rows = await conn.query('SELECT price_id, product_id, vendor_id, price_in_cents, timestamp FROM prices WHERE active_listing = true');
+        const rows = await conn.query('SELECT price_id, product_id, vendor_id, price_in_cents, timestamp FROM prices');
         for (let row in rows) {
             if (row !== 'meta') {
                 let price: Price = {
@@ -63,16 +60,12 @@ export const findAll = async (): Promise<Prices> => {
     return priceRows;
 };
 
-/**
- * Fetches and returns the price with the specified id
- * @param id The id of the price to fetch
- */
 export const find = async (id: number): Promise<Price> => {
     let conn;
     let price: any;
     try {
         conn = await pool.getConnection();
-        const rows = await conn.query('SELECT price_id, product_id, vendor_id, price_in_cents, timestamp FROM prices WHERE price_id = ? AND active_listing = true', id);
+        const rows = await conn.query('SELECT price_id, product_id, vendor_id, price_in_cents, timestamp FROM prices WHERE price_id = ?', id);
         for (let row in rows) {
             if (row !== 'meta') {
                 price = rows[row];
@@ -90,16 +83,12 @@ export const find = async (id: number): Promise<Price> => {
     return price;
 };
 
-/**
- * Fetches and returns all prices that belong to the specified product
- * @param product the product to fetch the prices for
- */
 export const findByProduct = async (product: number): Promise<Prices> => {
     let conn;
     let priceRows = [];
     try {
         conn = await pool.getConnection();
-        const rows = await conn.query('SELECT price_id, product_id, vendor_id, price_in_cents, timestamp FROM prices WHERE product_id = ? AND active_listing = true', product);
+        const rows = await conn.query('SELECT price_id, product_id, vendor_id, price_in_cents, timestamp FROM prices WHERE product_id = ?', product);
         for (let row in rows) {
             if (row !== 'meta') {
                 priceRows.push(rows[row]);
@@ -117,14 +106,6 @@ export const findByProduct = async (product: number): Promise<Prices> => {
     return priceRows;
 };
 
-/**
- * Fetches and returns prices that belong to the specified product.
- * If type is newest, only the newest prices for each vendor will be returned.
- * If type is lowest, the lowest daily price for the product is returned.
- * Otherwise, all prices for this product are returned.
- * @param product The product to fetch the prices for
- * @param type The type of prices, e.g. newest / lowest
- */
 export const findByType = async (product: string, type: string): Promise<Prices> => {
     let conn;
     let priceRows = [];
@@ -142,16 +123,16 @@ export const findByType = async (product: string, type: string): Promise<Prices>
                 'PARTITION BY p.vendor_id ' +
                 'ORDER BY p.timestamp DESC) AS rk ' +
                 'FROM prices p ' +
-                'WHERE product_id = ? AND vendor_id != 1 AND active_listing = true) ' +
+                'WHERE product_id = ? AND vendor_id != 1) ' +
                 'SELECT s.* ' +
                 'FROM summary s ' +
                 'WHERE s.rk = 1 '), product);
         } else if (type === 'lowest') {
             // Used to get the lowest prices for this product over a period of time
-            rows = await conn.query('SELECT price_id, product_id, vendor_id, MIN(price_in_cents) as price_in_cents, timestamp FROM prices WHERE product_id = ? AND vendor_id != 1 AND active_listing = true GROUP BY DAY(timestamp) ORDER BY timestamp', product);
+            rows = await conn.query('SELECT price_id, product_id, vendor_id, MIN(price_in_cents) as price_in_cents, timestamp FROM prices WHERE product_id = ? AND vendor_id != 1 GROUP BY DAY(timestamp) ORDER BY timestamp', product);
         } else {
             // If no type is given, return all prices for this product
-            rows = await conn.query('SELECT price_id, product_id, vendor_id, price_in_cents, timestamp FROM prices WHERE product_id = ? AND vendor_id != 1 AND active_listing = true', product);
+            rows = await conn.query('SELECT price_id, product_id, vendor_id, price_in_cents, timestamp FROM prices WHERE product_id = ? AND vendor_id != 1', product);
         }
 
         for (let row in rows) {
@@ -171,15 +152,6 @@ export const findByType = async (product: string, type: string): Promise<Prices>
     return priceRows;
 };
 
-/**
- * Fetches and returns prices that belong to the specified product and vendor.
- * If type is newest, only the newest known price for the product at the vendor is returned.
- * If type is lowest, only the lowest ever known price for the product at the vendor is returned.
- * Otherwise, all prices for this product are returned.
- * @param product The product to fetch the prices for
- * @param vendor The vendor to fetch the prices for
- * @param type The type of prices, e.g. newest / lowest
- */
 export const findByVendor = async (product: string, vendor: string, type: string): Promise<Prices> => {
     let conn;
     let priceRows = [];
@@ -188,13 +160,13 @@ export const findByVendor = async (product: string, vendor: string, type: string
         let rows = [];
         if (type === 'newest') {
             // Used to get the newest price for this product and vendor
-            rows = await conn.query('SELECT price_id, product_id, vendor_id, price_in_cents, timestamp FROM prices WHERE product_id = ? AND vendor_id = ? AND active_listing = true ORDER BY timestamp DESC LIMIT 1', [product, vendor]);
+            rows = await conn.query('SELECT price_id, product_id, vendor_id, price_in_cents, timestamp FROM prices WHERE product_id = ? AND vendor_id = ? ORDER BY timestamp DESC LIMIT 1', [product, vendor]);
         } else if (type === 'lowest') {
             // Used to get the lowest prices for this product and vendor in all time
-            rows = await conn.query('SELECT price_id, product_id, vendor_id, MIN(price_in_cents) as price_in_cents, timestamp FROM prices WHERE product_id = ? AND vendor_id = ? AND active_listing = true LIMIT 1', [product, vendor]);
+            rows = await conn.query('SELECT price_id, product_id, vendor_id, MIN(price_in_cents) as price_in_cents, timestamp FROM prices WHERE product_id = ? AND vendor_id = ? LIMIT 1', [product, vendor]);
         } else {
             // If no type is given, return all prices for this product and vendor
-            rows = await conn.query('SELECT price_id, product_id, vendor_id, price_in_cents, timestamp FROM prices WHERE product_id = ? AND vendor_id = ? AND active_listing = true', [product, vendor]);
+            rows = await conn.query('SELECT price_id, product_id, vendor_id, price_in_cents, timestamp FROM prices WHERE product_id = ? AND vendor_id = ?', [product, vendor]);
         }
 
         for (let row in rows) {
@@ -214,11 +186,6 @@ export const findByVendor = async (product: string, vendor: string, type: string
     return priceRows;
 };
 
-/**
- * Fetches and returns the best current deals, i.e. the non-amazon prices that have the biggest difference to amazon prices.
- * Only the latest known prices for every vendor are taken into consideration so we only get up-to-date-deals.
- * @param amount The amount of deals to return
- */
 export const getBestDeals = async (amount: number): Promise<Prices> => {
     let conn;
     let priceRows = [];
@@ -237,7 +204,7 @@ export const getBestDeals = async (amount: number): Promise<Prices> => {
             '           ROW_NUMBER() OVER(\n' +
             '               PARTITION BY p.product_id, p.vendor_id\n' +
             '               ORDER BY p.timestamp DESC) AS rk\n' +
-            '    FROM prices p WHERE active_listing = true)\n' +
+            '    FROM prices p)\n' +
             'SELECT s.*\n' +
             'FROM summary s\n' +
             'WHERE s.rk = 1');
@@ -298,6 +265,7 @@ export const getBestDeals = async (amount: number): Promise<Prices> => {
         let maxAmt = Math.min(amount, deals.length);
 
         for (let dealIndex = 0; dealIndex < maxAmt; dealIndex++) {
+            //console.log(deals[dealIndex]);
             priceRows.push(deals[dealIndex] as Price);
         }
 
@@ -314,7 +282,7 @@ export const getBestDeals = async (amount: number): Promise<Prices> => {
 };
 
 /**
- * Fetches and returns the lowest, latest, non-amazon price for each given product
+ * Get the lowest, latest, non-amazon price for each given product
  * @param ids the ids of the products
  */
 export const findListByProducts = async (productIds: [number]): Promise<Prices> => {
@@ -337,7 +305,7 @@ export const findListByProducts = async (productIds: [number]): Promise<Prices>
             '               ORDER BY p.timestamp DESC) AS rk\n' +
             '    FROM prices p' +
             '    WHERE p.product_id IN (?)' +
-            '    AND p.vendor_id != 1 AND active_listing = true)\n' +
+            '    AND p.vendor_id != 1)\n' +
             'SELECT s.*\n' +
             'FROM summary s\n' +
             'WHERE s.rk = 1', [productIds]);
@@ -376,3 +344,36 @@ export const findListByProducts = async (productIds: [number]): Promise<Prices>
 
     return priceRows;
 };
+
+// export const create = async (newItem: Product): Promise<void> => {
+//     let conn;
+//     try {
+//         conn = await pool.getConnection();
+//         await conn.query("");
+//
+//     } catch (err) {
+//         throw err;
+//     } finally {
+//         if (conn) conn.end();
+//     }
+// };
+//
+// export const update = async (updatedItem: Product): Promise<void> => {
+//     if (models.products[updatedItem.product_id]) {
+//         models.products[updatedItem.product_id] = updatedItem;
+//         return;
+//     }
+//
+//     throw new Error("No record found to update");
+// };
+//
+// export const remove = async (id: number): Promise<void> => {
+//     const record: Product = models.products[id];
+//
+//     if (record) {
+//         delete models.products[id];
+//         return;
+//     }
+//
+//     throw new Error("No record found to delete");
+// };

Backend/src/models/products/products.router.ts

@@ -27,7 +27,7 @@ productsRouter.get('/', async (req: Request, res: Response) => {
         res.status(200).send(products);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });
 
@@ -46,7 +46,7 @@ productsRouter.get('/:id', async (req: Request, res: Response) => {
         res.status(200).send(product);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });
 
@@ -65,7 +65,7 @@ productsRouter.get('/search/:term', async (req: Request, res: Response) => {
         res.status(200).send(products);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });
 
@@ -84,6 +84,6 @@ productsRouter.get('/list/:ids', async (req: Request, res: Response) => {
         res.status(200).send(products);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });

Backend/src/models/products/products.service.ts

@@ -23,9 +23,6 @@ import {Products} from './products.interface';
  * Service Methods
  */
 
-/**
- * Fetches and returns all known products
- */
 export const findAll = async (): Promise<Products> => {
     let conn;
     let prodRows = [];
@@ -77,10 +74,6 @@ export const findAll = async (): Promise<Products> => {
     return prodRows;
 };
 
-/**
- * Fetches and returns the product with the specified id
- * @param id The id of the product to fetch
- */
 export const find = async (id: number): Promise<Product> => {
     let conn;
     let prod: any;
@@ -104,10 +97,6 @@ export const find = async (id: number): Promise<Product> => {
     return prod;
 };
 
-/**
- * Fetches and returns all products that match the search term
- * @param term the term to match
- */
 export const findBySearchTerm = async (term: string): Promise<Products> => {
     let conn;
     let prodRows = [];
@@ -133,10 +122,6 @@ export const findBySearchTerm = async (term: string): Promise<Products> => {
     return prodRows;
 };
 
-/**
- * Fetches and returns the product details for the given list of product ids
- * @param ids The list of product ids to fetch the details for
- */
 export const findList = async (ids: [number]): Promise<Products> => {
     let conn;
     let prodRows = [];
@@ -159,3 +144,36 @@ export const findList = async (ids: [number]): Promise<Products> => {
 
     return prodRows;
 };
+
+// export const create = async (newItem: Product): Promise<void> => {
+//     let conn;
+//     try {
+//         conn = await pool.getConnection();
+//         await conn.query("");
+//
+//     } catch (err) {
+//         throw err;
+//     } finally {
+//         if (conn) conn.end();
+//     }
+// };
+//
+// export const update = async (updatedItem: Product): Promise<void> => {
+//     if (models.products[updatedItem.product_id]) {
+//         models.products[updatedItem.product_id] = updatedItem;
+//         return;
+//     }
+//
+//     throw new Error("No record found to update");
+// };
+//
+// export const remove = async (id: number): Promise<void> => {
+//     const record: Product = models.products[id];
+//
+//     if (record) {
+//         delete models.products[id];
+//         return;
+//     }
+//
+//     throw new Error("No record found to delete");
+// };

Backend/src/models/users/users.router.ts

@@ -47,13 +47,10 @@ usersRouter.post('/register', async (req: Request, res: Response) => {
         const session: Session = await UserService.createUser(username, password, email, ip);
 
         // Send the session details back to the user
-        res.cookie('betterauth', JSON.stringify({
+        res.status(201).send(session);
-            id: session.session_id,
-            key: session.session_key
-        }), {expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 30)}).sendStatus(201);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });
 
@@ -73,34 +70,39 @@ usersRouter.post('/login', async (req: Request, res: Response) => {
         // Update the user entry and create a session
         const session: Session = await UserService.login(username, password, ip);
 
-        if (!session.session_id) {
+        if(!session.session_id) {
             // Error logging in, probably wrong username / password
-            res.status(401).send(JSON.stringify({messages: ['Wrong username and / or password'], codes: [1, 4]}));
+            res.status(401).send(JSON.stringify({messages: ["Wrong username and / or password"], codes: [1, 4]}));
             return;
         }
 
         // Send the session details back to the user
-        res.cookie('betterauth', JSON.stringify({
+        res.status(201).send(session);
-            id: session.session_id,
-            key: session.session_key
-        }), {expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 30)}).sendStatus(200);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });
 
 // POST users/checkSessionValid
 usersRouter.post('/checkSessionValid', async (req: Request, res: Response) => {
     try {
+        const sessionId: string = req.body.sessionId;
+        const sessionKey: string = req.body.sessionKey;
         const ip: string = req.connection.remoteAddress ?? '';
 
-        // Update the user entry and create a session
+        if (!sessionId || !sessionKey) {
-        const user: User = await UserService.checkSessionWithCookie(req.cookies.betterauth, ip);
+            // Missing
+            res.status(400).send(JSON.stringify({message: 'Missing parameters'}));
+            return;
+        }
 
-        if (!user.user_id) {
+        // Update the user entry and create a session
+        const user: User = await UserService.checkSession(sessionId, sessionKey, ip);
+
+        if(!user.user_id) {
             // Error logging in, probably wrong username / password
-            res.status(401).send(JSON.stringify({messages: ['Invalid session'], codes: [5]}));
+            res.status(401).send(JSON.stringify({messages: ["Invalid session"], codes: [5]}));
             return;
         }
 
@@ -108,6 +110,6 @@ usersRouter.post('/checkSessionValid', async (req: Request, res: Response) => {
         res.status(201).send(user);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });

Backend/src/models/users/users.service.ts

@@ -68,7 +68,7 @@ export const createUser = async (username: string, password: string, email: stri
         return {
             session_id: sessionId,
             session_key: sessionKey,
-            session_key_hash: 'HIDDEN',
+            session_key_hash: '',
             last_IP: ip
         };
 
@@ -135,7 +135,7 @@ export const login = async (username: string, password: string, ip: string): Pro
         return {
             session_id: sessionId,
             session_key: sessionKey,
-            session_key_hash: 'HIDDEN',
+            session_key_hash: '',
             last_IP: ip
         };
 
@@ -179,7 +179,7 @@ export const checkSession = async (sessionId: string, sessionKey: string, ip: st
         // Key is valid, continue
 
         // Check if the session is still valid
-        if (validUntil <= new Date()) {
+        if(validUntil <= new Date()) {
             // Session expired, return invalid
             return {} as User;
         }
@@ -193,7 +193,7 @@ export const checkSession = async (sessionId: string, sessionKey: string, ip: st
         await conn.commit();
 
         // Get the other required user information and update the user
-        const userQuery = 'SELECT user_id, username, email, registration_date, last_login_date FROM users WHERE user_id = ?';
+        const userQuery = "SELECT user_id, username, email, registration_date, last_login_date FROM users WHERE user_id = ?";
         const userRows = await conn.query(userQuery, userId);
         let username = '';
         let email = '';
@@ -213,7 +213,7 @@ export const checkSession = async (sessionId: string, sessionKey: string, ip: st
             user_id: userId,
             username: username,
             email: email,
-            password_hash: 'HIDDEN',
+            password_hash: '',
             registration_date: registrationDate,
             last_login_date: lastLoginDate
         };
@@ -229,20 +229,6 @@ export const checkSession = async (sessionId: string, sessionKey: string, ip: st
     return {} as User;
 };
 
-/**
- * Calls the checkSession method after extracting the required information from the authentication cookie
- * @param cookie The betterauth cookie
- * @param ip The users IP address
- */
-export const checkSessionWithCookie = async (cookie: any, ip: string): Promise<User> => {
-    const parsedCookie = JSON.parse(cookie);
-    const session_id = parsedCookie.id;
-    const session_key = parsedCookie.key;
-
-
-    return checkSession(session_id, session_key, '');
-};
-
 /**
  * Used in the checkUsernameAndEmail method as return value
  */

Backend/src/models/vendors/vendors.router.ts

@@ -6,7 +6,6 @@ import express, {Request, Response} from 'express';
 import * as VendorService from './vendors.service';
 import {Vendor} from './vendor.interface';
 import {Vendors} from './vendors.interface';
-import * as UserService from '../users/users.service';
 
 
 /**
@@ -20,7 +19,7 @@ export const vendorsRouter = express.Router();
  * Controller Definitions
  */
 
-// GET vendors/
+// GET items/
 vendorsRouter.get('/', async (req: Request, res: Response) => {
     try {
         const vendors: Vendors = await VendorService.findAll();
@@ -28,27 +27,11 @@ vendorsRouter.get('/', async (req: Request, res: Response) => {
         res.status(200).send(vendors);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });
 
-// GET vendors/managed
+// GET items/:id
-vendorsRouter.get('/managed', async (req: Request, res: Response) => {
-    try {
-        // Authenticate user
-        const user_ip = req.connection.remoteAddress ?? '';
-        const user = await UserService.checkSessionWithCookie(req.cookies.betterauth, user_ip);
-
-        const vendors = await VendorService.getManagedShops(user.user_id);
-
-        res.status(200).send(vendors);
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
-    }
-});
-
-// GET vendors/:id
 vendorsRouter.get('/:id', async (req: Request, res: Response) => {
     const id: number = parseInt(req.params.id, 10);
 
@@ -63,11 +46,11 @@ vendorsRouter.get('/:id', async (req: Request, res: Response) => {
         res.status(200).send(vendor);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
     }
 });
 
-// GET vendors/search/:term
+// GET items/:name
 vendorsRouter.get('/search/:term', async (req: Request, res: Response) => {
     const term: string = req.params.term;
 
@@ -82,30 +65,6 @@ vendorsRouter.get('/search/:term', async (req: Request, res: Response) => {
         res.status(200).send(vendors);
     } catch (e) {
         console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
+        res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
-    }
-});
-
-// PUT /manage/deactivatelisting
-vendorsRouter.put('/manage/deactivatelisting', async (req: Request, res: Response) => {
-    try {
-        // Authenticate user
-        const user_ip = req.connection.remoteAddress ?? '';
-        const user = await UserService.checkSessionWithCookie(req.cookies.betterauth, user_ip);
-
-        // Get required parameters
-        const vendor_id = req.body.vendor_id;
-        const product_id = req.body.product_id;
-
-        const success = await VendorService.deactivateListing(user.user_id, vendor_id, product_id);
-
-        if(success) {
-            res.sendStatus(200);
-        } else {
-            res.sendStatus(500);
-        }
-    } catch (e) {
-        console.log('Error handling a request: ' + e.message);
-        res.status(500).send(JSON.stringify({'message': 'Internal Server Error. Try again later.'}));
     }
 });

Backend/src/models/vendors/vendors.service.ts

@@ -17,16 +17,12 @@ const pool = mariadb.createPool({
 
 import {Vendor} from './vendor.interface';
 import {Vendors} from './vendors.interface';
-import {User} from '../users/user.interface';
 
 
 /**
  * Service Methods
  */
 
-/**
- * Fetches and returns all known vendors
- */
 export const findAll = async (): Promise<Vendors> => {
     let conn;
     let vendorRows = [];
@@ -70,10 +66,6 @@ export const findAll = async (): Promise<Vendors> => {
     return vendorRows;
 };
 
-/**
- * Fetches and returns the vendor with the specified id
- * @param id The id of the vendor to fetch
- */
 export const find = async (id: number): Promise<Vendor> => {
     let conn;
     let vendor: any;
@@ -97,10 +89,6 @@ export const find = async (id: number): Promise<Vendor> => {
     return vendor;
 };
 
-/**
- * Fetches and returns all vendors that match the search term
- * @param term the term to match
- */
 export const findBySearchTerm = async (term: string): Promise<Vendors> => {
     let conn;
     let vendorRows = [];
@@ -125,63 +113,35 @@ export const findBySearchTerm = async (term: string): Promise<Vendors> => {
     return vendorRows;
 };
 
-/**
+// export const create = async (newItem: Product): Promise<void> => {
- * Get all vendors that have the given user as admin
+//     let conn;
- * @param user The user to return the managed shops for
+//     try {
- */
+//         conn = await pool.getConnection();
-export const getManagedShops = async (user_id: number): Promise<Vendors> => {
+//         await conn.query("");
-    let conn;
+//
-    let vendorRows = [];
+//     } catch (err) {
-    try {
+//         throw err;
-        conn = await pool.getConnection();
+//     } finally {
-        const rows = await conn.query('SELECT vendor_id, name, streetname, zip_code, city, country_code, phone, website FROM vendors WHERE admin_id LIKE ?', user_id);
+//         if (conn) conn.end();
-        for (let row in rows) {
+//     }
-            if (row !== 'meta') {
+// };
-                vendorRows.push(rows[row]);
+//
-            }
+// export const update = async (updatedItem: Product): Promise<void> => {
-        }
+//     if (models.products[updatedItem.product_id]) {
-
+//         models.products[updatedItem.product_id] = updatedItem;
-    } catch (err) {
+//         return;
-        throw err;
+//     }
-    } finally {
+//
-        if (conn) {
+//     throw new Error("No record found to update");
-            conn.end();
+// };
-        }
+//
-    }
+// export const remove = async (id: number): Promise<void> => {
-
+//     const record: Product = models.products[id];
-    return vendorRows;
+//
-};
+//     if (record) {
-
+//         delete models.products[id];
-/**
+//         return;
- * Deactivates a product listing for a specific vendor
+//     }
- * @param user_id The user id of the issuing user
+//
- * @param vendor_id The vendor id of the vendor to deactivate the listing for
+//     throw new Error("No record found to delete");
- * @param product_id The product id of the product to deactivate the listing for
+// };
- */
-export const deactivateListing = async (user_id: number, vendor_id: number, product_id: number): Promise<Boolean> => {
-    let conn;
-    try {
-        conn = await pool.getConnection();
-
-        // Check if the user is authorized to manage the requested vendor
-        const user_vendor_rows = await conn.query('SELECT vendor_id FROM vendors WHERE vendor_id = ? AND admin_id = ?', [vendor_id, user_id]);
-        if (user_vendor_rows.length !== 1) {
-            return false;
-        }
-
-        const status = await conn.query('UPDATE prices SET active_listing = false WHERE vendor_id = ? and product_id = ?', [vendor_id, product_id]);
-
-        if(status.affectedRows > 0){
-            return true;
-        }
-        return false;
-    } catch (err) {
-        throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
-    }
-
-    return false;
-};

Backend/webpack.config.ts

@@ -1,32 +1,32 @@
-const webpack = require('webpack');
+const webpack = require("webpack");
-const path = require('path');
+const path = require("path");
-const nodeExternals = require('webpack-node-externals');
+const nodeExternals = require("webpack-node-externals");
 
 module.exports = {
-    entry: ['webpack/hot/poll?100', './src/index.ts'],
+    entry: ["webpack/hot/poll?100", "./src/index.ts"],
     watch: false,
-    target: 'node',
+    target: "node",
     externals: [
         nodeExternals({
-            whitelist: ['webpack/hot/poll?100']
+            whitelist: ["webpack/hot/poll?100"]
         })
     ],
     module: {
         rules: [
             {
                 test: /.tsx?$/,
-                use: 'ts-loader',
+                use: "ts-loader",
                 exclude: /node_modules/
             }
         ]
     },
-    mode: 'development',
+    mode: "development",
     resolve: {
-        extensions: ['.tsx', '.ts', '.js']
+        extensions: [".tsx", ".ts", ".js"]
     },
     plugins: [new webpack.HotModuleReplacementPlugin()],
     output: {
-        path: path.join(__dirname, 'dist'),
+        path: path.join(__dirname, "dist"),
-        filename: 'index.js'
+        filename: "index.js"
     }
 };

Crawler/Crawler.iml

@@ -2,13 +2,13 @@
 <module type="WEB_MODULE" version="4">
   <component name="FacetManager">
     <facet type="Python" name="Python">
-      <configuration sdkName="Python 3.9 (venv)" />
+      <configuration sdkName="Python 3.9" />
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Python 3.9 (venv) interpreter library" level="application" />
+    <orderEntry type="library" name="Python 3.9 interpreter library" level="application" />
   </component>
 </module>

Crawler/crawler.py

@@ -1,5 +1,4 @@
 import sql
-import amazonspider
 
 
 def crawl(product_ids: [int]) -> dict:
@@ -51,14 +50,13 @@ def crawl(product_ids: [int]) -> dict:
         'products_with_problems': products_with_problems
     }
 
+
 def __crawl_amazon__(product_info: dict) -> tuple:
     """
     Crawls the price for the given product from amazon
     :param product_info: A dict with product info containing product_id, vendor_id, url
     :return: A tuple with the crawled data, containing (product_id, vendor_id, price_in_cents)
     """
-
-    amazonspider.start_crawling()
     return (product_info['product_id'], product_info['vendor_id'], 123)
 
 

Crawler/unused/scrapy/amazonspider.py

@@ -1,33 +0,0 @@
-import scrapy
-from scrapy.crawler import CrawlerProcess
-import re
-
-class AmazonSpider(scrapy.Spider):
-    name = 'amazon'
-    allowed_domains = ['amazon.de']
-    start_urls = ['https://amazon.de/dp/B083DRCPJG']
-
-    # def __init__(self, start_urls):
-    #   self.start_urls = start_urls
-
-    def parse(self, response):
-        price = response.xpath('//*[@id="priceblock_ourprice"]/text()').extract_first()
-        if not price:
-            price = response.xpath('//*[@data-asin-price]/@data-asin-price').extract_first() or \
-                    response.xpath('//*[@id="price_inside_buybox"]/text()').extract_first()
-
-        euros = re.match('(\d*),\d\d', price).group(1)
-        cents = re.match('\d*,(\d\d)', price).group(1)
-        priceincents = euros + cents
-
-        yield {'price': priceincents}
-
-
-def start_crawling():
-    process = CrawlerProcess(
-        settings={'COOKIES_ENABLED': 'False', 'CONCURRENT_REQUESTS_PER_IP': 1, 'ROBOTSTXT_OBEY': False,
-                  'USER_AGENT': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36',
-                  'DOWNLOAD_DELAY': 3}
-        , install_root_handler=False)
-    process.crawl()
-    process.start()

Crawler/unused/scrapy/spiders/amazon.py

@@ -1,25 +0,0 @@
-import scrapy
-import re
-
-class AmazonSpider(scrapy.Spider):
-    name = 'amazon'
-    allowed_domains = ['amazon.de']
-    start_urls = ['https://amazon.de/dp/B083DRCPJG']
-
-    def parse(self, response):
-        price = response.xpath('//*[@id="priceblock_ourprice"]/text()').extract_first()
-        if not price:
-            price = response.xpath('//*[@data-asin-price]/@data-asin-price').extract_first() or \
-                    response.xpath('//*[@id="price_inside_buybox"]/text()').extract_first()
-
-        euros = re.match('(\d*),\d\d', price).group(1)
-        cents = re.match('\d*,(\d\d)', price).group(1)
-        priceincents = euros + cents
-
-        yield {'price': priceincents}
-
-
-
-
-
-

CucumberTests/CucumberTests.iml

@@ -10,24 +10,17 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/resource" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="openjdk-16" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.cucumber:cucumber-java:2.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.cucumber:cucumber-core:2.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: info.cukes:cucumber-html:0.2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.cucumber:cucumber-jvm-deps:1.0.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.cucumber:gherkin:5.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.cucumber:tag-expressions:1.1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.cucumber:cucumber-junit:2.3.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:cucumber-java:6.10.3" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:cucumber-core:6.10.3" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:cucumber-gherkin:6.10.3" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:cucumber-gherkin-messages:6.10.3" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:messages:15.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:tag-expressions:3.0.1" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:cucumber-expressions:10.3.0" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:datatable:3.5.0" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:cucumber-plugin:6.10.3" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:docstring:6.10.3" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:html-formatter:13.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:create-meta:4.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: io.cucumber:cucumber-junit:6.10.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven.plugins:maven-compiler-plugin:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0" level="project" />
@@ -60,25 +53,5 @@
     <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-compiler-api:2.8.4" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-compiler-manager:2.8.4" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.plexus:plexus-compiler-javac:2.8.4" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-chrome-driver:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-edge-driver:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-ie-driver:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-opera-driver:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-remote-driver:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-safari-driver:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:3.141.59" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.8.15" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:25.0-jre" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
-    <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.14.0" level="project" />
   </component>
 </module>

CucumberTests/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>xyz.betterzon</groupId>
+    <groupId>de.taskhub</groupId>
     <artifactId>CucumberTests</artifactId>
     <version>1.0-SNAPSHOT</version>
     <properties>
@@ -13,30 +13,21 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>io.cucumber</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>cucumber-java</artifactId>
-            <version>4.12</version>
+            <version>2.3.1</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-java</artifactId>
-            <version>6.10.3</version>
-        </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-junit</artifactId>
-            <version>6.10.3</version>
+            <version>2.3.1</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
             <version>3.8.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-java</artifactId>
-            <version>3.141.59</version>
-        </dependency>
     </dependencies>
 </project>

CucumberTests/src/test/java/RunTest.java

@@ -1,10 +1,6 @@
-import io.cucumber.junit.Cucumber;
+import cucumber.api.CucumberOptions;
-import io.cucumber.junit.CucumberOptions;
+import cucumber.api.junit.Cucumber;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.openqa.selenium.firefox.FirefoxDriver;
-import stepdefs.Preconditions;
 
 @RunWith(Cucumber.class)
 @CucumberOptions(
@@ -13,13 +9,4 @@ import stepdefs.Preconditions;
 )
 
 public class RunTest {
-    @BeforeClass
-    public static void setup() {
-        Preconditions.driver= new FirefoxDriver();
-    }
-
-    @AfterClass
-    public static void teardown() {
-        Preconditions.driver.close();
-    }
 }

CucumberTests/src/test/java/stepdefs/Preconditions.java

@@ -1,7 +0,0 @@
-package stepdefs;
-
-import org.openqa.selenium.WebDriver;
-
-public class Preconditions {
-    public static WebDriver driver;
-}

CucumberTests/src/test/java/stepdefs/PriceAlarm.java

@@ -1,9 +1,8 @@
 package stepdefs;
 
-import io.cucumber.java.PendingException;
+import cucumber.api.java.en.Given;
-import io.cucumber.java.en.Given;
+import cucumber.api.java.en.Then;
-import io.cucumber.java.en.Then;
+import cucumber.api.java.en.When;
-import io.cucumber.java.en.When;
 
 public class PriceAlarm {
   @Given("^the user has at least (\\d+) price alarm set$")

CucumberTests/src/test/java/stepdefs/SearchProduct.java

@@ -1,38 +1,21 @@
 package stepdefs;
 
-import io.cucumber.java.PendingException;
+import cucumber.api.PendingException;
-import io.cucumber.java.en.Given;
+import cucumber.api.java.en.Given;
-import io.cucumber.java.en.Then;
+import cucumber.api.java.en.Then;
-import io.cucumber.java.en.When;
+import cucumber.api.java.en.When;
-import org.openqa.selenium.By;
-import org.openqa.selenium.Keys;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.WebDriverWait;
 
 public class SearchProduct {
   @Given("^the user is on the landing page$")
   public void the_user_is_on_the_landing_page() throws Exception {
-        //throw new PendingException();
-        Preconditions.driver.get("https://betterzon.xyz");
-        WebElement logo = (new WebDriverWait(Preconditions.driver, 10))
-                .until(ExpectedConditions.elementToBeClickable(By.cssSelector(".logo")));
   }
 
   @When("^the user enters the search term \"([^\"]*)\" and clicks search$")
-    public void the_user_enters_the_search_term_and_clicks_search(String searchTerm) throws Exception {
+  public void the_user_enters_the_search_term_and_clicks_search(String arg0) throws Exception {
-        WebElement searchField = Preconditions.driver.findElement(By.cssSelector(".ng-untouched.ng-pristine.ng-valid"));
-        searchField.sendKeys(searchTerm);
-        searchField.sendKeys(Keys.ENTER);
-        WebElement logo = (new WebDriverWait(Preconditions.driver, 10))
-                .until(ExpectedConditions.elementToBeClickable(By.cssSelector(".logo")));
   }
 
   @Then("^the user should see the error page \"([^\"]*)\"$")
   public void the_user_should_see_the_error_page(String arg0) throws Exception {
-        WebElement noProdsFoundMsg = (new WebDriverWait(Preconditions.driver, 10))
-                .until(ExpectedConditions.elementToBeClickable(By.cssSelector(".ng-star-inserted")));
-        assert(noProdsFoundMsg.getText().contains("No Products found!"));
   }
 
   @Given("^the user is not logged in$")
@@ -45,9 +28,6 @@ public class SearchProduct {
 
   @Then("^the user should see a list of products$")
   public void the_user_should_see_a_list_of_products() throws Exception {
-        WebElement product = (new WebDriverWait(Preconditions.driver, 10))
-                .until(ExpectedConditions.elementToBeClickable(By.cssSelector(".productItem.ng-star-inserted")));
-        assert(product.isDisplayed());
   }
 
   @When("^the user clicks on the first product$")

Frontend/src/app/components/footer/footer.component.spec.ts

@@ -1,18 +1,18 @@
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 
 import {FooterComponent} from './footer.component';
-import {RouterTestingModule} from '@angular/router/testing';
+import {RouterTestingModule} from "@angular/router/testing";
-import {AppComponent} from '../../app.component';
+import {AppComponent} from "../../app.component";
-import {ImprintComponent} from '../../pages/imprint/imprint.component';
+import {ImprintComponent} from "../../pages/imprint/imprint.component";
-import {ActivatedRoute, Router} from '@angular/router';
+import {ActivatedRoute, Router} from "@angular/router";
 
 describe('FooterComponent', () => {
     let component: FooterComponent;
     let fixture: ComponentFixture<FooterComponent>;
-    const router = {
+    let router = {
         navigate: jasmine.createSpy('navigate'),
         routerState: jasmine.createSpy('routerState')
-    };
+    }
 
     beforeEach(async () => {
         await TestBed.configureTestingModule({

Frontend/src/app/components/header/header.component.spec.ts

@@ -1,22 +1,21 @@
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 
 import {HeaderComponent} from './header.component';
-import {RouterTestingModule} from '@angular/router/testing';
+import {RouterTestingModule} from "@angular/router/testing";
-import {MatMenuModule} from '@angular/material/menu';
+import {MatMenuModule} from "@angular/material/menu";
-import {Router} from '@angular/router';
+import {Router} from "@angular/router";
 
 describe('HeaderComponent', () => {
     let component: HeaderComponent;
     let fixture: ComponentFixture<HeaderComponent>;
-    const router = {
+    let router = {
         navigate: jasmine.createSpy('navigate'),
         navigateByUrl: (url: string) => {
             return {
-                then: () => {
+                then: () => {}
+            }
         }
-            };
     }
-    };
 
     beforeEach(async () => {
         await TestBed.configureTestingModule({

Frontend/src/app/components/newest-prices-list/newest-prices-list.component.spec.ts

@@ -1,19 +1,18 @@
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 
 import {NewestPricesListComponent} from './newest-prices-list.component';
-import {RouterTestingModule} from '@angular/router/testing';
+import {RouterTestingModule} from "@angular/router/testing";
-import {HttpClient} from '@angular/common/http';
+import {HttpClient} from "@angular/common/http";
-import {AbstractMockObservableService} from '../../mocks/mock.service';
+import {AbstractMockObservableService} from "../../mocks/mock.service";
-import {ApiService} from '../../services/api.service';
+import {ApiService} from "../../services/api.service";
-import {Observable} from 'rxjs';
 
 class MockApiService extends AbstractMockObservableService {
-    getCurrentPricePerVendor(): any {
+    getCurrentPricePerVendor() {
         this.content = [];
         return this;
     }
 
-    getVendors(): any {
+    getVendors() {
         const vendor = {
             vendor_id: 1,
             name: 'Max Mustermann',

Frontend/src/app/components/product-details/product-details.component.spec.ts

@@ -1,33 +1,18 @@
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 
 import {ProductDetailsComponent} from './product-details.component';
-import {RouterTestingModule} from '@angular/router/testing';
+import {RouterTestingModule} from "@angular/router/testing";
-import {AbstractMockObservableService} from '../../mocks/mock.service';
+import {AbstractMockObservableService} from "../../mocks/mock.service";
-import {ApiService} from '../../services/api.service';
+import {ApiService} from "../../services/api.service";
-import {ChartComponent, NgApexchartsModule} from 'ng-apexcharts';
+import {ChartComponent, NgApexchartsModule} from "ng-apexcharts";
-import {By} from '@angular/platform-browser';
 
 class MockApiService extends AbstractMockObservableService {
-    getProduct(): any {
+    getProduct() {
-        const product = {
+        this.content = {};
-            product_id: 1,
-            asin: 'ASIN',
-            is_active: true,
-            name: 'Super tolles Produkt',
-            short_description: 'Descr',
-            long_description: 'Descr',
-            image_guid: '123',
-            date_added: new Date(),
-            last_modified: new Date(),
-            manufacturer_id: 1,
-            selling_rank: '1',
-            category_id: 1
-        };
-        this.content = product;
         return this;
     }
 
-    getLowestPrices(): any {
+    getLowestPrices() {
         const price = {
             price_id: 1,
             product_id: 1,
@@ -39,12 +24,12 @@ class MockApiService extends AbstractMockObservableService {
         return this;
     }
 
-    getAmazonPrice(): any {
+    getAmazonPrice() {
         this.content = {};
         return this;
     }
 
-    getVendors(): any {
+    getVendors() {
         const vendor = {
             vendor_id: 1,
             name: 'Max Mustermann',
@@ -54,7 +39,7 @@ class MockApiService extends AbstractMockObservableService {
             country_code: 'DE',
             phone: '+49 123 4567890',
             website: 'https://www.amazon.de',
-        };
+        }
         this.content = [vendor];
         return this;
     }
@@ -87,10 +72,4 @@ describe('ProductDetailsComponent', () => {
     it('should create', () => {
         expect(component).toBeTruthy();
     });
-
-    it('should show the product name', () => {
-        component.ngOnInit();
-        const title = fixture.debugElement.query(By.css('.productTitle'));
-        expect(title.nativeElement.innerText).toEqual('Super tolles Produkt');
-    });
 });

Frontend/src/app/components/product-list/product-list.component.spec.ts

@@ -1,20 +1,20 @@
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 
 import {ProductListComponent} from './product-list.component';
-import {FooterComponent} from '../footer/footer.component';
+import {FooterComponent} from "../footer/footer.component";
-import {HeaderComponent} from '../header/header.component';
+import {HeaderComponent} from "../header/header.component";
-import {RouterTestingModule} from '@angular/router/testing';
+import {RouterTestingModule} from "@angular/router/testing";
-import {ApiService} from '../../services/api.service';
+import {ApiService} from "../../services/api.service";
-import {AbstractMockObservableService} from '../../mocks/mock.service';
+import {AbstractMockObservableService} from "../../mocks/mock.service";
-import {Router} from '@angular/router';
+import {Router} from "@angular/router";
 
 class MockApiService extends AbstractMockObservableService {
-    getProducts(): any {
+    getProducts() {
         this.content = [];
         return this;
     }
 
-    getProductsByQuery(): any {
+    getProductsByQuery() {
         this.content = [];
         return this;
     }
@@ -24,10 +24,10 @@ describe('ProductListComponent', () => {
     let component: ProductListComponent;
     let fixture: ComponentFixture<ProductListComponent>;
     let mockService;
-    const router = {
+    let router = {
         navigate: jasmine.createSpy('navigate'),
         routerState: jasmine.createSpy('routerState')
-    };
+    }
 
     beforeEach(async () => {
         mockService = new MockApiService();
@@ -71,7 +71,7 @@ describe('ProductListComponent', () => {
             manufacturer_id: 1,
             selling_rank: '1',
             category_id: 1
-        };
+        }
 
         component.clickedProduct(product);
         expect(router.navigate).toHaveBeenCalledWith(['/product/1']);

Frontend/src/app/pages/landingpage/landingpage.component.spec.ts

@@ -1,16 +1,16 @@
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 
 import {LandingpageComponent} from './landingpage.component';
-import {RouterTestingModule} from '@angular/router/testing';
+import {RouterTestingModule} from "@angular/router/testing";
-import {Router} from '@angular/router';
+import {Router} from "@angular/router";
 
 describe('LandingpageComponent', () => {
     let component: LandingpageComponent;
     let fixture: ComponentFixture<LandingpageComponent>;
-    const router = {
+    let router = {
         navigate: jasmine.createSpy('navigate'),
         routerState: jasmine.createSpy('routerState')
-    };
+    }
 
     beforeEach(async () => {
         await TestBed.configureTestingModule({

Frontend/src/app/pages/product-detail-page/product-detail-page.component.spec.ts

@@ -1,7 +1,7 @@
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 
 import {ProductDetailPageComponent} from './product-detail-page.component';
-import {RouterTestingModule} from '@angular/router/testing';
+import {RouterTestingModule} from "@angular/router/testing";
 
 describe('ProductDetailPageComponent', () => {
     let component: ProductDetailPageComponent;

Frontend/src/app/pages/product-search-page/product-search-page.component.spec.ts

@@ -1,10 +1,10 @@
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 
 import {ProductSearchPageComponent} from './product-search-page.component';
-import {HeaderComponent} from '../../components/header/header.component';
+import {HeaderComponent} from "../../components/header/header.component";
-import {FooterComponent} from '../../components/footer/footer.component';
+import {FooterComponent} from "../../components/footer/footer.component";
-import {ProductListComponent} from '../../components/product-list/product-list.component';
+import {ProductListComponent} from "../../components/product-list/product-list.component";
-import {RouterTestingModule} from '@angular/router/testing';
+import {RouterTestingModule} from "@angular/router/testing";
 
 describe('ProductSearchPageComponent', () => {
     let component: ProductSearchPageComponent;

README.md

@@ -3,9 +3,9 @@ Website: https://www.betterzon.xyz<br>
 Blog: https://blog.betterzon.xyz<br>
 Wiki: https://github.com/Mueller-Patrick/Betterzon/wiki
 
-# Code Quality
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/88e47ebf837b43af9d12147c22f77f7f)](https://www.codacy.com/gh/Mueller-Patrick/Betterzon/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=Mueller-Patrick/Betterzon&amp;utm_campaign=Badge_Grade)
-
 # Project Status
+![Latest Commit Build Status](https://ci.betterzon.xyz/job/Verify_Build_on_PR/badge/icon?style=flat-square&subject=Latest%20Commit)
+![Deployment Status](https://ci.betterzon.xyz/job/GitHub%20Deployment/badge/icon?style=flat-square&subject=Deployment&status=Success)
+<br>
 [![Website Status](https://img.shields.io/website?label=www.betterzon.xyz&style=for-the-badge&url=https%3A%2F%2Fwww.betterzon.xyz)](https://www.betterzon.xyz)
 [![Blog Status](https://img.shields.io/website?label=blog.betterzon.xyz&style=for-the-badge&url=https%3A%2F%2Fblog.betterzon.xyz)](https://blog.betterzon.xyz)