MrDiderot/Michess
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

count game history stats for users

Browse Source
This commit is contained in:
Nathaniel Tampus
2023-04-02 18:24:21 +08:00
parent 92dfc0c778
commit 577cba6ff4
6 changed files with 94 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/db/index.ts
View File

@@ -8,6 +8,9 @@ export const INIT_TABLES = /* sql */ `
name VARCHAR(128) UNIQUE NOT NULL,
email VARCHAR(128),
password TEXT,
wins INTEGER DEFAULT 0,
losses INTEGER DEFAULT 0,
draws INTEGER DEFAULT 0,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
);
CREATE TABLE IF NOT EXISTS "game" (

26
server/src/db/models/game.model.ts
View File

@@ -5,7 +5,7 @@ export const activeGames: Array<Game> = [];
// todo: join user and game relationship
export const create = async (game: Game) => {
export const save = async (game: Game) => {
try {
const white: User = {};
const black: User = {};
@@ -31,6 +31,28 @@ export const create = async (game: Game) => {
black.name || null
]
);
if (black.id || white.id) {
// draws
if (game.winner === "draw") {
if (white.id) {
await db.query(`UPDATE "user" SET draws = draws + 1 WHERE id = $1`, [white.id]);
}
if (black.id) {
await db.query(`UPDATE "user" SET draws = draws + 1 WHERE id = $1`, [black.id]);
}
} else {
const winner = game.winner === "white" ? white : black;
const loser = game.winner === "white" ? black : white;
if (winner.id) {
await db.query(`UPDATE "user" SET wins = wins + 1 WHERE id = $1`, [winner.id]);
}
if (loser.id) {
await db.query(`UPDATE "user" SET losses = losses + 1 WHERE id = $1`, [
loser.id
]);
}
}
}
return {
id: res.rows[0].id,
winner: res.rows[0].winner,
@@ -135,7 +157,7 @@ export const remove = async (id: number) => {
};
const GameModel = {
create,
save,
findById,
findByUserId,
update,

20
server/src/db/models/user.model.ts
View File

@@ -8,7 +8,7 @@ export const create = async (user: User, password: string) => {
try {
const res = await db.query(
`INSERT INTO "user"(name, email, password) VALUES($1, $2, $3) RETURNING id, name, email`,
`INSERT INTO "user"(name, email, password) VALUES($1, $2, $3) RETURNING id, name, email, wins, losses, draws`,
[user.name, user.email || null, password]
);
return res.rows[0] as User;
@@ -23,7 +23,10 @@ export const findById = async (id: number) => {
return null;
}
try {
const res = await db.query(`SELECT id, name, email FROM "user" WHERE id=$1`, [id]);
const res = await db.query(
`SELECT id, name, email, wins, losses, draws FROM "user" WHERE id=$1`,
[id]
);
if (res.rowCount) {
return res.rows[0] as User;
} else return null;
@@ -37,9 +40,10 @@ export const findByNameEmail = async (user: User, includePassword = false, limit
// if user is not specified, get all users
if (!user) {
try {
const res = await db.query(`SELECT id, name, email FROM "user" LIMIT $1`, [
limit ?? 10
]);
const res = await db.query(
`SELECT id, name, email, wins, losses, draws FROM "user" LIMIT $1`,
[limit ?? 10]
);
return res.rows as Array<User & { password?: string }>;
} catch (err: unknown) {
console.log(err);
@@ -49,7 +53,7 @@ export const findByNameEmail = async (user: User, includePassword = false, limit
try {
const res = await db.query(
`SELECT id, name, email${
`SELECT id, name, email, wins, losses, draws${
includePassword ? `, password` : ""
} FROM "user" WHERE name=$1 OR email=$2 LIMIT $3`,
[user.name, user.email, limit ?? 1]
@@ -67,11 +71,11 @@ export const update = async (id: number, updatedUser: User & { password?: string
}
try {
let query = `UPDATE "user" SET name=$1, email=$2 WHERE id=$3 RETURNING id, name, email`;
let query = `UPDATE "user" SET name=$1, email=$2 WHERE id=$3 RETURNING id, name, email, wins, losses, draws`;
let values = [updatedUser.name, updatedUser.email, id];
if (updatedUser.password) {
query = `UPDATE "user" SET name=$1, email=$2, password=$3 WHERE id=$4 RETURNING id, name, email`;
query = `UPDATE "user" SET name=$1, email=$2, password=$3 WHERE id=$4 RETURNING id, name, email, wins, losses, draws`;
values = [updatedUser.name, updatedUser.email, updatedUser.password, id];
}
const res = await db.query(query, values);