Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/express/api/controllers/user.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class UserController implements IController {
private initRoutes(): void {
this.router.get('/', requireUser, this.users);
this.router.get('/:name', requireUser, this.getUser);
this.router.get('/:name/favourites', requireUser, this.getUserFavourites);
this.router.post('/:name', requireAdmin, this.postUser);
this.router.patch('/:name', requireAdmin, this.patchUser);
this.router.delete('/:name', requireAdmin, this.deleteUser);
Expand Down Expand Up @@ -43,6 +44,16 @@ class UserController implements IController {
res.status(200).json(user);
};

private getUserFavourites = (req: Request, res: Response) => {
const name = req.params.name;
if (name === undefined || name === '') {
res.status(404).end();
return;
}
const favourites = this.userService.getUserFavourites(name);
res.status(200).json(favourites);
};

private postUser = (req: Request, res: Response) => {
const name = req.params.name;
if (name === undefined || name === '') {
Expand Down
2 changes: 1 addition & 1 deletion src/express/api/services/stats.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class StatsService {
}

getTopBeverages(): Beverage[] {
const sql = this.dbService.prepare('SELECT b.name, b.stock, b.price FROM (SELECT beverage, COUNT(beverage) AS count FROM History WHERE beverage != \'\' GROUP BY beverage ORDER BY count DESC) t INNER JOIN Beverages b ON t.beverage = b.name LIMIT 5;');
const sql = this.dbService.prepare('SELECT b.name, b.stock, b.price FROM (SELECT beverage, COUNT(beverage) AS count FROM History WHERE beverage != \'\' AND reason = beverage GROUP BY beverage ORDER BY count DESC) t INNER JOIN Beverages b ON t.beverage = b.name LIMIT 5;');
return sql.all();
}

Expand Down
5 changes: 5 additions & 0 deletions src/express/api/services/user.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ class UserService {
return sql.get(name);
}

getUserFavourites(name: string): {name: string, count: number}[] {
const sql = this.dbService.prepare('SELECT beverage as name, COUNT(beverage) as count FROM History WHERE user = ? AND beverage != \'\' AND reason = beverage GROUP BY beverage ORDER BY count DESC LIMIT 5;');
return sql.all(name) as {name: string, count: number}[];
}

createUser(name: string): void {
const sql = this.dbService.prepare('INSERT INTO Users (name) VALUES (?);');
sql.run(name);
Expand Down