sprechtl/RaspberryRocketeer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backend pagination done

Browse source
This commit is contained in:
j-weissen 2023-01-20 13:20:51 +01:00
parent e8079f760a
commit fd235b56c6
6 changed files with 55 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

37
backend/api/src/leaderboardRoute.ts
View file

@ -1,4 +1,5 @@
import express from 'express';
import {query, validationResult} from 'express-validator';
import {TimeLeaderboardRepository} from "./repositories/TimeLeaderboardRepository.js";
import {TimeLeaderboardPgPromiseRepository} from "./repositories/pgPromise/TimeLeaderboardPgPromiseRepository.js";
import {HighscoreLeaderboardPgPromiseRepository} from "./repositories/pgPromise/HighscoreLeaderboardPgPromiseRepository.js";
@ -8,6 +9,9 @@ import {HighscoreLeaderboard, TimeLeaderboard} from "./model/Leaderboard.js";
export const leaderboardRoute = express.Router()
leaderboardRoute.get('/highscore',
query('pagination').toBoolean(),
query('entriesPerPage').optional().isInt({min: 1}).toInt(),
query('page').optional().isInt({min: 0}).toInt(),
/**
* Returns the highscore leaderboard as JSON response, fetched from DB
* @param req
@ -15,8 +19,21 @@ leaderboardRoute.get('/highscore',
*/
async (req, res) => {
try {
//region validate parameters
const errors = validationResult(req);
if (!errors.isEmpty()) {
return res.status(400).json({ errors: errors.array() });
}
//endregion
const highscoreLeaderboardRepo: HighscoreLeaderboardRepository = new HighscoreLeaderboardPgPromiseRepository;
const highscoreLeaderboard: HighscoreLeaderboard = await highscoreLeaderboardRepo.getAll();
let highscoreLeaderboard: HighscoreLeaderboard;
if (req.query.pagination) {
const entriesPerPage = req.query.entriesPerPage;
const page = req.query.page;
highscoreLeaderboard = await highscoreLeaderboardRepo.getPage(entriesPerPage, page);
} else {
highscoreLeaderboard = await highscoreLeaderboardRepo.getAll();
}
res.send(highscoreLeaderboard);
} catch (error) {
// handle errors
@ -26,6 +43,9 @@ leaderboardRoute.get('/highscore',
})
leaderboardRoute.get('/totalplaytime',
query('pagination').toBoolean(),
query('entriesPerPage').optional().isInt({min: 1}).toInt(),
query('page').optional().isInt({min: 0}).toInt(),
/**
* Returns the total playtime leaderboard as JSON response, fetched from DB
* @param req
@ -33,8 +53,21 @@ leaderboardRoute.get('/totalplaytime',
*/
async (req, res) => {
try {
//region validate parameters
const errors = validationResult(req);
if (!errors.isEmpty()) {
return res.status(400).json({ errors: errors.array() });
}
//endregion
const timeLeaderboardRepo: TimeLeaderboardRepository = new TimeLeaderboardPgPromiseRepository;
const timeLeaderboard: TimeLeaderboard = await timeLeaderboardRepo.getAll();
let timeLeaderboard: TimeLeaderboard;
if (req.query.pagination) {
const entriesPerPage = req.query.entriesPerPage;
const page = req.query.page;
timeLeaderboard = await timeLeaderboardRepo.getPage(entriesPerPage, page);
} else {
timeLeaderboard = await timeLeaderboardRepo.getAll();
}
res.send(timeLeaderboard);
} catch (error) {
// handle errors

1
backend/api/src/repositories/HighscoreLeaderboardRepository.ts
View file

@ -2,4 +2,5 @@ import {HighscoreLeaderboard} from "../model/Leaderboard.js";
export abstract class HighscoreLeaderboardRepository {
abstract getAll(): Promise<HighscoreLeaderboard>;
abstract getPage(entriesPerPage: number, page: number): Promise<HighscoreLeaderboard>
}

1
backend/api/src/repositories/TimeLeaderboardRepository.ts
View file

@ -2,4 +2,5 @@ import {TimeLeaderboard} from "../model/Leaderboard.js";
export abstract class TimeLeaderboardRepository {
abstract getAll(): Promise<TimeLeaderboard>;
abstract getPage(entriesPerPage: number, page: number);
}

10
backend/api/src/repositories/pgPromise/HighscoreLeaderboardPgPromiseRepository.ts
View file

@ -5,7 +5,15 @@ import {Database} from "../../Database.js";
export class HighscoreLeaderboardPgPromiseRepository extends HighscoreLeaderboardRepository {
async getAll(): Promise<HighscoreLeaderboard> {
const raw: any = await Database.db.manyOrNone(
'SELECT * FROM lb_highscore INNER JOIN "user" ON user_id = id ORDER BY RANK;'
'SELECT * FROM lb_highscore INNER JOIN "user" ON user_id = id ORDER BY rank;'
);
return this.serialize(raw);
}
async getPage(entriesPerPage, page): Promise<HighscoreLeaderboard> {
const raw: any = await Database.db.manyOrNone(
'SELECT * FROM lb_highscore INNER JOIN "user" ON user_id = id ORDER BY rank LIMIT $1 OFFSET $2;',
[entriesPerPage, page * entriesPerPage]
);
return this.serialize(raw);
}

10
backend/api/src/repositories/pgPromise/TimeLeaderboardPgPromiseRepository.ts
View file

@ -5,7 +5,15 @@ import {Database} from "../../Database.js";
export class TimeLeaderboardPgPromiseRepository extends TimeLeaderboardRepository {
async getAll(): Promise<TimeLeaderboard> {
const raw: any = await Database.db.manyOrNone(
'SELECT * FROM lb_total_playtime INNER JOIN "user" ON user_id = id ORDER BY RANK;'
'SELECT * FROM lb_total_playtime INNER JOIN "user" ON user_id = id ORDER BY rank;'
);
return this.serialize(raw);
}
async getPage(entriesPerPage: number, page: number): Promise<TimeLeaderboard> {
const raw: any = await Database.db.manyOrNone(
'SELECT * FROM lb_total_playtime INNER JOIN "user" ON user_id = id ORDER BY rank LIMIT $1 OFFSET $2;',
[entriesPerPage, page * entriesPerPage]
);
return this.serialize(raw);
}

12
frontend/public/main.js
View file

@ -1,12 +0,0 @@
function setup() {
createCanvas(400, 400);
}
function draw() {
if (mouseIsPressed) {
fill(0);
} else {
fill(255);
}
ellipse(mouseX, mouseY, 80, 80);
}