mirror of
https://github.com/Mueller-Patrick/Betterzon.git
synced 2024-12-23 12:15:11 +00:00
Compare commits
No commits in common. "d2a4d93f54fc5ecd86c3012e717a78d04b078c3a" and "8e58efa42c0076f8e710a1495943168988c5f1f3" have entirely different histories.
d2a4d93f54
...
8e58efa42c
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -4,7 +4,6 @@
|
||||||
**/dist
|
**/dist
|
||||||
/tmp
|
/tmp
|
||||||
/out-tsc
|
/out-tsc
|
||||||
**/coverage
|
|
||||||
# Only exists if Bazel was run
|
# Only exists if Bazel was run
|
||||||
/bazel-out
|
/bazel-out
|
||||||
|
|
||||||
|
|
4362
Backend/package-lock.json
generated
4362
Backend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
|
@ -11,17 +11,14 @@
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"bcrypt": "^5.0.1",
|
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
"dotenv": "^8.2.0",
|
"dotenv": "^8.2.0",
|
||||||
"express": "^4.17.1",
|
"express": "^4.17.1",
|
||||||
"guid-typescript": "^1.0.9",
|
|
||||||
"helmet": "^4.2.0",
|
"helmet": "^4.2.0",
|
||||||
"mariadb": "^2.5.1",
|
"mariadb": "^2.5.1",
|
||||||
"typeorm": "^0.2.29"
|
"typeorm": "^0.2.29"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/bcrypt": "^3.0.1",
|
|
||||||
"@types/cors": "^2.8.8",
|
"@types/cors": "^2.8.8",
|
||||||
"@types/dotenv": "^8.2.0",
|
"@types/dotenv": "^8.2.0",
|
||||||
"@types/express": "^4.17.9",
|
"@types/express": "^4.17.9",
|
||||||
|
|
|
@ -13,7 +13,6 @@ import {pricesRouter} from './models/prices/prices.router';
|
||||||
import {vendorsRouter} from './models/vendors/vendors.router';
|
import {vendorsRouter} from './models/vendors/vendors.router';
|
||||||
import {errorHandler} from './middleware/error.middleware';
|
import {errorHandler} from './middleware/error.middleware';
|
||||||
import {notFoundHandler} from './middleware/notFound.middleware';
|
import {notFoundHandler} from './middleware/notFound.middleware';
|
||||||
import {usersRouter} from './models/users/users.router';
|
|
||||||
|
|
||||||
dotenv.config();
|
dotenv.config();
|
||||||
|
|
||||||
|
@ -42,7 +41,6 @@ app.use('/products', productsRouter);
|
||||||
app.use('/categories', categoriesRouter);
|
app.use('/categories', categoriesRouter);
|
||||||
app.use('/manufacturers', manufacturersRouter);
|
app.use('/manufacturers', manufacturersRouter);
|
||||||
app.use('/prices', pricesRouter);
|
app.use('/prices', pricesRouter);
|
||||||
app.use('/users', usersRouter);
|
|
||||||
app.use('/vendors', vendorsRouter);
|
app.use('/vendors', vendorsRouter);
|
||||||
|
|
||||||
app.use(errorHandler);
|
app.use(errorHandler);
|
||||||
|
|
|
@ -20,18 +20,19 @@ export const categoriesRouter = express.Router();
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// GET categories/
|
// GET categories/
|
||||||
|
|
||||||
categoriesRouter.get('/', async (req: Request, res: Response) => {
|
categoriesRouter.get('/', async (req: Request, res: Response) => {
|
||||||
try {
|
try {
|
||||||
const categories: Categories = await CategoryService.findAll();
|
const categories: Categories = await CategoryService.findAll();
|
||||||
|
|
||||||
res.status(200).send(categories);
|
res.status(200).send(categories);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('Error handling a request: ' + e.message);
|
res.status(404).send(e.message);
|
||||||
res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// GET categories/:id
|
// GET categories/:id
|
||||||
|
|
||||||
categoriesRouter.get('/:id', async (req: Request, res: Response) => {
|
categoriesRouter.get('/:id', async (req: Request, res: Response) => {
|
||||||
const id: number = parseInt(req.params.id, 10);
|
const id: number = parseInt(req.params.id, 10);
|
||||||
|
|
||||||
|
@ -45,12 +46,12 @@ categoriesRouter.get('/:id', async (req: Request, res: Response) => {
|
||||||
|
|
||||||
res.status(200).send(category);
|
res.status(200).send(category);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('Error handling a request: ' + e.message);
|
res.status(404).send(e.message);
|
||||||
res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// GET categories/search/:term
|
// GET categories/search/:term
|
||||||
|
|
||||||
categoriesRouter.get('/search/:term', async (req: Request, res: Response) => {
|
categoriesRouter.get('/search/:term', async (req: Request, res: Response) => {
|
||||||
const term: string = req.params.term;
|
const term: string = req.params.term;
|
||||||
|
|
||||||
|
@ -64,7 +65,48 @@ categoriesRouter.get('/search/:term', async (req: Request, res: Response) => {
|
||||||
|
|
||||||
res.status(200).send(categories);
|
res.status(200).send(categories);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('Error handling a request: ' + e.message);
|
res.status(404).send(e.message);
|
||||||
res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
// POST items/
|
||||||
|
|
||||||
|
// categoriesRouter.post('/', async (req: Request, res: Response) => {
|
||||||
|
// try {
|
||||||
|
// const category: Category = req.body.category;
|
||||||
|
//
|
||||||
|
// await CategoryService.create(category);
|
||||||
|
//
|
||||||
|
// res.sendStatus(201);
|
||||||
|
// } catch (e) {
|
||||||
|
// res.status(404).send(e.message);
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
//
|
||||||
|
// // PUT items/
|
||||||
|
//
|
||||||
|
// categoriesRouter.put('/', async (req: Request, res: Response) => {
|
||||||
|
// try {
|
||||||
|
// const category: Category = req.body.category;
|
||||||
|
//
|
||||||
|
// await CategoryService.update(category);
|
||||||
|
//
|
||||||
|
// res.sendStatus(200);
|
||||||
|
// } catch (e) {
|
||||||
|
// res.status(500).send(e.message);
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
//
|
||||||
|
// // DELETE items/:id
|
||||||
|
//
|
||||||
|
// categoriesRouter.delete('/:id', async (req: Request, res: Response) => {
|
||||||
|
// try {
|
||||||
|
// const id: number = parseInt(req.params.id, 10);
|
||||||
|
// await CategoryService.remove(id);
|
||||||
|
//
|
||||||
|
// res.sendStatus(200);
|
||||||
|
// } catch (e) {
|
||||||
|
// res.status(500).send(e.message);
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
|
|
@ -20,18 +20,19 @@ export const manufacturersRouter = express.Router();
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// GET items/
|
// GET items/
|
||||||
|
|
||||||
manufacturersRouter.get('/', async (req: Request, res: Response) => {
|
manufacturersRouter.get('/', async (req: Request, res: Response) => {
|
||||||
try {
|
try {
|
||||||
const manufacturers: Manufacturers = await ManufacturerService.findAll();
|
const manufacturers: Manufacturers = await ManufacturerService.findAll();
|
||||||
|
|
||||||
res.status(200).send(manufacturers);
|
res.status(200).send(manufacturers);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('Error handling a request: ' + e.message);
|
res.status(404).send(e.message);
|
||||||
res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// GET items/:id
|
// GET items/:id
|
||||||
|
|
||||||
manufacturersRouter.get('/:id', async (req: Request, res: Response) => {
|
manufacturersRouter.get('/:id', async (req: Request, res: Response) => {
|
||||||
const id: number = parseInt(req.params.id, 10);
|
const id: number = parseInt(req.params.id, 10);
|
||||||
|
|
||||||
|
@ -45,12 +46,12 @@ manufacturersRouter.get('/:id', async (req: Request, res: Response) => {
|
||||||
|
|
||||||
res.status(200).send(manufacturer);
|
res.status(200).send(manufacturer);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('Error handling a request: ' + e.message);
|
res.status(404).send(e.message);
|
||||||
res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// GET items/:name
|
// GET items/:name
|
||||||
|
|
||||||
manufacturersRouter.get('/search/:term', async (req: Request, res: Response) => {
|
manufacturersRouter.get('/search/:term', async (req: Request, res: Response) => {
|
||||||
const term: string = req.params.term;
|
const term: string = req.params.term;
|
||||||
|
|
||||||
|
@ -64,7 +65,48 @@ manufacturersRouter.get('/search/:term', async (req: Request, res: Response) =>
|
||||||
|
|
||||||
res.status(200).send(manufacturer);
|
res.status(200).send(manufacturer);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('Error handling a request: ' + e.message);
|
res.status(404).send(e.message);
|
||||||
res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
// POST items/
|
||||||
|
|
||||||
|
// manufacturersRouter.post('/', async (req: Request, res: Response) => {
|
||||||
|
// try {
|
||||||
|
// const category: Category = req.body.category;
|
||||||
|
//
|
||||||
|
// await CategoryService.create(category);
|
||||||
|
//
|
||||||
|
// res.sendStatus(201);
|
||||||
|
// } catch (e) {
|
||||||
|
// res.status(404).send(e.message);
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
//
|
||||||
|
// // PUT items/
|
||||||
|
//
|
||||||
|
// manufacturersRouter.put('/', async (req: Request, res: Response) => {
|
||||||
|
// try {
|
||||||
|
// const category: Category = req.body.category;
|
||||||
|
//
|
||||||
|
// await CategoryService.update(category);
|
||||||
|
//
|
||||||
|
// res.sendStatus(200);
|
||||||
|
// } catch (e) {
|
||||||
|
// res.status(500).send(e.message);
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
//
|
||||||
|
// // DELETE items/:id
|
||||||
|
//
|
||||||
|
// manufacturersRouter.delete('/:id', async (req: Request, res: Response) => {
|
||||||
|
// try {
|
||||||
|
// const id: number = parseInt(req.params.id, 10);
|
||||||
|
// await CategoryService.remove(id);
|
||||||
|
//
|
||||||
|
// res.sendStatus(200);
|
||||||
|
// } catch (e) {
|
||||||
|
// res.status(500).send(e.message);
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
|
|
@ -20,6 +20,7 @@ export const pricesRouter = express.Router();
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// GET prices/
|
// GET prices/
|
||||||
|
|
||||||
pricesRouter.get('/', async (req: Request, res: Response) => {
|
pricesRouter.get('/', async (req: Request, res: Response) => {
|
||||||
try {
|
try {
|
||||||
let prices: Prices = [];
|
let prices: Prices = [];
|
||||||
|
@ -39,12 +40,12 @@ pricesRouter.get('/', async (req: Request, res: Response) => {
|
||||||
|
|
||||||
res.status(200).send(prices);
|
res.status(200).send(prices);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('Error handling a request: ' + e.message);
|
res.status(404).send(e.message);
|
||||||
res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// GET prices/:id
|
// GET prices/:id
|
||||||
|
|
||||||
pricesRouter.get('/:id', async (req: Request, res: Response) => {
|
pricesRouter.get('/:id', async (req: Request, res: Response) => {
|
||||||
const id: number = parseInt(req.params.id, 10);
|
const id: number = parseInt(req.params.id, 10);
|
||||||
|
|
||||||
|
@ -58,12 +59,12 @@ pricesRouter.get('/:id', async (req: Request, res: Response) => {
|
||||||
|
|
||||||
res.status(200).send(price);
|
res.status(200).send(price);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('Error handling a request: ' + e.message);
|
res.status(404).send(e.message);
|
||||||
res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// GET prices/bestDeals
|
// GET prices/bestDeals
|
||||||
|
|
||||||
pricesRouter.get('/bestDeals/:amount', async (req: Request, res: Response) => {
|
pricesRouter.get('/bestDeals/:amount', async (req: Request, res: Response) => {
|
||||||
const amount: number = parseInt(req.params.amount, 10);
|
const amount: number = parseInt(req.params.amount, 10);
|
||||||
|
|
||||||
|
@ -77,26 +78,47 @@ pricesRouter.get('/bestDeals/:amount', async (req: Request, res: Response) => {
|
||||||
|
|
||||||
res.status(200).send(prices);
|
res.status(200).send(prices);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('Error handling a request: ' + e.message);
|
res.status(404).send(e.message);
|
||||||
res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// GET prices/byProduct/list/[]
|
// POST items/
|
||||||
pricesRouter.get('/byProduct/list/:ids', async (req: Request, res: Response) => {
|
|
||||||
const productIds: [number] = JSON.parse(req.params.ids);
|
|
||||||
|
|
||||||
if (!productIds) {
|
// pricesRouter.post('/', async (req: Request, res: Response) => {
|
||||||
res.status(400).send('Missing parameters.');
|
// try {
|
||||||
return;
|
// const category: Category = req.body.category;
|
||||||
}
|
//
|
||||||
|
// await CategoryService.create(category);
|
||||||
try {
|
//
|
||||||
const prices: Prices = await PriceService.findListByProducts(productIds);
|
// res.sendStatus(201);
|
||||||
|
// } catch (e) {
|
||||||
res.status(200).send(prices);
|
// res.status(404).send(e.message);
|
||||||
} catch (e) {
|
// }
|
||||||
console.log('Error handling a request: ' + e.message);
|
// });
|
||||||
res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
|
//
|
||||||
}
|
// // PUT items/
|
||||||
});
|
//
|
||||||
|
// pricesRouter.put('/', async (req: Request, res: Response) => {
|
||||||
|
// try {
|
||||||
|
// const category: Category = req.body.category;
|
||||||
|
//
|
||||||
|
// await CategoryService.update(category);
|
||||||
|
//
|
||||||
|
// res.sendStatus(200);
|
||||||
|
// } catch (e) {
|
||||||
|
// res.status(500).send(e.message);
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
//
|
||||||
|
// // DELETE items/:id
|
||||||
|
//
|
||||||
|
// pricesRouter.delete('/:id', async (req: Request, res: Response) => {
|
||||||
|
// try {
|
||||||
|
// const id: number = parseInt(req.params.id, 10);
|
||||||
|
// await CategoryService.remove(id);
|
||||||
|
//
|
||||||
|
// res.sendStatus(200);
|
||||||
|
// } catch (e) {
|
||||||
|
// res.status(500).send(e.message);
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
|
|
@ -195,6 +195,7 @@ export const getBestDeals = async (amount: number): Promise<Prices> => {
|
||||||
let allPrices: Record<number, Price[]> = {};
|
let allPrices: Record<number, Price[]> = {};
|
||||||
|
|
||||||
// Get newest prices for every product at every vendor
|
// Get newest prices for every product at every vendor
|
||||||
|
|
||||||
const rows = await conn.query(
|
const rows = await conn.query(
|
||||||
'WITH summary AS (\n' +
|
'WITH summary AS (\n' +
|
||||||
' SELECT p.product_id,\n' +
|
' SELECT p.product_id,\n' +
|
||||||
|
@ -221,11 +222,10 @@ export const getBestDeals = async (amount: number): Promise<Prices> => {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Iterate over all prices to find the products with the biggest difference between amazon and other vendor
|
// Iterate over all prices to find the products with the biggest difference between amazon and other vendor
|
||||||
let deals: Price[] = [];
|
let deals = [];
|
||||||
|
for (let productId in Object.keys(allPrices)) {
|
||||||
Object.keys(allPrices).forEach(productId => {
|
if (allPrices[productId]) {
|
||||||
if (allPrices[parseInt(productId)]) {
|
let pricesForProd = allPrices[productId];
|
||||||
let pricesForProd = allPrices[parseInt(productId)];
|
|
||||||
|
|
||||||
// Get amazon price and lowest price from other vendor
|
// Get amazon price and lowest price from other vendor
|
||||||
let amazonPrice = {} as Price;
|
let amazonPrice = {} as Price;
|
||||||
|
@ -234,7 +234,6 @@ export const getBestDeals = async (amount: number): Promise<Prices> => {
|
||||||
if (price.vendor_id === 1) {
|
if (price.vendor_id === 1) {
|
||||||
amazonPrice = price;
|
amazonPrice = price;
|
||||||
} else {
|
} else {
|
||||||
// If there is no lowest price yet or the price of the current iteration is lower, set / replace it
|
|
||||||
if (!lowestPrice.price_in_cents || lowestPrice.price_in_cents > price.price_in_cents) {
|
if (!lowestPrice.price_in_cents || lowestPrice.price_in_cents > price.price_in_cents) {
|
||||||
lowestPrice = price;
|
lowestPrice = price;
|
||||||
}
|
}
|
||||||
|
@ -246,25 +245,25 @@ export const getBestDeals = async (amount: number): Promise<Prices> => {
|
||||||
'product_id': lowestPrice.product_id,
|
'product_id': lowestPrice.product_id,
|
||||||
'vendor_id': lowestPrice.vendor_id,
|
'vendor_id': lowestPrice.vendor_id,
|
||||||
'price_in_cents': lowestPrice.price_in_cents,
|
'price_in_cents': lowestPrice.price_in_cents,
|
||||||
'timestamp': lowestPrice.timestamp,
|
'timestamp' :lowestPrice.timestamp,
|
||||||
'amazonDifference': (amazonPrice.price_in_cents - lowestPrice.price_in_cents),
|
'amazonDifference': (amazonPrice.price_in_cents - lowestPrice.price_in_cents),
|
||||||
'amazonDifferencePercent': ((1 - (lowestPrice.price_in_cents / amazonPrice.price_in_cents)) * 100),
|
'amazonDifferencePercent': ((1 - (lowestPrice.price_in_cents / amazonPrice.price_in_cents)) * 100),
|
||||||
};
|
};
|
||||||
|
|
||||||
// Push only deals were the amazon price is actually higher
|
// Push only deals were the amazon price is actually higher
|
||||||
if (deal.amazonDifferencePercent > 0) {
|
if(deal.amazonDifferencePercent > 0) {
|
||||||
deals.push(deal as Price);
|
deals.push(deal);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
|
|
||||||
// Sort to have the best deals on the top
|
// Sort to have the best deals on the top
|
||||||
deals.sort((a, b) => a.amazonDifferencePercent! < b.amazonDifferencePercent! ? 1 : -1);
|
deals.sort((a, b) => a.amazonDifferencePercent < b.amazonDifferencePercent ? 1 : -1);
|
||||||
|
|
||||||
// Return only as many records as requested or the maximum amount of found deals, whatever is less
|
// Return only as many records as requested or the maximum amount of found deals, whatever is less
|
||||||
let maxAmt = Math.min(amount, deals.length);
|
let maxAmt = Math.min(amount, deals.length);
|
||||||
|
|
||||||
for (let dealIndex = 0; dealIndex < maxAmt; dealIndex++) {
|
for (let dealIndex = 0; dealIndex < maxAmt; dealIndex++){
|
||||||
//console.log(deals[dealIndex]);
|
//console.log(deals[dealIndex]);
|
||||||
priceRows.push(deals[dealIndex] as Price);
|
priceRows.push(deals[dealIndex] as Price);
|
||||||
}
|
}
|
||||||
|
@ -281,70 +280,6 @@ export const getBestDeals = async (amount: number): Promise<Prices> => {
|
||||||
return priceRows;
|
return priceRows;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* 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> => {
|
|
||||||
let conn;
|
|
||||||
let priceRows: Price[] = [];
|
|
||||||
try {
|
|
||||||
conn = await pool.getConnection();
|
|
||||||
|
|
||||||
let allPrices: Record<number, Price[]> = {};
|
|
||||||
|
|
||||||
// Get newest prices for every given product at every vendor
|
|
||||||
const rows = await conn.query(
|
|
||||||
'WITH summary AS (\n' +
|
|
||||||
' SELECT p.product_id,\n' +
|
|
||||||
' p.vendor_id,\n' +
|
|
||||||
' p.price_in_cents,\n' +
|
|
||||||
' p.timestamp,\n' +
|
|
||||||
' 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 p.product_id IN (?)' +
|
|
||||||
' AND p.vendor_id != 1)\n' +
|
|
||||||
'SELECT s.*\n' +
|
|
||||||
'FROM summary s\n' +
|
|
||||||
'WHERE s.rk = 1', [productIds]);
|
|
||||||
|
|
||||||
// Write returned values to allPrices map with product id as key and a list of prices as value
|
|
||||||
for (let row in rows) {
|
|
||||||
if (row !== 'meta') {
|
|
||||||
if (!allPrices[parseInt(rows[row].product_id)]) {
|
|
||||||
allPrices[parseInt(rows[row].product_id)] = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
allPrices[parseInt(rows[row].product_id)].push(rows[row]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Iterate over all products to find lowest price
|
|
||||||
Object.keys(allPrices).forEach(productId => {
|
|
||||||
if (allPrices[parseInt(productId)]) {
|
|
||||||
let pricesForProd = allPrices[parseInt(productId)];
|
|
||||||
|
|
||||||
// Sort ascending by price so index 0 has the lowest price
|
|
||||||
pricesForProd.sort((a, b) => a.price_in_cents > b.price_in_cents ? 1 : -1);
|
|
||||||
|
|
||||||
// Push the lowest price to the return list
|
|
||||||
priceRows.push(pricesForProd[0]);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
} catch (err) {
|
|
||||||
throw err;
|
|
||||||
} finally {
|
|
||||||
if (conn) {
|
|
||||||
conn.end();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return priceRows;
|
|
||||||
};
|
|
||||||
|
|
||||||
// export const create = async (newItem: Product): Promise<void> => {
|
// export const create = async (newItem: Product): Promise<void> => {
|
||||||
// let conn;
|
// let conn;
|
||||||
// try {
|
// try {
|
||||||
|
|
|
@ -20,18 +20,19 @@ export const productsRouter = express.Router();
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// GET products/
|
// GET products/
|
||||||
|
|
||||||
productsRouter.get('/', async (req: Request, res: Response) => {
|
productsRouter.get('/', async (req: Request, res: Response) => {
|
||||||
try {
|
try {
|
||||||
const products: Products = await ProductService.findAll();
|
const products: Products = await ProductService.findAll();
|
||||||
|
|
||||||
res.status(200).send(products);
|
res.status(200).send(products);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('Error handling a request: ' + e.message);
|
res.status(404).send(e.message);
|
||||||
res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// GET products/:id
|
// GET products/:id
|
||||||
|
|
||||||
productsRouter.get('/:id', async (req: Request, res: Response) => {
|
productsRouter.get('/:id', async (req: Request, res: Response) => {
|
||||||
const id: number = parseInt(req.params.id, 10);
|
const id: number = parseInt(req.params.id, 10);
|
||||||
|
|
||||||
|
@ -45,12 +46,12 @@ productsRouter.get('/:id', async (req: Request, res: Response) => {
|
||||||
|
|
||||||
res.status(200).send(product);
|
res.status(200).send(product);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('Error handling a request: ' + e.message);
|
res.status(404).send(e.message);
|
||||||
res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// GET products/search/:term
|
// GET products/search/:term
|
||||||
|
|
||||||
productsRouter.get('/search/:term', async (req: Request, res: Response) => {
|
productsRouter.get('/search/:term', async (req: Request, res: Response) => {
|
||||||
const term: string = req.params.term;
|
const term: string = req.params.term;
|
||||||
|
|
||||||
|
@ -64,12 +65,12 @@ productsRouter.get('/search/:term', async (req: Request, res: Response) => {
|
||||||
|
|
||||||
res.status(200).send(products);
|
res.status(200).send(products);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('Error handling a request: ' + e.message);
|
res.status(404).send(e.message);
|
||||||
res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// GET products/list/[1,2,3]
|
// GET products/list/[1,2,3]
|
||||||
|
|
||||||
productsRouter.get('/list/:ids', async (req: Request, res: Response) => {
|
productsRouter.get('/list/:ids', async (req: Request, res: Response) => {
|
||||||
const ids: [number] = JSON.parse(req.params.ids);
|
const ids: [number] = JSON.parse(req.params.ids);
|
||||||
|
|
||||||
|
@ -83,7 +84,50 @@ productsRouter.get('/list/:ids', async (req: Request, res: Response) => {
|
||||||
|
|
||||||
res.status(200).send(products);
|
res.status(200).send(products);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('Error handling a request: ' + e.message);
|
res.status(404).send(e.message);
|
||||||
res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// GET products/bestDeals
|
||||||
|
|
||||||
|
|
||||||
|
// POST items/
|
||||||
|
|
||||||
|
// productsRouter.post('/', async (req: Request, res: Response) => {
|
||||||
|
// try {
|
||||||
|
// const product: Product = req.body.product;
|
||||||
|
//
|
||||||
|
// await ProductService.create(product);
|
||||||
|
//
|
||||||
|
// res.sendStatus(201);
|
||||||
|
// } catch (e) {
|
||||||
|
// res.status(404).send(e.message);
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
//
|
||||||
|
// // PUT items/
|
||||||
|
//
|
||||||
|
// productsRouter.put('/', async (req: Request, res: Response) => {
|
||||||
|
// try {
|
||||||
|
// const product: Product = req.body.product;
|
||||||
|
//
|
||||||
|
// await ProductService.update(product);
|
||||||
|
//
|
||||||
|
// res.sendStatus(200);
|
||||||
|
// } catch (e) {
|
||||||
|
// res.status(500).send(e.message);
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
//
|
||||||
|
// // DELETE items/:id
|
||||||
|
//
|
||||||
|
// productsRouter.delete('/:id', async (req: Request, res: Response) => {
|
||||||
|
// try {
|
||||||
|
// const id: number = parseInt(req.params.id, 10);
|
||||||
|
// await ProductService.remove(id);
|
||||||
|
//
|
||||||
|
// res.sendStatus(200);
|
||||||
|
// } catch (e) {
|
||||||
|
// res.status(500).send(e.message);
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
export interface Session {
|
|
||||||
session_id: number;
|
|
||||||
session_key: string;
|
|
||||||
session_key_hash: string;
|
|
||||||
createdDate?: Date;
|
|
||||||
lastLogin?: Date;
|
|
||||||
validUntil?: Date;
|
|
||||||
validDays?: number;
|
|
||||||
last_IP: string;
|
|
||||||
}
|
|
|
@ -1,8 +0,0 @@
|
||||||
export interface User {
|
|
||||||
user_id: number;
|
|
||||||
username: string;
|
|
||||||
email: string;
|
|
||||||
password_hash: string;
|
|
||||||
registration_date: Date;
|
|
||||||
last_login_date: Date;
|
|
||||||
}
|
|
|
@ -1,5 +0,0 @@
|
||||||
import {User} from './user.interface';
|
|
||||||
|
|
||||||
export interface Users {
|
|
||||||
[key: number]: User;
|
|
||||||
}
|
|
|
@ -1,115 +0,0 @@
|
||||||
/**
|
|
||||||
* Required External Modules and Interfaces
|
|
||||||
*/
|
|
||||||
|
|
||||||
import express, {Request, Response} from 'express';
|
|
||||||
import * as UserService from './users.service';
|
|
||||||
import {User} from './user.interface';
|
|
||||||
import {Users} from './users.interface';
|
|
||||||
import {Session} from './session.interface';
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Router Definition
|
|
||||||
*/
|
|
||||||
|
|
||||||
export const usersRouter = express.Router();
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Controller Definitions
|
|
||||||
*/
|
|
||||||
|
|
||||||
// POST users/register
|
|
||||||
usersRouter.post('/register', async (req: Request, res: Response) => {
|
|
||||||
try {
|
|
||||||
const username: string = req.body.username;
|
|
||||||
const password: string = req.body.password;
|
|
||||||
const email: string = req.body.email;
|
|
||||||
const ip: string = req.connection.remoteAddress ?? '';
|
|
||||||
|
|
||||||
if (!username || !password || !email) {
|
|
||||||
// Missing
|
|
||||||
res.status(400).send(JSON.stringify({message: 'Missing parameters'}));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if username and / or email are already used
|
|
||||||
const status = await UserService.checkUsernameAndEmail(username, email);
|
|
||||||
|
|
||||||
if (status.hasProblems) {
|
|
||||||
// Username and/or email are duplicates, return error
|
|
||||||
res.status(400).send(JSON.stringify({messages: status.messages, codes: status.codes}));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create the user and a session
|
|
||||||
const session: Session = await UserService.createUser(username, password, email, ip);
|
|
||||||
|
|
||||||
// Send the session details back to the user
|
|
||||||
res.status(201).send(session);
|
|
||||||
} catch (e) {
|
|
||||||
console.log('Error handling a request: ' + e.message);
|
|
||||||
res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// POST users/login
|
|
||||||
usersRouter.post('/login', async (req: Request, res: Response) => {
|
|
||||||
try {
|
|
||||||
const username: string = req.body.username;
|
|
||||||
const password: string = req.body.password;
|
|
||||||
const ip: string = req.connection.remoteAddress ?? '';
|
|
||||||
|
|
||||||
if (!username || !password) {
|
|
||||||
// Missing
|
|
||||||
res.status(400).send(JSON.stringify({message: 'Missing parameters'}));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update the user entry and create a session
|
|
||||||
const session: Session = await UserService.login(username, password, ip);
|
|
||||||
|
|
||||||
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]}));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send the session details back to the user
|
|
||||||
res.status(201).send(session);
|
|
||||||
} catch (e) {
|
|
||||||
console.log('Error handling a request: ' + e.message);
|
|
||||||
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 ?? '';
|
|
||||||
|
|
||||||
if (!sessionId || !sessionKey) {
|
|
||||||
// Missing
|
|
||||||
res.status(400).send(JSON.stringify({message: 'Missing parameters'}));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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]}));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send the session details back to the user
|
|
||||||
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."}));
|
|
||||||
}
|
|
||||||
});
|
|
|
@ -1,303 +0,0 @@
|
||||||
import * as dotenv from 'dotenv';
|
|
||||||
import * as bcrypt from 'bcrypt';
|
|
||||||
import {Guid} from 'guid-typescript';
|
|
||||||
|
|
||||||
|
|
||||||
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 {User} from './user.interface';
|
|
||||||
import {Users} from './users.interface';
|
|
||||||
import {Session} from './session.interface';
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Service Methods
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a user record in the database, also creates a session. Returns the session if successful.
|
|
||||||
*/
|
|
||||||
export const createUser = async (username: string, password: string, email: string, ip: string): Promise<Session> => {
|
|
||||||
let conn;
|
|
||||||
try {
|
|
||||||
// Hash password and generate + hash session key
|
|
||||||
const pwHash = bcrypt.hashSync(password, 10);
|
|
||||||
const sessionKey = Guid.create().toString();
|
|
||||||
const sessionKeyHash = bcrypt.hashSync(sessionKey, 10);
|
|
||||||
|
|
||||||
// Create user entry in SQL
|
|
||||||
conn = await pool.getConnection();
|
|
||||||
const userQuery = 'INSERT INTO users (username, email, bcrypt_password_hash) VALUES (?, ?, ?) RETURNING user_id';
|
|
||||||
const userIdRes = await conn.query(userQuery, [username, email, pwHash]);
|
|
||||||
await conn.commit();
|
|
||||||
|
|
||||||
// Get user id of the created user
|
|
||||||
let userId: number = -1;
|
|
||||||
for (const row in userIdRes) {
|
|
||||||
if (row !== 'meta' && userIdRes[row].user_id != null) {
|
|
||||||
userId = userIdRes[row].user_id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create session
|
|
||||||
const sessionQuery = 'INSERT INTO sessions (user_id, session_key_hash, createdDate, lastLogin, validUntil, validDays, last_IP) VALUES (?,?,NOW(),NOW(),DATE_ADD(NOW(), INTERVAL 30 DAY),30,?) RETURNING session_id';
|
|
||||||
const sessionIdRes = await conn.query(sessionQuery, [userId, sessionKeyHash, ip]);
|
|
||||||
await conn.commit();
|
|
||||||
|
|
||||||
// Get session id of the created session
|
|
||||||
let sessionId: number = -1;
|
|
||||||
for (const row in sessionIdRes) {
|
|
||||||
if (row !== 'meta' && sessionIdRes[row].session_id != null) {
|
|
||||||
sessionId = sessionIdRes[row].session_id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
session_id: sessionId,
|
|
||||||
session_key: sessionKey,
|
|
||||||
session_key_hash: '',
|
|
||||||
last_IP: ip
|
|
||||||
};
|
|
||||||
|
|
||||||
} catch (err) {
|
|
||||||
throw err;
|
|
||||||
} finally {
|
|
||||||
if (conn) {
|
|
||||||
conn.end();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return {} as Session;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if the given credentials are valid and creates a new session if they are.
|
|
||||||
* Returns the session information in case of a successful login
|
|
||||||
*/
|
|
||||||
export const login = async (username: string, password: string, ip: string): Promise<Session> => {
|
|
||||||
let conn;
|
|
||||||
try {
|
|
||||||
// Get saved password hash
|
|
||||||
conn = await pool.getConnection();
|
|
||||||
const query = 'SELECT user_id, bcrypt_password_hash FROM users WHERE username = ?';
|
|
||||||
const userRows = await conn.query(query, username);
|
|
||||||
let savedHash = '';
|
|
||||||
let userId = -1;
|
|
||||||
for (const row in userRows) {
|
|
||||||
if (row !== 'meta' && userRows[row].user_id != null) {
|
|
||||||
savedHash = userRows[row].bcrypt_password_hash;
|
|
||||||
userId = userRows[row].user_id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for correct password
|
|
||||||
if (!bcrypt.compareSync(password, savedHash)) {
|
|
||||||
// Wrong password, return invalid
|
|
||||||
return {} as Session;
|
|
||||||
}
|
|
||||||
// Password is valid, continue
|
|
||||||
|
|
||||||
// Generate + hash session key
|
|
||||||
const sessionKey = Guid.create().toString();
|
|
||||||
const sessionKeyHash = bcrypt.hashSync(sessionKey, 10);
|
|
||||||
|
|
||||||
// Update user entry in SQL
|
|
||||||
const userQuery = 'UPDATE users SET last_login_date = NOW()';
|
|
||||||
const userIdRes = await conn.query(userQuery);
|
|
||||||
await conn.commit();
|
|
||||||
|
|
||||||
// Create session
|
|
||||||
const sessionQuery = 'INSERT INTO sessions (user_id, session_key_hash, createdDate, lastLogin, validUntil, validDays, last_IP) VALUES (?,?,NOW(),NOW(),DATE_ADD(NOW(), INTERVAL 30 DAY),30,?) RETURNING session_id';
|
|
||||||
const sessionIdRes = await conn.query(sessionQuery, [userId, sessionKeyHash, ip]);
|
|
||||||
await conn.commit();
|
|
||||||
|
|
||||||
// Get session id of the created session
|
|
||||||
let sessionId: number = -1;
|
|
||||||
for (const row in sessionIdRes) {
|
|
||||||
if (row !== 'meta' && sessionIdRes[row].session_id != null) {
|
|
||||||
sessionId = sessionIdRes[row].session_id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
session_id: sessionId,
|
|
||||||
session_key: sessionKey,
|
|
||||||
session_key_hash: '',
|
|
||||||
last_IP: ip
|
|
||||||
};
|
|
||||||
|
|
||||||
} catch (err) {
|
|
||||||
throw err;
|
|
||||||
} finally {
|
|
||||||
if (conn) {
|
|
||||||
conn.end();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return {} as Session;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if the given session information are valid and returns the user information if they are
|
|
||||||
*/
|
|
||||||
export const checkSession = async (sessionId: string, sessionKey: string, ip: string): Promise<User> => {
|
|
||||||
let conn;
|
|
||||||
try {
|
|
||||||
// Get saved session key hash
|
|
||||||
conn = await pool.getConnection();
|
|
||||||
const query = 'SELECT user_id, session_key_hash, validUntil FROM sessions WHERE session_id = ?';
|
|
||||||
const sessionRows = await conn.query(query, sessionId);
|
|
||||||
let savedHash = '';
|
|
||||||
let userId = -1;
|
|
||||||
let validUntil = new Date();
|
|
||||||
for (const row in sessionRows) {
|
|
||||||
if (row !== 'meta' && sessionRows[row].user_id != null) {
|
|
||||||
savedHash = sessionRows[row].session_key_hash;
|
|
||||||
userId = sessionRows[row].user_id;
|
|
||||||
validUntil = sessionRows[row].validUntil;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for correct key
|
|
||||||
if (!bcrypt.compareSync(sessionKey, savedHash)) {
|
|
||||||
// Wrong key, return invalid
|
|
||||||
return {} as User;
|
|
||||||
}
|
|
||||||
// Key is valid, continue
|
|
||||||
|
|
||||||
// Check if the session is still valid
|
|
||||||
if(validUntil <= new Date()) {
|
|
||||||
// Session expired, return invalid
|
|
||||||
return {} as User;
|
|
||||||
}
|
|
||||||
// Session still valid, continue
|
|
||||||
|
|
||||||
// Update session entry in SQL
|
|
||||||
const updateSessionsQuery = 'UPDATE sessions SET lastLogin = NOW(), last_IP = ? WHERE session_id = ?';
|
|
||||||
const updateUsersQuery = 'UPDATE users SET last_login_date = NOW() WHERE user_id = ?';
|
|
||||||
const userIdRes = await conn.query(updateSessionsQuery, [ip, sessionId]);
|
|
||||||
await conn.query(updateUsersQuery, userId);
|
|
||||||
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 userRows = await conn.query(userQuery, userId);
|
|
||||||
let username = '';
|
|
||||||
let email = '';
|
|
||||||
let registrationDate = new Date();
|
|
||||||
let lastLoginDate = new Date();
|
|
||||||
for (const row in userRows) {
|
|
||||||
if (row !== 'meta' && userRows[row].user_id != null) {
|
|
||||||
username = userRows[row].username;
|
|
||||||
email = userRows[row].email;
|
|
||||||
registrationDate = userRows[row].registration_date;
|
|
||||||
lastLoginDate = userRows[row].last_login_date;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Everything is fine, return user information
|
|
||||||
return {
|
|
||||||
user_id: userId,
|
|
||||||
username: username,
|
|
||||||
email: email,
|
|
||||||
password_hash: '',
|
|
||||||
registration_date: registrationDate,
|
|
||||||
last_login_date: lastLoginDate
|
|
||||||
};
|
|
||||||
|
|
||||||
} catch (err) {
|
|
||||||
throw err;
|
|
||||||
} finally {
|
|
||||||
if (conn) {
|
|
||||||
conn.end();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return {} as User;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Used in the checkUsernameAndEmail method as return value
|
|
||||||
*/
|
|
||||||
export interface Status {
|
|
||||||
hasProblems: boolean;
|
|
||||||
messages: string[];
|
|
||||||
codes: number[]; // 0 = all good, 1 = wrong username, 2 = wrong email, 3 = server error, 4 = wrong password, 5 = wrong session
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if the given username and email are not used yet by another user
|
|
||||||
* @param username The username to check
|
|
||||||
* @param email The email to check
|
|
||||||
*/
|
|
||||||
export const checkUsernameAndEmail = async (username: string, email: string): Promise<Status> => {
|
|
||||||
let conn;
|
|
||||||
try {
|
|
||||||
// Create user entry in SQL
|
|
||||||
conn = await pool.getConnection();
|
|
||||||
const usernameQuery = 'SELECT username FROM users WHERE username = ?';
|
|
||||||
const emailQuery = 'SELECT email FROM users WHERE email = ?';
|
|
||||||
const usernameRes = await conn.query(usernameQuery, username);
|
|
||||||
const emailRes = await conn.query(emailQuery, email);
|
|
||||||
|
|
||||||
let res: Status = {
|
|
||||||
hasProblems: false,
|
|
||||||
messages: [],
|
|
||||||
codes: []
|
|
||||||
};
|
|
||||||
|
|
||||||
const usernameRegex = RegExp('^[a-zA-Z0-9\\-\\_]{4,20}$'); // Can contain a-z, A-Z, 0-9, -, _ and has to be 4-20 chars long
|
|
||||||
if (!usernameRegex.test(username)) {
|
|
||||||
// Username doesn't match requirements
|
|
||||||
res.hasProblems = true;
|
|
||||||
res.messages.push('Invalid username');
|
|
||||||
res.codes.push(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
const emailRegex = RegExp('^[a-zA-Z0-9\\-\\_.]{1,30}\\@[a-zA-Z0-9\\-.]{1,20}\\.[a-z]{1,20}$'); // Normal email regex, user@betterzon.xyz
|
|
||||||
if (!emailRegex.test(email)) {
|
|
||||||
// Username doesn't match requirements
|
|
||||||
res.hasProblems = true;
|
|
||||||
res.messages.push('Invalid email');
|
|
||||||
res.codes.push(2);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (usernameRes.length > 0) {
|
|
||||||
// Username is a duplicate
|
|
||||||
res.hasProblems = true;
|
|
||||||
res.messages.push('Duplicate username');
|
|
||||||
res.codes.push(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (emailRes.length > 0) {
|
|
||||||
// Email is a duplicate
|
|
||||||
res.hasProblems = true;
|
|
||||||
res.messages.push('Duplicate email');
|
|
||||||
res.codes.push(2);
|
|
||||||
}
|
|
||||||
|
|
||||||
return res;
|
|
||||||
|
|
||||||
} catch (err) {
|
|
||||||
throw err;
|
|
||||||
} finally {
|
|
||||||
if (conn) {
|
|
||||||
conn.end();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return {hasProblems: true, messages: ['Internal server error'], codes: [3]};
|
|
||||||
};
|
|
54
Backend/src/models/vendors/vendors.router.ts
vendored
54
Backend/src/models/vendors/vendors.router.ts
vendored
|
@ -20,18 +20,19 @@ export const vendorsRouter = express.Router();
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// GET items/
|
// GET items/
|
||||||
|
|
||||||
vendorsRouter.get('/', async (req: Request, res: Response) => {
|
vendorsRouter.get('/', async (req: Request, res: Response) => {
|
||||||
try {
|
try {
|
||||||
const vendors: Vendors = await VendorService.findAll();
|
const vendors: Vendors = await VendorService.findAll();
|
||||||
|
|
||||||
res.status(200).send(vendors);
|
res.status(200).send(vendors);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('Error handling a request: ' + e.message);
|
res.status(404).send(e.message);
|
||||||
res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// GET items/:id
|
// GET items/:id
|
||||||
|
|
||||||
vendorsRouter.get('/:id', async (req: Request, res: Response) => {
|
vendorsRouter.get('/:id', async (req: Request, res: Response) => {
|
||||||
const id: number = parseInt(req.params.id, 10);
|
const id: number = parseInt(req.params.id, 10);
|
||||||
|
|
||||||
|
@ -45,12 +46,12 @@ vendorsRouter.get('/:id', async (req: Request, res: Response) => {
|
||||||
|
|
||||||
res.status(200).send(vendor);
|
res.status(200).send(vendor);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('Error handling a request: ' + e.message);
|
res.status(404).send(e.message);
|
||||||
res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// GET items/:name
|
// GET items/:name
|
||||||
|
|
||||||
vendorsRouter.get('/search/:term', async (req: Request, res: Response) => {
|
vendorsRouter.get('/search/:term', async (req: Request, res: Response) => {
|
||||||
const term: string = req.params.term;
|
const term: string = req.params.term;
|
||||||
|
|
||||||
|
@ -64,7 +65,48 @@ vendorsRouter.get('/search/:term', async (req: Request, res: Response) => {
|
||||||
|
|
||||||
res.status(200).send(vendors);
|
res.status(200).send(vendors);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('Error handling a request: ' + e.message);
|
res.status(404).send(e.message);
|
||||||
res.status(500).send(JSON.stringify({"message": "Internal Server Error. Try again later."}));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
// POST items/
|
||||||
|
|
||||||
|
// vendorsRouter.post('/', async (req: Request, res: Response) => {
|
||||||
|
// try {
|
||||||
|
// const category: Category = req.body.category;
|
||||||
|
//
|
||||||
|
// await CategoryService.create(category);
|
||||||
|
//
|
||||||
|
// res.sendStatus(201);
|
||||||
|
// } catch (e) {
|
||||||
|
// res.status(404).send(e.message);
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
//
|
||||||
|
// // PUT items/
|
||||||
|
//
|
||||||
|
// vendorsRouter.put('/', async (req: Request, res: Response) => {
|
||||||
|
// try {
|
||||||
|
// const category: Category = req.body.category;
|
||||||
|
//
|
||||||
|
// await CategoryService.update(category);
|
||||||
|
//
|
||||||
|
// res.sendStatus(200);
|
||||||
|
// } catch (e) {
|
||||||
|
// res.status(500).send(e.message);
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
//
|
||||||
|
// // DELETE items/:id
|
||||||
|
//
|
||||||
|
// vendorsRouter.delete('/:id', async (req: Request, res: Response) => {
|
||||||
|
// try {
|
||||||
|
// const id: number = parseInt(req.params.id, 10);
|
||||||
|
// await CategoryService.remove(id);
|
||||||
|
//
|
||||||
|
// res.sendStatus(200);
|
||||||
|
// } catch (e) {
|
||||||
|
// res.status(500).send(e.message);
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
|
66
Crawler/crawler/spiders/amazon.py
Normal file
66
Crawler/crawler/spiders/amazon.py
Normal file
|
@ -0,0 +1,66 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
import scrapy
|
||||||
|
from urllib.parse import urlencode
|
||||||
|
from urllib.parse import urljoin
|
||||||
|
import re
|
||||||
|
import json
|
||||||
|
|
||||||
|
queries = ['iphone']
|
||||||
|
API = ''
|
||||||
|
|
||||||
|
|
||||||
|
def get_url(url):
|
||||||
|
payload = {'api_key': API, 'url': url, 'country_code': 'us'}
|
||||||
|
proxy_url = 'http://api.scraperapi.com/?' + urlencode(payload)
|
||||||
|
return proxy_url
|
||||||
|
|
||||||
|
|
||||||
|
class AmazonSpider(scrapy.Spider):
|
||||||
|
name = 'amazon'
|
||||||
|
|
||||||
|
def start_requests(self):
|
||||||
|
for query in queries:
|
||||||
|
url = 'https://www.amazon.de/s?' + urlencode({'k': query})
|
||||||
|
yield scrapy.Request(url=url, callback=self.parse_keyword_response)
|
||||||
|
|
||||||
|
def parse_keyword_response(self, response):
|
||||||
|
products = response.xpath('//*[@data-asin]')
|
||||||
|
|
||||||
|
for product in products:
|
||||||
|
asin = product.xpath('@data-asin').extract_first()
|
||||||
|
product_url = f"https://www.amazon.de/dp/{asin}"
|
||||||
|
yield scrapy.Request(url=product_url, callback=self.parse_product_page, meta={'asin': asin})
|
||||||
|
|
||||||
|
next_page = response.xpath('//li[@class="a-last"]/a/@href').extract_first()
|
||||||
|
if next_page:
|
||||||
|
url = urljoin("https://www.amazon.de", next_page)
|
||||||
|
yield scrapy.Request(url=url, callback=self.parse_keyword_response)
|
||||||
|
|
||||||
|
def parse_product_page(self, response):
|
||||||
|
asin = response.meta['asin']
|
||||||
|
title = response.xpath('//*[@id="productTitle"]/text()').extract_first()
|
||||||
|
image = re.search('"large":"(.*?)"', response.text).groups()[0]
|
||||||
|
rating = response.xpath('//*[@id="acrPopover"]/@title').extract_first()
|
||||||
|
number_of_reviews = response.xpath('//*[@id="acrCustomerReviewText"]/text()').extract_first()
|
||||||
|
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()
|
||||||
|
|
||||||
|
temp = response.xpath('//*[@id="twister"]')
|
||||||
|
sizes = []
|
||||||
|
colors = []
|
||||||
|
if temp:
|
||||||
|
s = re.search('"variationValues" : ({.*})', response.text).groups()[0]
|
||||||
|
json_acceptable = s.replace("'", "\"")
|
||||||
|
di = json.loads(json_acceptable)
|
||||||
|
sizes = di.get('size_name', [])
|
||||||
|
colors = di.get('color_name', [])
|
||||||
|
|
||||||
|
bullet_points = response.xpath('//*[@id="feature-bullets"]//li/span/text()').extract()
|
||||||
|
seller_rank = response.xpath(
|
||||||
|
'//*[text()="Amazon Best Sellers Rank:"]/parent::*//text()[not(parent::style)]').extract()
|
||||||
|
yield {'asin': asin, 'Title': title, 'MainImage': image, 'Rating': rating, 'NumberOfReviews': number_of_reviews,
|
||||||
|
'Price': price, 'AvailableSizes': sizes, 'AvailableColors': colors, 'BulletPoints': bullet_points,
|
||||||
|
'SellerRank': seller_rank}
|
|
@ -8,7 +8,6 @@
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/dist" />
|
<excludeFolder url="file://$MODULE_DIR$/dist" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/tmp" />
|
<excludeFolder url="file://$MODULE_DIR$/tmp" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/coverage" />
|
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
</component>
|
</component>
|
||||||
|
|
|
@ -1,135 +1,132 @@
|
||||||
{
|
{
|
||||||
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
|
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"newProjectRoot": "projects",
|
"newProjectRoot": "projects",
|
||||||
"projects": {
|
"projects": {
|
||||||
"Betterzon": {
|
"Betterzon": {
|
||||||
"projectType": "application",
|
"projectType": "application",
|
||||||
"schematics": {},
|
"schematics": {},
|
||||||
"root": "",
|
"root": "",
|
||||||
"sourceRoot": "src",
|
"sourceRoot": "src",
|
||||||
"prefix": "app",
|
"prefix": "app",
|
||||||
"architect": {
|
"architect": {
|
||||||
"build": {
|
"build": {
|
||||||
"builder": "@angular-devkit/build-angular:browser",
|
"builder": "@angular-devkit/build-angular:browser",
|
||||||
"options": {
|
"options": {
|
||||||
"outputPath": "dist/Betterzon",
|
"outputPath": "dist/Betterzon",
|
||||||
"index": "src/index.html",
|
"index": "src/index.html",
|
||||||
"main": "src/main.ts",
|
"main": "src/main.ts",
|
||||||
"polyfills": "src/polyfills.ts",
|
"polyfills": "src/polyfills.ts",
|
||||||
"tsConfig": "tsconfig.app.json",
|
"tsConfig": "tsconfig.app.json",
|
||||||
"aot": true,
|
"aot": true,
|
||||||
"assets": [
|
"assets": [
|
||||||
"src/favicon.ico",
|
"src/favicon.ico",
|
||||||
"src/assets"
|
"src/assets"
|
||||||
],
|
],
|
||||||
"styles": [
|
"styles": [
|
||||||
"./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css",
|
"./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css",
|
||||||
"src/styles.css",
|
"src/styles.css",
|
||||||
"./node_modules/cookieconsent/build/cookieconsent.min.css"
|
"./node_modules/cookieconsent/build/cookieconsent.min.css"
|
||||||
],
|
],
|
||||||
"scripts": [
|
"scripts": [
|
||||||
"./node_modules/cookieconsent/build/cookieconsent.min.js"
|
"./node_modules/cookieconsent/build/cookieconsent.min.js"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"configurations": {
|
"configurations": {
|
||||||
"production": {
|
"production": {
|
||||||
"fileReplacements": [
|
"fileReplacements": [
|
||||||
{
|
{
|
||||||
"replace": "src/environments/environment.ts",
|
"replace": "src/environments/environment.ts",
|
||||||
"with": "src/environments/environment.prod.ts"
|
"with": "src/environments/environment.prod.ts"
|
||||||
}
|
|
||||||
],
|
|
||||||
"optimization": true,
|
|
||||||
"outputHashing": "all",
|
|
||||||
"sourceMap": false,
|
|
||||||
"extractCss": true,
|
|
||||||
"namedChunks": false,
|
|
||||||
"extractLicenses": true,
|
|
||||||
"vendorChunk": false,
|
|
||||||
"buildOptimizer": true,
|
|
||||||
"budgets": [
|
|
||||||
{
|
|
||||||
"type": "initial",
|
|
||||||
"maximumWarning": "2mb",
|
|
||||||
"maximumError": "5mb"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "anyComponentStyle",
|
|
||||||
"maximumWarning": "6kb",
|
|
||||||
"maximumError": "10kb"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"serve": {
|
|
||||||
"builder": "@angular-devkit/build-angular:dev-server",
|
|
||||||
"options": {
|
|
||||||
"browserTarget": "Betterzon:build"
|
|
||||||
},
|
|
||||||
"configurations": {
|
|
||||||
"production": {
|
|
||||||
"browserTarget": "Betterzon:build:production"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"extract-i18n": {
|
|
||||||
"builder": "@angular-devkit/build-angular:extract-i18n",
|
|
||||||
"options": {
|
|
||||||
"browserTarget": "Betterzon:build"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"test": {
|
|
||||||
"builder": "@angular-devkit/build-angular:karma",
|
|
||||||
"options": {
|
|
||||||
"main": "src/test.ts",
|
|
||||||
"polyfills": "src/polyfills.ts",
|
|
||||||
"tsConfig": "tsconfig.spec.json",
|
|
||||||
"karmaConfig": "karma.conf.js",
|
|
||||||
"codeCoverage": true,
|
|
||||||
"codeCoverageExclude": ["src/app/mocks/mock.service.ts"],
|
|
||||||
"assets": [
|
|
||||||
"src/favicon.ico",
|
|
||||||
"src/assets"
|
|
||||||
],
|
|
||||||
"styles": [
|
|
||||||
"./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css",
|
|
||||||
"src/styles.css",
|
|
||||||
"./node_modules/cookieconsent/build/cookieconsent.min.css"
|
|
||||||
],
|
|
||||||
"scripts": [
|
|
||||||
"./node_modules/cookieconsent/build/cookieconsent.min.js"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"lint": {
|
|
||||||
"builder": "@angular-devkit/build-angular:tslint",
|
|
||||||
"options": {
|
|
||||||
"tsConfig": [
|
|
||||||
"tsconfig.app.json",
|
|
||||||
"tsconfig.spec.json",
|
|
||||||
"e2e/tsconfig.json"
|
|
||||||
],
|
|
||||||
"exclude": [
|
|
||||||
"**/node_modules/**"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"e2e": {
|
|
||||||
"builder": "@angular-devkit/build-angular:protractor",
|
|
||||||
"options": {
|
|
||||||
"protractorConfig": "e2e/protractor.conf.js",
|
|
||||||
"devServerTarget": "Betterzon:serve"
|
|
||||||
},
|
|
||||||
"configurations": {
|
|
||||||
"production": {
|
|
||||||
"devServerTarget": "Betterzon:serve:production"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
],
|
||||||
|
"optimization": true,
|
||||||
|
"outputHashing": "all",
|
||||||
|
"sourceMap": false,
|
||||||
|
"extractCss": true,
|
||||||
|
"namedChunks": false,
|
||||||
|
"extractLicenses": true,
|
||||||
|
"vendorChunk": false,
|
||||||
|
"buildOptimizer": true,
|
||||||
|
"budgets": [
|
||||||
|
{
|
||||||
|
"type": "initial",
|
||||||
|
"maximumWarning": "2mb",
|
||||||
|
"maximumError": "5mb"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "anyComponentStyle",
|
||||||
|
"maximumWarning": "6kb",
|
||||||
|
"maximumError": "10kb"
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"serve": {
|
||||||
|
"builder": "@angular-devkit/build-angular:dev-server",
|
||||||
|
"options": {
|
||||||
|
"browserTarget": "Betterzon:build"
|
||||||
|
},
|
||||||
|
"configurations": {
|
||||||
|
"production": {
|
||||||
|
"browserTarget": "Betterzon:build:production"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"extract-i18n": {
|
||||||
|
"builder": "@angular-devkit/build-angular:extract-i18n",
|
||||||
|
"options": {
|
||||||
|
"browserTarget": "Betterzon:build"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"test": {
|
||||||
|
"builder": "@angular-devkit/build-angular:karma",
|
||||||
|
"options": {
|
||||||
|
"main": "src/test.ts",
|
||||||
|
"polyfills": "src/polyfills.ts",
|
||||||
|
"tsConfig": "tsconfig.spec.json",
|
||||||
|
"karmaConfig": "karma.conf.js",
|
||||||
|
"assets": [
|
||||||
|
"src/favicon.ico",
|
||||||
|
"src/assets"
|
||||||
|
],
|
||||||
|
"styles": [
|
||||||
|
"./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css",
|
||||||
|
"src/styles.css",
|
||||||
|
"./node_modules/cookieconsent/build/cookieconsent.min.css"
|
||||||
|
],
|
||||||
|
"scripts": [
|
||||||
|
"./node_modules/cookieconsent/build/cookieconsent.min.js"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"lint": {
|
||||||
|
"builder": "@angular-devkit/build-angular:tslint",
|
||||||
|
"options": {
|
||||||
|
"tsConfig": [
|
||||||
|
"tsconfig.app.json",
|
||||||
|
"tsconfig.spec.json",
|
||||||
|
"e2e/tsconfig.json"
|
||||||
|
],
|
||||||
|
"exclude": [
|
||||||
|
"**/node_modules/**"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"e2e": {
|
||||||
|
"builder": "@angular-devkit/build-angular:protractor",
|
||||||
|
"options": {
|
||||||
|
"protractorConfig": "e2e/protractor.conf.js",
|
||||||
|
"devServerTarget": "Betterzon:serve"
|
||||||
|
},
|
||||||
|
"configurations": {
|
||||||
|
"production": {
|
||||||
|
"devServerTarget": "Betterzon:serve:production"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
"defaultProject": "Betterzon"
|
}},
|
||||||
|
"defaultProject": "Betterzon"
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,6 @@ module.exports = function (config) {
|
||||||
frameworks: ['jasmine', '@angular-devkit/build-angular'],
|
frameworks: ['jasmine', '@angular-devkit/build-angular'],
|
||||||
plugins: [
|
plugins: [
|
||||||
require('karma-jasmine'),
|
require('karma-jasmine'),
|
||||||
require('karma-firefox-launcher'),
|
|
||||||
require('karma-chrome-launcher'),
|
require('karma-chrome-launcher'),
|
||||||
require('karma-jasmine-html-reporter'),
|
require('karma-jasmine-html-reporter'),
|
||||||
require('karma-coverage-istanbul-reporter'),
|
require('karma-coverage-istanbul-reporter'),
|
||||||
|
@ -26,7 +25,7 @@ module.exports = function (config) {
|
||||||
colors: true,
|
colors: true,
|
||||||
logLevel: config.LOG_INFO,
|
logLevel: config.LOG_INFO,
|
||||||
autoWatch: true,
|
autoWatch: true,
|
||||||
browsers: ['Firefox'],
|
browsers: ['Chrome'],
|
||||||
singleRun: false,
|
singleRun: false,
|
||||||
restartOnFileChange: true
|
restartOnFileChange: true
|
||||||
});
|
});
|
||||||
|
|
16380
Frontend/package-lock.json
generated
16380
Frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
|
@ -24,7 +24,6 @@
|
||||||
"@angular/router": "^10.2.3",
|
"@angular/router": "^10.2.3",
|
||||||
"apexcharts": "^3.22.3",
|
"apexcharts": "^3.22.3",
|
||||||
"cookieconsent": "^3.1.1",
|
"cookieconsent": "^3.1.1",
|
||||||
"karma-firefox-launcher": "^2.1.0",
|
|
||||||
"ng": "0.0.0",
|
"ng": "0.0.0",
|
||||||
"ng-apexcharts": "^1.5.6",
|
"ng-apexcharts": "^1.5.6",
|
||||||
"ngx-cookieconsent": "^2.2.3",
|
"ngx-cookieconsent": "^2.2.3",
|
||||||
|
|
|
@ -1,49 +1,31 @@
|
||||||
import {TestBed} from '@angular/core/testing';
|
import { TestBed } from '@angular/core/testing';
|
||||||
import {AppComponent} from './app.component';
|
import { AppComponent } from './app.component';
|
||||||
import {RouterTestingModule} from "@angular/router/testing";
|
|
||||||
import {NgcCookieConsentConfig, NgcCookieConsentModule} from "ngx-cookieconsent";
|
|
||||||
import {FormsModule} from "@angular/forms";
|
|
||||||
|
|
||||||
// For cookie consent module testing
|
|
||||||
const cookieConfig: NgcCookieConsentConfig = {
|
|
||||||
cookie: {
|
|
||||||
domain: 'localhost'
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
describe('AppComponent', () => {
|
describe('AppComponent', () => {
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
declarations: [
|
declarations: [
|
||||||
AppComponent
|
AppComponent
|
||||||
],
|
],
|
||||||
imports: [
|
}).compileComponents();
|
||||||
RouterTestingModule,
|
});
|
||||||
NgcCookieConsentModule.forRoot(cookieConfig),
|
|
||||||
FormsModule
|
|
||||||
]
|
|
||||||
}).compileComponents();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should create the app', () => {
|
it('should create the app', () => {
|
||||||
const fixture = TestBed.createComponent(AppComponent);
|
const fixture = TestBed.createComponent(AppComponent);
|
||||||
const app = fixture.componentInstance;
|
const app = fixture.componentInstance;
|
||||||
app.ngOnInit();
|
expect(app).toBeTruthy();
|
||||||
expect(app).toBeTruthy();
|
});
|
||||||
});
|
|
||||||
|
|
||||||
it(`should have as title 'Betterzon'`, () => {
|
it(`should have as title 'Betterzon'`, () => {
|
||||||
const fixture = TestBed.createComponent(AppComponent);
|
const fixture = TestBed.createComponent(AppComponent);
|
||||||
const app = fixture.componentInstance;
|
const app = fixture.componentInstance;
|
||||||
expect(app.title).toEqual('Betterzon');
|
expect(app.title).toEqual('Betterzon');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should render title', () => {
|
it('should render title', () => {
|
||||||
// Has to be adjusted as we already made changes to this
|
const fixture = TestBed.createComponent(AppComponent);
|
||||||
// const fixture = TestBed.createComponent(AppComponent);
|
fixture.detectChanges();
|
||||||
// fixture.detectChanges();
|
const compiled = fixture.nativeElement;
|
||||||
// const compiled = fixture.nativeElement;
|
expect(compiled.querySelector('.content span').textContent).toContain('Betterzon app is running!');
|
||||||
// expect(compiled.querySelector('.content span').textContent).toContain('Betterzon app is running!');
|
});
|
||||||
expect(true).toEqual(true);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -11,7 +11,7 @@ import {ImprintComponent} from './pages/imprint/imprint.component';
|
||||||
import {PrivacyComponent} from './pages/privacy/privacy.component';
|
import {PrivacyComponent} from './pages/privacy/privacy.component';
|
||||||
|
|
||||||
const routes: Routes = [
|
const routes: Routes = [
|
||||||
{path: '', component: LandingpageComponent, pathMatch: 'full'},
|
{path: '', component: LandingpageComponent},
|
||||||
{path: 'search', component: ProductSearchPageComponent},
|
{path: 'search', component: ProductSearchPageComponent},
|
||||||
{path: 'product/:id', component: ProductDetailPageComponent},
|
{path: 'product/:id', component: ProductDetailPageComponent},
|
||||||
{path: 'impressum', component: ImprintComponent},
|
{path: 'impressum', component: ImprintComponent},
|
||||||
|
|
|
@ -1,42 +1,25 @@
|
||||||
import {ComponentFixture, TestBed} from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import {FooterComponent} from './footer.component';
|
import { FooterComponent } from './footer.component';
|
||||||
import {RouterTestingModule} from "@angular/router/testing";
|
|
||||||
import {AppComponent} from "../../app.component";
|
|
||||||
import {ImprintComponent} from "../../pages/imprint/imprint.component";
|
|
||||||
import {ActivatedRoute, Router} from "@angular/router";
|
|
||||||
|
|
||||||
describe('FooterComponent', () => {
|
describe('FooterComponent', () => {
|
||||||
let component: FooterComponent;
|
let component: FooterComponent;
|
||||||
let fixture: ComponentFixture<FooterComponent>;
|
let fixture: ComponentFixture<FooterComponent>;
|
||||||
let router = {
|
|
||||||
navigate: jasmine.createSpy('navigate'),
|
|
||||||
routerState: jasmine.createSpy('routerState')
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
providers: [{provide: Router, useValue: router}],
|
declarations: [ FooterComponent ]
|
||||||
declarations: [FooterComponent],
|
})
|
||||||
imports: [
|
.compileComponents();
|
||||||
RouterTestingModule
|
});
|
||||||
]
|
|
||||||
})
|
|
||||||
.compileComponents();
|
|
||||||
});
|
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(FooterComponent);
|
fixture = TestBed.createComponent(FooterComponent);
|
||||||
component = fixture.componentInstance;
|
component = fixture.componentInstance;
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should create', () => {
|
it('should create', () => {
|
||||||
expect(component).toBeTruthy();
|
expect(component).toBeTruthy();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should navigate to /impressum when navigateImprint() is called', () => {
|
|
||||||
component.navigateImprint();
|
|
||||||
expect(router.navigate).toHaveBeenCalledWith(['/impressum']);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -17,7 +17,7 @@ export class FooterComponent implements OnInit {
|
||||||
}
|
}
|
||||||
|
|
||||||
navigateImprint(): void {
|
navigateImprint(): void {
|
||||||
this.router.navigate([('/impressum')]);
|
this.router.navigate([('/impressum/')]);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,41 +1,25 @@
|
||||||
import {ComponentFixture, TestBed} from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import {HeaderComponent} from './header.component';
|
import { HeaderComponent } from './header.component';
|
||||||
import {RouterTestingModule} from "@angular/router/testing";
|
|
||||||
import {MatMenuModule} from "@angular/material/menu";
|
|
||||||
import {Router} from "@angular/router";
|
|
||||||
|
|
||||||
describe('HeaderComponent', () => {
|
describe('HeaderComponent', () => {
|
||||||
let component: HeaderComponent;
|
let component: HeaderComponent;
|
||||||
let fixture: ComponentFixture<HeaderComponent>;
|
let fixture: ComponentFixture<HeaderComponent>;
|
||||||
let router = {
|
|
||||||
navigate: jasmine.createSpy('navigate'),
|
|
||||||
navigateByUrl: (url: string) => {
|
|
||||||
return {
|
|
||||||
then: () => {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
providers: [{provide: Router, useValue: router}],
|
declarations: [ HeaderComponent ]
|
||||||
declarations: [HeaderComponent],
|
})
|
||||||
imports: [
|
.compileComponents();
|
||||||
RouterTestingModule,
|
});
|
||||||
MatMenuModule
|
|
||||||
]
|
|
||||||
})
|
|
||||||
.compileComponents();
|
|
||||||
});
|
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(HeaderComponent);
|
fixture = TestBed.createComponent(HeaderComponent);
|
||||||
component = fixture.componentInstance;
|
component = fixture.componentInstance;
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should create', () => {
|
it('should create', () => {
|
||||||
expect(component).toBeTruthy();
|
expect(component).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,57 +1,25 @@
|
||||||
import {ComponentFixture, TestBed} from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import {NewestPricesListComponent} from './newest-prices-list.component';
|
import { NewestPricesListComponent } from './newest-prices-list.component';
|
||||||
import {RouterTestingModule} from "@angular/router/testing";
|
|
||||||
import {HttpClient} from "@angular/common/http";
|
|
||||||
import {AbstractMockObservableService} from "../../mocks/mock.service";
|
|
||||||
import {ApiService} from "../../services/api.service";
|
|
||||||
|
|
||||||
class MockApiService extends AbstractMockObservableService {
|
|
||||||
getCurrentPricePerVendor() {
|
|
||||||
this.content = [];
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
getVendors() {
|
|
||||||
const vendor = {
|
|
||||||
vendor_id: 1,
|
|
||||||
name: 'Max Mustermann',
|
|
||||||
streetname: 'Musterstraße 69',
|
|
||||||
zip_code: '12345',
|
|
||||||
city: 'Musterhausen',
|
|
||||||
country_code: 'DE',
|
|
||||||
phone: '+49 123 4567890',
|
|
||||||
website: 'https://www.amazon.de',
|
|
||||||
};
|
|
||||||
this.content = [vendor];
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('NewestPricesListComponent', () => {
|
describe('NewestPricesListComponent', () => {
|
||||||
let component: NewestPricesListComponent;
|
let component: NewestPricesListComponent;
|
||||||
let fixture: ComponentFixture<NewestPricesListComponent>;
|
let fixture: ComponentFixture<NewestPricesListComponent>;
|
||||||
let mockService;
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
mockService = new MockApiService();
|
await TestBed.configureTestingModule({
|
||||||
await TestBed.configureTestingModule({
|
declarations: [ NewestPricesListComponent ]
|
||||||
providers: [{provide: ApiService, useValue: mockService}],
|
})
|
||||||
declarations: [NewestPricesListComponent],
|
.compileComponents();
|
||||||
imports: [
|
});
|
||||||
RouterTestingModule
|
|
||||||
]
|
|
||||||
})
|
|
||||||
.compileComponents();
|
|
||||||
});
|
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(NewestPricesListComponent);
|
fixture = TestBed.createComponent(NewestPricesListComponent);
|
||||||
component = fixture.componentInstance;
|
component = fixture.componentInstance;
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should create', () => {
|
it('should create', () => {
|
||||||
expect(component).toBeTruthy();
|
expect(component).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,75 +1,25 @@
|
||||||
import {ComponentFixture, TestBed} from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import {ProductDetailsComponent} from './product-details.component';
|
import { ProductDetailsComponent } from './product-details.component';
|
||||||
import {RouterTestingModule} from "@angular/router/testing";
|
|
||||||
import {AbstractMockObservableService} from "../../mocks/mock.service";
|
|
||||||
import {ApiService} from "../../services/api.service";
|
|
||||||
import {ChartComponent, NgApexchartsModule} from "ng-apexcharts";
|
|
||||||
|
|
||||||
class MockApiService extends AbstractMockObservableService {
|
|
||||||
getProduct() {
|
|
||||||
this.content = {};
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
getLowestPrices() {
|
|
||||||
const price = {
|
|
||||||
price_id: 1,
|
|
||||||
product_id: 1,
|
|
||||||
vendor_id: 1,
|
|
||||||
price_in_cents: 123,
|
|
||||||
timestamp: new Date()
|
|
||||||
};
|
|
||||||
this.content = [price];
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
getAmazonPrice() {
|
|
||||||
this.content = {};
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
getVendors() {
|
|
||||||
const vendor = {
|
|
||||||
vendor_id: 1,
|
|
||||||
name: 'Max Mustermann',
|
|
||||||
streetname: 'Musterstraße 69',
|
|
||||||
zip_code: '12345',
|
|
||||||
city: 'Musterhausen',
|
|
||||||
country_code: 'DE',
|
|
||||||
phone: '+49 123 4567890',
|
|
||||||
website: 'https://www.amazon.de',
|
|
||||||
}
|
|
||||||
this.content = [vendor];
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('ProductDetailsComponent', () => {
|
describe('ProductDetailsComponent', () => {
|
||||||
let component: ProductDetailsComponent;
|
let component: ProductDetailsComponent;
|
||||||
let fixture: ComponentFixture<ProductDetailsComponent>;
|
let fixture: ComponentFixture<ProductDetailsComponent>;
|
||||||
let mockService;
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
mockService = new MockApiService();
|
await TestBed.configureTestingModule({
|
||||||
await TestBed.configureTestingModule({
|
declarations: [ ProductDetailsComponent ]
|
||||||
providers: [{provide: ApiService, useValue: mockService}],
|
})
|
||||||
declarations: [ProductDetailsComponent],
|
.compileComponents();
|
||||||
imports: [
|
});
|
||||||
RouterTestingModule,
|
|
||||||
NgApexchartsModule
|
|
||||||
]
|
|
||||||
})
|
|
||||||
.compileComponents();
|
|
||||||
});
|
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(ProductDetailsComponent);
|
fixture = TestBed.createComponent(ProductDetailsComponent);
|
||||||
component = fixture.componentInstance;
|
component = fixture.componentInstance;
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should create', () => {
|
it('should create', () => {
|
||||||
expect(component).toBeTruthy();
|
expect(component).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -47,7 +47,7 @@ export class ProductDetailsComponent implements OnInit {
|
||||||
}
|
}
|
||||||
|
|
||||||
getProduct(): void {
|
getProduct(): void {
|
||||||
this.apiService.getProduct(this.productId).subscribe(product => {this.product = product});
|
this.apiService.getProduct(this.productId).subscribe(product => this.product = product);
|
||||||
}
|
}
|
||||||
|
|
||||||
getPrices(): void {
|
getPrices(): void {
|
||||||
|
|
|
@ -1,79 +1,25 @@
|
||||||
import {ComponentFixture, TestBed} from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import {ProductListComponent} from './product-list.component';
|
import { ProductListComponent } from './product-list.component';
|
||||||
import {FooterComponent} from "../footer/footer.component";
|
|
||||||
import {HeaderComponent} from "../header/header.component";
|
|
||||||
import {RouterTestingModule} from "@angular/router/testing";
|
|
||||||
import {ApiService} from "../../services/api.service";
|
|
||||||
import {AbstractMockObservableService} from "../../mocks/mock.service";
|
|
||||||
import {Router} from "@angular/router";
|
|
||||||
|
|
||||||
class MockApiService extends AbstractMockObservableService {
|
|
||||||
getProducts() {
|
|
||||||
this.content = [];
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
getProductsByQuery() {
|
|
||||||
this.content = [];
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('ProductListComponent', () => {
|
describe('ProductListComponent', () => {
|
||||||
let component: ProductListComponent;
|
let component: ProductListComponent;
|
||||||
let fixture: ComponentFixture<ProductListComponent>;
|
let fixture: ComponentFixture<ProductListComponent>;
|
||||||
let mockService;
|
|
||||||
let router = {
|
|
||||||
navigate: jasmine.createSpy('navigate'),
|
|
||||||
routerState: jasmine.createSpy('routerState')
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
mockService = new MockApiService();
|
await TestBed.configureTestingModule({
|
||||||
await TestBed.configureTestingModule({
|
declarations: [ ProductListComponent ]
|
||||||
providers: [{provide: ApiService, useValue: mockService}, {provide: Router, useValue: router}],
|
})
|
||||||
declarations: [ProductListComponent],
|
.compileComponents();
|
||||||
imports: [
|
});
|
||||||
RouterTestingModule
|
|
||||||
]
|
|
||||||
})
|
|
||||||
.compileComponents();
|
|
||||||
});
|
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(ProductListComponent);
|
fixture = TestBed.createComponent(ProductListComponent);
|
||||||
component = fixture.componentInstance;
|
component = fixture.componentInstance;
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should create', () => {
|
it('should create', () => {
|
||||||
expect(component).toBeTruthy();
|
expect(component).toBeTruthy();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should load products by search query when type is search', () => {
|
|
||||||
component.type = 'search';
|
|
||||||
component.loadParams();
|
|
||||||
expect(component.products).toBeTruthy();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should navigate to /product/xyz when navigateImprint() is called', () => {
|
|
||||||
const product = {
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
component.clickedProduct(product);
|
|
||||||
expect(router.navigate).toHaveBeenCalledWith(['/product/1']);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,34 +0,0 @@
|
||||||
import {Observable, of} from 'rxjs';
|
|
||||||
|
|
||||||
export abstract class AbstractMockObservableService {
|
|
||||||
protected _observable: Observable<any>;
|
|
||||||
protected _fakeContent: any;
|
|
||||||
protected _fakeError: any;
|
|
||||||
|
|
||||||
set error(err) {
|
|
||||||
this._fakeError = err;
|
|
||||||
}
|
|
||||||
|
|
||||||
set content(data) {
|
|
||||||
this._fakeContent = data;
|
|
||||||
}
|
|
||||||
|
|
||||||
get subscription(): Observable<any> {
|
|
||||||
return this._observable;
|
|
||||||
}
|
|
||||||
|
|
||||||
subscribe(next: Function, error?: Function, complete?: Function): Observable<any> {
|
|
||||||
this._observable = new Observable();
|
|
||||||
|
|
||||||
if (next && this._fakeContent && !this._fakeError) {
|
|
||||||
next(this._fakeContent);
|
|
||||||
}
|
|
||||||
if (error && this._fakeError) {
|
|
||||||
error(this._fakeError);
|
|
||||||
}
|
|
||||||
if (complete) {
|
|
||||||
complete();
|
|
||||||
}
|
|
||||||
return this._observable;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,25 +1,25 @@
|
||||||
import {ComponentFixture, TestBed} from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import {ImprintComponent} from './imprint.component';
|
import { ImprintComponent } from './imprint.component';
|
||||||
|
|
||||||
describe('ImprintComponent', () => {
|
describe('ImprintComponent', () => {
|
||||||
let component: ImprintComponent;
|
let component: ImprintComponent;
|
||||||
let fixture: ComponentFixture<ImprintComponent>;
|
let fixture: ComponentFixture<ImprintComponent>;
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
declarations: [ImprintComponent]
|
declarations: [ ImprintComponent ]
|
||||||
})
|
})
|
||||||
.compileComponents();
|
.compileComponents();
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(ImprintComponent);
|
fixture = TestBed.createComponent(ImprintComponent);
|
||||||
component = fixture.componentInstance;
|
component = fixture.componentInstance;
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should create', () => {
|
it('should create', () => {
|
||||||
expect(component).toBeTruthy();
|
expect(component).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,35 +1,25 @@
|
||||||
import {ComponentFixture, TestBed} from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import {LandingpageComponent} from './landingpage.component';
|
import { LandingpageComponent } from './landingpage.component';
|
||||||
import {RouterTestingModule} from "@angular/router/testing";
|
|
||||||
import {Router} from "@angular/router";
|
|
||||||
|
|
||||||
describe('LandingpageComponent', () => {
|
describe('LandingpageComponent', () => {
|
||||||
let component: LandingpageComponent;
|
let component: LandingpageComponent;
|
||||||
let fixture: ComponentFixture<LandingpageComponent>;
|
let fixture: ComponentFixture<LandingpageComponent>;
|
||||||
let router = {
|
|
||||||
navigate: jasmine.createSpy('navigate'),
|
|
||||||
routerState: jasmine.createSpy('routerState')
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
providers: [{provide: Router, useValue: router}],
|
declarations: [ LandingpageComponent ]
|
||||||
declarations: [LandingpageComponent],
|
})
|
||||||
imports: [
|
.compileComponents();
|
||||||
RouterTestingModule
|
});
|
||||||
]
|
|
||||||
})
|
|
||||||
.compileComponents();
|
|
||||||
});
|
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(LandingpageComponent);
|
fixture = TestBed.createComponent(LandingpageComponent);
|
||||||
component = fixture.componentInstance;
|
component = fixture.componentInstance;
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should create', () => {
|
it('should create', () => {
|
||||||
expect(component).toBeTruthy();
|
expect(component).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,25 +1,25 @@
|
||||||
import {ComponentFixture, TestBed} from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import {PageNotFoundPageComponent} from './page-not-found-page.component';
|
import { PageNotFoundPageComponent } from './page-not-found-page.component';
|
||||||
|
|
||||||
describe('PageNotFoundPageComponent', () => {
|
describe('PageNotFoundPageComponent', () => {
|
||||||
let component: PageNotFoundPageComponent;
|
let component: PageNotFoundPageComponent;
|
||||||
let fixture: ComponentFixture<PageNotFoundPageComponent>;
|
let fixture: ComponentFixture<PageNotFoundPageComponent>;
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
declarations: [PageNotFoundPageComponent]
|
declarations: [ PageNotFoundPageComponent ]
|
||||||
})
|
})
|
||||||
.compileComponents();
|
.compileComponents();
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(PageNotFoundPageComponent);
|
fixture = TestBed.createComponent(PageNotFoundPageComponent);
|
||||||
component = fixture.componentInstance;
|
component = fixture.componentInstance;
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should create', () => {
|
it('should create', () => {
|
||||||
expect(component).toBeTruthy();
|
expect(component).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,25 +1,25 @@
|
||||||
import {ComponentFixture, TestBed} from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import {PrivacyComponent} from './privacy.component';
|
import { PrivacyComponent } from './privacy.component';
|
||||||
|
|
||||||
describe('PrivacyComponent', () => {
|
describe('PrivacyComponent', () => {
|
||||||
let component: PrivacyComponent;
|
let component: PrivacyComponent;
|
||||||
let fixture: ComponentFixture<PrivacyComponent>;
|
let fixture: ComponentFixture<PrivacyComponent>;
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
declarations: [PrivacyComponent]
|
declarations: [ PrivacyComponent ]
|
||||||
})
|
})
|
||||||
.compileComponents();
|
.compileComponents();
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(PrivacyComponent);
|
fixture = TestBed.createComponent(PrivacyComponent);
|
||||||
component = fixture.componentInstance;
|
component = fixture.componentInstance;
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should create', () => {
|
it('should create', () => {
|
||||||
expect(component).toBeTruthy();
|
expect(component).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,29 +1,25 @@
|
||||||
import {ComponentFixture, TestBed} from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import {ProductDetailPageComponent} from './product-detail-page.component';
|
import { ProductDetailPageComponent } from './product-detail-page.component';
|
||||||
import {RouterTestingModule} from "@angular/router/testing";
|
|
||||||
|
|
||||||
describe('ProductDetailPageComponent', () => {
|
describe('ProductDetailPageComponent', () => {
|
||||||
let component: ProductDetailPageComponent;
|
let component: ProductDetailPageComponent;
|
||||||
let fixture: ComponentFixture<ProductDetailPageComponent>;
|
let fixture: ComponentFixture<ProductDetailPageComponent>;
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
declarations: [ProductDetailPageComponent],
|
declarations: [ ProductDetailPageComponent ]
|
||||||
imports: [
|
})
|
||||||
RouterTestingModule
|
.compileComponents();
|
||||||
]
|
});
|
||||||
})
|
|
||||||
.compileComponents();
|
|
||||||
});
|
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(ProductDetailPageComponent);
|
fixture = TestBed.createComponent(ProductDetailPageComponent);
|
||||||
component = fixture.componentInstance;
|
component = fixture.componentInstance;
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should create', () => {
|
it('should create', () => {
|
||||||
expect(component).toBeTruthy();
|
expect(component).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,32 +1,25 @@
|
||||||
import {ComponentFixture, TestBed} from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import {ProductSearchPageComponent} from './product-search-page.component';
|
import { ProductSearchPageComponent } from './product-search-page.component';
|
||||||
import {HeaderComponent} from "../../components/header/header.component";
|
|
||||||
import {FooterComponent} from "../../components/footer/footer.component";
|
|
||||||
import {ProductListComponent} from "../../components/product-list/product-list.component";
|
|
||||||
import {RouterTestingModule} from "@angular/router/testing";
|
|
||||||
|
|
||||||
describe('ProductSearchPageComponent', () => {
|
describe('ProductSearchPageComponent', () => {
|
||||||
let component: ProductSearchPageComponent;
|
let component: ProductSearchPageComponent;
|
||||||
let fixture: ComponentFixture<ProductSearchPageComponent>;
|
let fixture: ComponentFixture<ProductSearchPageComponent>;
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
declarations: [ProductSearchPageComponent],
|
declarations: [ ProductSearchPageComponent ]
|
||||||
imports: [
|
})
|
||||||
RouterTestingModule
|
.compileComponents();
|
||||||
]
|
});
|
||||||
})
|
|
||||||
.compileComponents();
|
|
||||||
});
|
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
fixture = TestBed.createComponent(ProductSearchPageComponent);
|
fixture = TestBed.createComponent(ProductSearchPageComponent);
|
||||||
component = fixture.componentInstance;
|
component = fixture.componentInstance;
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should create', () => {
|
it('should create', () => {
|
||||||
expect(component).toBeTruthy();
|
expect(component).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,21 +1,16 @@
|
||||||
import {TestBed} from '@angular/core/testing';
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
import {ApiService} from './api.service';
|
import { ApiService } from './api.service';
|
||||||
import {HttpClientModule} from "@angular/common/http";
|
|
||||||
|
|
||||||
describe('ApiService', () => {
|
describe('ApiService', () => {
|
||||||
let service: ApiService;
|
let service: ApiService;
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({});
|
||||||
imports: [
|
service = TestBed.inject(ApiService);
|
||||||
HttpClientModule
|
});
|
||||||
]
|
|
||||||
});
|
|
||||||
service = TestBed.inject(ApiService);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should be created', () => {
|
it('should be created', () => {
|
||||||
expect(service).toBeTruthy();
|
expect(service).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
/* To learn more about this file see: https://angular.io/config/tsconfig. */
|
/* To learn more about this file see: https://angular.io/config/tsconfig. */
|
||||||
{
|
{
|
||||||
"extends": "./tsconfig.json",
|
"extends": "./tsconfig.json",
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"outDir": "./out-tsc/spec",
|
"outDir": "./out-tsc/spec",
|
||||||
"types": [
|
"types": [
|
||||||
"jasmine"
|
"jasmine"
|
||||||
]
|
|
||||||
},
|
|
||||||
"files": [
|
|
||||||
"src/test.ts",
|
|
||||||
"src/polyfills.ts"
|
|
||||||
],
|
|
||||||
"include": [
|
|
||||||
"src/**/*.spec.ts",
|
|
||||||
"src/**/*.d.ts"
|
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
"files": [
|
||||||
|
"src/test.ts",
|
||||||
|
"src/polyfills.ts"
|
||||||
|
],
|
||||||
|
"include": [
|
||||||
|
"src/**/*.spec.ts",
|
||||||
|
"src/**/*.d.ts"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user