From fff55edf7944f4badca3e0c26b778114fef3e8fb Mon Sep 17 00:00:00 2001
From: j-weissen <jweissen@htl-steyr.ac.at>
Date: Wed, 28 Dec 2022 15:39:58 +0100
Subject: [PATCH] overhauled structure, leaderboardRoute.ts and userRoute.ts
 working

---
 backend/api/package-lock.json                 | 46 +++++++++-
 backend/api/package.json                      |  2 +-
 backend/api/src/app.ts                        |  8 ++
 backend/api/src/leaderboardRoute.ts           | 32 ++++---
 .../manager/HighscoreLeaderboardManager.ts    | 32 +------
 backend/api/src/manager/Manager.ts            | 11 ++-
 .../api/src/manager/TimeLeaderboardManager.ts | 34 +-------
 backend/api/src/manager/UserManager.ts        | 10 +++
 backend/api/src/manager/UserScoresManager.ts  | 33 +------
 .../HighscoreLeaderboardPgPromiseManager.ts   | 29 +++++++
 .../TimeLeaderboardPgPromiseManager.ts        | 29 +++++++
 .../manager/pgPromise/UserPgPromiseManager.ts | 53 +++++++++++
 .../pgPromise/UserScoresPgPromiseManager.ts   | 27 ++++++
 backend/api/src/model/Leaderboard.ts          |  5 +-
 backend/api/src/model/User.ts                 |  4 +
 backend/api/src/model/UserScores.ts           |  6 +-
 .../HighscoreLeaderboardSerializer.ts         |  4 -
 backend/api/src/serializer/Serializer.ts      |  4 -
 .../serializer/TimeLeaderboardSerializer.ts   |  5 --
 .../src/serializer/UserScoresSerializer.ts    |  4 -
 ...HighscoreLeaderboardPgPromiseSerializer.ts | 20 -----
 .../TimeLeaderboardPgPromiseSerializer.ts     | 20 -----
 .../UserScoresPgPromiseSerializer.ts          | 20 -----
 backend/api/src/userRoute.ts                  | 87 ++++++++++++++-----
 backend/db/initScripts/_createSchema.sql      |  2 +-
 25 files changed, 315 insertions(+), 212 deletions(-)
 create mode 100644 backend/api/src/manager/UserManager.ts
 create mode 100644 backend/api/src/manager/pgPromise/HighscoreLeaderboardPgPromiseManager.ts
 create mode 100644 backend/api/src/manager/pgPromise/TimeLeaderboardPgPromiseManager.ts
 create mode 100644 backend/api/src/manager/pgPromise/UserPgPromiseManager.ts
 create mode 100644 backend/api/src/manager/pgPromise/UserScoresPgPromiseManager.ts
 create mode 100644 backend/api/src/model/User.ts
 delete mode 100644 backend/api/src/serializer/HighscoreLeaderboardSerializer.ts
 delete mode 100644 backend/api/src/serializer/Serializer.ts
 delete mode 100644 backend/api/src/serializer/TimeLeaderboardSerializer.ts
 delete mode 100644 backend/api/src/serializer/UserScoresSerializer.ts
 delete mode 100644 backend/api/src/serializer/pgpromise/HighscoreLeaderboardPgPromiseSerializer.ts
 delete mode 100644 backend/api/src/serializer/pgpromise/TimeLeaderboardPgPromiseSerializer.ts
 delete mode 100644 backend/api/src/serializer/pgpromise/UserScoresPgPromiseSerializer.ts

diff --git a/backend/api/package-lock.json b/backend/api/package-lock.json
index 2cf000a..d786a7e 100644
--- a/backend/api/package-lock.json
+++ b/backend/api/package-lock.json
@@ -9,8 +9,8 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "body-parser": "^1.20.1",
         "express": "^4.18.2",
+        "express-validator": "^6.14.2",
         "helmet": "^6.0.1",
         "morgan": "^1.10.0",
         "pg-promise": "^10.15.4",
@@ -413,6 +413,18 @@
         "node": ">= 0.10.0"
       }
     },
+    "node_modules/express-validator": {
+      "version": "6.14.2",
+      "resolved": "https://registry.npmjs.org/express-validator/-/express-validator-6.14.2.tgz",
+      "integrity": "sha512-8XfAUrQ6Y7dIIuy9KcUPCfG/uCbvREctrxf5EeeME+ulanJ4iiW71lWmm9r4YcKKYOCBMan0WpVg7FtHu4Z4Wg==",
+      "dependencies": {
+        "lodash": "^4.17.21",
+        "validator": "^13.7.0"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
     "node_modules/finalhandler": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
@@ -533,6 +545,11 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
     "node_modules/make-error": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
@@ -1055,6 +1072,14 @@
       "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
       "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg=="
     },
+    "node_modules/validator": {
+      "version": "13.7.0",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz",
+      "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -1408,6 +1433,15 @@
         "vary": "~1.1.2"
       }
     },
+    "express-validator": {
+      "version": "6.14.2",
+      "resolved": "https://registry.npmjs.org/express-validator/-/express-validator-6.14.2.tgz",
+      "integrity": "sha512-8XfAUrQ6Y7dIIuy9KcUPCfG/uCbvREctrxf5EeeME+ulanJ4iiW71lWmm9r4YcKKYOCBMan0WpVg7FtHu4Z4Wg==",
+      "requires": {
+        "lodash": "^4.17.21",
+        "validator": "^13.7.0"
+      }
+    },
     "finalhandler": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
@@ -1495,6 +1529,11 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
       "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
     },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
     "make-error": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
@@ -1857,6 +1896,11 @@
       "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
       "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg=="
     },
+    "validator": {
+      "version": "13.7.0",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz",
+      "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw=="
+    },
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
diff --git a/backend/api/package.json b/backend/api/package.json
index 46e3922..e553c95 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -11,8 +11,8 @@
   "author": "jweissen",
   "license": "ISC",
   "dependencies": {
-    "body-parser": "^1.20.1",
     "express": "^4.18.2",
+    "express-validator": "^6.14.2",
     "helmet": "^6.0.1",
     "morgan": "^1.10.0",
     "pg-promise": "^10.15.4",
diff --git a/backend/api/src/app.ts b/backend/api/src/app.ts
index fddff85..ae7a775 100644
--- a/backend/api/src/app.ts
+++ b/backend/api/src/app.ts
@@ -10,10 +10,14 @@ const port = 3000
 
 app.use(helmet())
 
+
 // configure & use logger
 let morganFormatted = morgan('[:date[iso]] :method :url - :status')
 app.use(morganFormatted);
 
+
+app.use(express.json())
+
 app.use('/leaderboard', leaderboardRoute)
 app.use('/user', userRoute)
 
@@ -21,6 +25,10 @@ app.get('/helloworld', (req, res) => {
     res.json({message: "Hello World!"})
 })
 
+app.post('/echo', async (req, res) => {
+    res.json(req.body)
+})
+
 
 app.listen(port, () => {
     console.log(`Server started at http://localhost:3000`);
diff --git a/backend/api/src/leaderboardRoute.ts b/backend/api/src/leaderboardRoute.ts
index 8267647..aaa0da9 100644
--- a/backend/api/src/leaderboardRoute.ts
+++ b/backend/api/src/leaderboardRoute.ts
@@ -1,23 +1,33 @@
 import express from 'express';
-import {Database} from "./Database.js";
 import {TimeLeaderboardManager} from "./manager/TimeLeaderboardManager.js";
+import {TimeLeaderboardPgPromiseManager} from "./manager/pgPromise/TimeLeaderboardPgPromiseManager.js";
+import {HighscoreLeaderboardPgPromiseManager} from "./manager/pgPromise/HighscoreLeaderboardPgPromiseManager.js";
 import {HighscoreLeaderboardManager} from "./manager/HighscoreLeaderboardManager.js";
-import {
-    HighscoreLeaderboardPgPromiseSerializer
-} from "./serializer/pgpromise/HighscoreLeaderboardPgPromiseSerializer.js";
-import {TimeLeaderboardPgPromiseSerializer} from "./serializer/pgpromise/TimeLeaderboardPgPromiseSerializer.js";
+import {HighscoreLeaderboard, TimeLeaderboard} from "./model/Leaderboard.js";
 
 export const leaderboardRoute = express.Router()
 
 
 leaderboardRoute.get('/highscore', async (req, res) => {
-    let data = await Database.db.manyOrNone('SELECT * FROM lb_highscore INNER JOIN "user" ON user_id = id ORDER BY RANK;')
-    const leaderboardManager = new HighscoreLeaderboardManager(data, new HighscoreLeaderboardPgPromiseSerializer);
-    res.send(leaderboardManager.content)
+    try {
+        const highscoreLeaderboardManager: HighscoreLeaderboardManager = new HighscoreLeaderboardPgPromiseManager;
+        const highscoreLeaderboard: HighscoreLeaderboard = await highscoreLeaderboardManager.getAll();
+        res.send(highscoreLeaderboard);
+    } catch (error) {
+        // handle errors
+        console.log(error)
+        res.status(500).json({ errors: [{msg: "Internal server error"}]})
+    }
 })
 
 leaderboardRoute.get('/totalplaytime', async (req, res) => {
-    let data = await Database.db.manyOrNone('SELECT * FROM lb_total_playtime INNER JOIN "user" ON user_id = id ORDER BY RANK;')
-    const leaderboardManager = new TimeLeaderboardManager(data, new TimeLeaderboardPgPromiseSerializer);
-    res.send(leaderboardManager.content)
+    try {
+        const timeLeaderboardManager: TimeLeaderboardManager = new TimeLeaderboardPgPromiseManager;
+        const timeLeaderboard: TimeLeaderboard = await timeLeaderboardManager.getAll();
+        res.send(timeLeaderboard);
+    } catch (error) {
+        // handle errors
+        console.log(error)
+        res.status(500).json({ errors: [{msg: "Internal server error"}]})
+    }
 })
\ No newline at end of file
diff --git a/backend/api/src/manager/HighscoreLeaderboardManager.ts b/backend/api/src/manager/HighscoreLeaderboardManager.ts
index c1955e7..995fc00 100644
--- a/backend/api/src/manager/HighscoreLeaderboardManager.ts
+++ b/backend/api/src/manager/HighscoreLeaderboardManager.ts
@@ -1,32 +1,6 @@
-import {Leaderboard} from "../model/Leaderboard.js";
+import {HighscoreLeaderboard} from "../model/Leaderboard.js";
 import {Manager} from "./Manager.js";
-import {HighscoreLeaderboardSerializer} from "../serializer/HighscoreLeaderboardSerializer.js";
-
-export class HighscoreLeaderboardManager implements Manager<Leaderboard<number>>{
-    private _content: Leaderboard<number>;
-    private _serializer: HighscoreLeaderboardSerializer;
-
-    constructor(rawData: any, serializer: HighscoreLeaderboardSerializer) {
-        this.serializer = serializer;
-        this._content = this.serializer.serialize(rawData);
-    }
-
-    //region getter&setter
-    get content() {
-        return this._content;
-    }
-
-    set content(value: Leaderboard<number>) {
-        this._content = value;
-    }
-
-    get serializer() {
-        return this._serializer;
-    }
-
-    set serializer(value: HighscoreLeaderboardSerializer) {
-        this._serializer = value;
-    }
-    //endregion
 
+export abstract class HighscoreLeaderboardManager extends Manager<HighscoreLeaderboard>{
+    abstract getAll(): Promise<HighscoreLeaderboard>;
 }
\ No newline at end of file
diff --git a/backend/api/src/manager/Manager.ts b/backend/api/src/manager/Manager.ts
index 6cd27e3..1538078 100644
--- a/backend/api/src/manager/Manager.ts
+++ b/backend/api/src/manager/Manager.ts
@@ -1,8 +1,7 @@
-import {Serializer} from "../serializer/Serializer.js";
+export abstract class Manager<T> {
+    //region getter&setter
+    protected abstract serialize(raw: any): T;
 
-export interface Manager<T> {
-    get content(),
-    set content(value: T),
-    get serializer(),
-    set serializer(value: Serializer<T>),
+    protected abstract deserialize(parsed: T): any;
+    //endregion
 }
\ No newline at end of file
diff --git a/backend/api/src/manager/TimeLeaderboardManager.ts b/backend/api/src/manager/TimeLeaderboardManager.ts
index df9ec0e..6b6f0b2 100644
--- a/backend/api/src/manager/TimeLeaderboardManager.ts
+++ b/backend/api/src/manager/TimeLeaderboardManager.ts
@@ -1,34 +1,6 @@
 import {Manager} from "./Manager.js";
-import {Leaderboard} from "../model/Leaderboard.js";
-import {Time} from "../model/Time.js";
-import {TimeLeaderboardSerializer} from "../serializer/TimeLeaderboardSerializer.js";
-import {TimeLeaderboardPgPromiseSerializer} from "../serializer/pgpromise/TimeLeaderboardPgPromiseSerializer.js";
-
-export class TimeLeaderboardManager implements Manager<Leaderboard<Time>> {
-    private _content: Leaderboard<Time>;
-    private _serializer: TimeLeaderboardPgPromiseSerializer
-
-    constructor(data: any, serializer: TimeLeaderboardSerializer) {
-        this._serializer = serializer;
-        this._content = this._serializer.serialize(data);
-    }
-
-    //region getter&setter
-    get content() {
-        return this._content;
-    }
-
-    set content(value: Leaderboard<Time>) {
-        this._content = value;
-    }
-
-    get serializer(): TimeLeaderboardPgPromiseSerializer {
-        return this._serializer;
-    }
-
-    set serializer(value: TimeLeaderboardPgPromiseSerializer) {
-        this._serializer = value;
-    }
-    //endregion
+import {TimeLeaderboard} from "../model/Leaderboard.js";
 
+export abstract class TimeLeaderboardManager extends Manager<TimeLeaderboard>{
+    abstract getAll(): Promise<TimeLeaderboard>;
 }
\ No newline at end of file
diff --git a/backend/api/src/manager/UserManager.ts b/backend/api/src/manager/UserManager.ts
new file mode 100644
index 0000000..e8dbcce
--- /dev/null
+++ b/backend/api/src/manager/UserManager.ts
@@ -0,0 +1,10 @@
+import {Manager} from "./Manager.js";
+import {User} from "../model/User.js";
+
+export abstract class UserManager extends Manager<User>{
+    abstract getById(id: number): Promise<User>;
+    abstract getByName(name: string): Promise<User>;
+    abstract withIdExists(userId: number): Promise<boolean>;
+    abstract withNameExists(username: string): Promise<boolean>
+    abstract insert(user: Omit<User, 'id'>): Promise<User>;
+}
\ No newline at end of file
diff --git a/backend/api/src/manager/UserScoresManager.ts b/backend/api/src/manager/UserScoresManager.ts
index 9ff2b0c..973699b 100644
--- a/backend/api/src/manager/UserScoresManager.ts
+++ b/backend/api/src/manager/UserScoresManager.ts
@@ -1,33 +1,6 @@
 import {UserScores} from "../model/UserScores.js";
-import { Serializer } from "../serializer/Serializer.js";
-import {UserScoresSerializer} from "../serializer/UserScoresSerializer.js";
 import {Manager} from "./Manager.js";
 
-export class UserScoresManager implements Manager<UserScores> {
-    private _content: UserScores;
-    private _serializer: UserScoresSerializer;
-
-    constructor(rawData: any, serializer: UserScoresSerializer) {
-        this.serializer = serializer;
-        this._content = this.serializer.serialize(rawData);
-    }
-
-    //region getter&setter
-    get content() {
-        return this._content;
-    }
-
-    set content(value: UserScores) {
-        this._content = value;
-    }
-
-    get serializer() {
-        return this._serializer
-    }
-
-    set serializer(value: Serializer<UserScores>) {
-        this._serializer = value
-    }
-    //endregion
-
-}
\ No newline at end of file
+export abstract class UserScoresManager extends Manager<UserScores>{
+    abstract getById(userId: number): Promise<UserScores>;
+}
diff --git a/backend/api/src/manager/pgPromise/HighscoreLeaderboardPgPromiseManager.ts b/backend/api/src/manager/pgPromise/HighscoreLeaderboardPgPromiseManager.ts
new file mode 100644
index 0000000..acdb9c2
--- /dev/null
+++ b/backend/api/src/manager/pgPromise/HighscoreLeaderboardPgPromiseManager.ts
@@ -0,0 +1,29 @@
+import {HighscoreLeaderboardManager} from "../HighscoreLeaderboardManager.js";
+import {HighscoreLeaderboard, LeaderboardEntry} from "../../model/Leaderboard.js";
+import {Database} from "../../Database.js";
+
+export class HighscoreLeaderboardPgPromiseManager extends HighscoreLeaderboardManager{
+    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;'
+        );
+        return this.serialize(raw);
+    }
+
+    //region serialization
+        protected serialize(raw: any): HighscoreLeaderboard {
+            return raw.map((item) => {
+            let newItem: LeaderboardEntry<number> = {
+                rank: item.rank,
+                username: item.name,
+                score: item.highscore,
+            }
+                return newItem;
+            });
+        }
+
+        protected deserialize(parsed: HighscoreLeaderboard): any {
+            throw new Error("Mthod not implemented.");
+        }
+        //endregion
+}
\ No newline at end of file
diff --git a/backend/api/src/manager/pgPromise/TimeLeaderboardPgPromiseManager.ts b/backend/api/src/manager/pgPromise/TimeLeaderboardPgPromiseManager.ts
new file mode 100644
index 0000000..1a25ee1
--- /dev/null
+++ b/backend/api/src/manager/pgPromise/TimeLeaderboardPgPromiseManager.ts
@@ -0,0 +1,29 @@
+import {TimeLeaderboardManager} from "../TimeLeaderboardManager.js";
+import {LeaderboardEntry, TimeLeaderboard} from "../../model/Leaderboard.js";
+import {Database} from "../../Database.js";
+
+export class TimeLeaderboardPgPromiseManager extends TimeLeaderboardManager {
+    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;'
+        );
+        return this.serialize(raw);
+    }
+
+    //region serialization
+    protected deserialize(parsed: TimeLeaderboard): any {
+        throw new Error("Method not implemented.")
+    }
+
+    protected serialize(raw: any): TimeLeaderboard {
+        return raw.map((item) => {
+            let newItem: LeaderboardEntry<string> = {
+                rank: item.rank,
+                username: item.name,
+                score: item.total_playtime,
+            }
+            return newItem
+        });
+    }
+    //endregion
+}
\ No newline at end of file
diff --git a/backend/api/src/manager/pgPromise/UserPgPromiseManager.ts b/backend/api/src/manager/pgPromise/UserPgPromiseManager.ts
new file mode 100644
index 0000000..0e518c6
--- /dev/null
+++ b/backend/api/src/manager/pgPromise/UserPgPromiseManager.ts
@@ -0,0 +1,53 @@
+import {UserManager} from "../UserManager.js";
+import {User} from "../../model/User.js";
+import {Database} from "../../Database.js";
+
+export class UserPgPromiseManager extends UserManager {
+    async getById(id: number): Promise<User> {
+        const raw = await Database.db.oneOrNone(
+            'SELECT * FROM "user" WHERE id = $1;', id
+        );
+        return this.serialize(raw);
+    }
+
+    async getByName(name: string): Promise<User> {
+        const raw = await Database.db.oneOrNone(
+            'SELECT * FROM "user" WHERE name = $1;', name
+        );
+        return this.serialize(raw);
+    }
+
+    async withIdExists(id: number): Promise<boolean> {
+        const response = await Database.db.oneOrNone(
+            'SELECT count(*) AS row_count FROM "user" WHERE id = $1;', id
+        );
+        return response.row_count > 0;
+    }
+
+    async withNameExists(name: string): Promise<boolean> {
+        const response = await Database.db.oneOrNone(
+            'SELECT count(*) AS row_count FROM "user" WHERE name = $1;', name
+        );
+        return response.row_count > 0;
+    }
+
+    async insert(user: Omit<User, 'id'>): Promise<User> {
+        const raw = await Database.db.oneOrNone(
+            'INSERT INTO "user" (name) VALUES (${name}) RETURNING *;', user
+        );
+        return this.serialize(raw);
+    }
+
+    //region serialization
+    protected serialize(raw: any): User {
+        return {
+            id: raw.id,
+            name: raw.name
+        };
+    }
+
+    protected deserialize(parsed: User): any {
+        throw new Error("Method not implemented.")
+    }
+    //endregion
+}
\ No newline at end of file
diff --git a/backend/api/src/manager/pgPromise/UserScoresPgPromiseManager.ts b/backend/api/src/manager/pgPromise/UserScoresPgPromiseManager.ts
new file mode 100644
index 0000000..b147463
--- /dev/null
+++ b/backend/api/src/manager/pgPromise/UserScoresPgPromiseManager.ts
@@ -0,0 +1,27 @@
+import {UserScoresManager} from "../UserScoresManager.js";
+import {UserScores} from "../../model/UserScores.js";
+import {Database} from "../../Database.js";
+
+export class UserScoresPgPromiseManager extends UserScoresManager {
+    public async getById(id: number): Promise<UserScores> {
+        const raw = await Database.db.oneOrNone(
+            'SELECT * FROM user_scores WHERE user_id = $1;', id
+        );
+        return this.serialize(raw);
+    }
+
+    protected serialize(raw: any): UserScores {
+        return {
+            userId: raw.user_id,
+            highscore: raw.highscore,
+            totalScore: raw.total_score,
+            totalPlaytime: raw.total_playtime,
+            averageScore: raw.average_score,
+            gamesPlayed: raw.games_played,
+        };
+    }
+
+    protected deserialize(parsed: UserScores): any {
+        throw new Error("Method not implemented.")
+    }
+}
\ No newline at end of file
diff --git a/backend/api/src/model/Leaderboard.ts b/backend/api/src/model/Leaderboard.ts
index e82321e..8f7722b 100644
--- a/backend/api/src/model/Leaderboard.ts
+++ b/backend/api/src/model/Leaderboard.ts
@@ -1,7 +1,10 @@
 export type Leaderboard<T> = LeaderboardEntry<T>[];
 
+export type HighscoreLeaderboard = Leaderboard<number>;
+export type TimeLeaderboard = Leaderboard<string>;
+
 export interface LeaderboardEntry<T> {
+    username: number,
     rank: number,
-    username: string,
     score: T,
 }
\ No newline at end of file
diff --git a/backend/api/src/model/User.ts b/backend/api/src/model/User.ts
new file mode 100644
index 0000000..fc21330
--- /dev/null
+++ b/backend/api/src/model/User.ts
@@ -0,0 +1,4 @@
+export interface User {
+    id?: number,
+    name: string,
+}
\ No newline at end of file
diff --git a/backend/api/src/model/UserScores.ts b/backend/api/src/model/UserScores.ts
index bff5208..3e2e7bf 100644
--- a/backend/api/src/model/UserScores.ts
+++ b/backend/api/src/model/UserScores.ts
@@ -1,8 +1,10 @@
+import {Time} from "./Time.js";
+
 export interface UserScores {
-    username: string,
+    userId: number,
     highscore: number,
     totalScore: number,
-    totalPlaytime: string,
+    totalPlaytime: Time,
     averageScore: number,
     gamesPlayed: number,
 }
\ No newline at end of file
diff --git a/backend/api/src/serializer/HighscoreLeaderboardSerializer.ts b/backend/api/src/serializer/HighscoreLeaderboardSerializer.ts
deleted file mode 100644
index 94785e5..0000000
--- a/backend/api/src/serializer/HighscoreLeaderboardSerializer.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import {Serializer} from "./Serializer.js";
-import {Leaderboard} from "../model/Leaderboard.js";
-
-export interface HighscoreLeaderboardSerializer extends Serializer<Leaderboard<number>> {}
\ No newline at end of file
diff --git a/backend/api/src/serializer/Serializer.ts b/backend/api/src/serializer/Serializer.ts
deleted file mode 100644
index d0f5e33..0000000
--- a/backend/api/src/serializer/Serializer.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface Serializer<T> {
-    serialize(rawData: any): T,
-    deserialize(parsedData: T): any,
-}
\ No newline at end of file
diff --git a/backend/api/src/serializer/TimeLeaderboardSerializer.ts b/backend/api/src/serializer/TimeLeaderboardSerializer.ts
deleted file mode 100644
index 25fe823..0000000
--- a/backend/api/src/serializer/TimeLeaderboardSerializer.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import {Serializer} from "./Serializer.js";
-import {Leaderboard} from "../model/Leaderboard.js";
-import {Time} from "../model/Time.js";
-
-export interface TimeLeaderboardSerializer extends Serializer<Leaderboard<Time>> {}
\ No newline at end of file
diff --git a/backend/api/src/serializer/UserScoresSerializer.ts b/backend/api/src/serializer/UserScoresSerializer.ts
deleted file mode 100644
index 95c346c..0000000
--- a/backend/api/src/serializer/UserScoresSerializer.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import {UserScores} from "../model/UserScores.js";
-import {Serializer} from "./Serializer.js";
-
-export interface UserScoresSerializer extends Serializer<UserScores>{}
\ No newline at end of file
diff --git a/backend/api/src/serializer/pgpromise/HighscoreLeaderboardPgPromiseSerializer.ts b/backend/api/src/serializer/pgpromise/HighscoreLeaderboardPgPromiseSerializer.ts
deleted file mode 100644
index 927eb98..0000000
--- a/backend/api/src/serializer/pgpromise/HighscoreLeaderboardPgPromiseSerializer.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import {HighscoreLeaderboardSerializer} from "../HighscoreLeaderboardSerializer.js";
-import {Leaderboard, LeaderboardEntry} from "../../model/Leaderboard.js";
-
-export class HighscoreLeaderboardPgPromiseSerializer implements HighscoreLeaderboardSerializer {
-    deserialize(parsedData: Leaderboard<number>): any {
-        throw new Error("Method not implemented.")
-    }
-
-    serialize(rawData: any): Leaderboard<number> {
-        return rawData.map((item) => {
-            let newItem: LeaderboardEntry<number> = {
-                rank: item.rank,
-                username: item.name,
-                score: item.highscore,
-            }
-            return newItem
-        });
-    }
-
-}
\ No newline at end of file
diff --git a/backend/api/src/serializer/pgpromise/TimeLeaderboardPgPromiseSerializer.ts b/backend/api/src/serializer/pgpromise/TimeLeaderboardPgPromiseSerializer.ts
deleted file mode 100644
index 5e38931..0000000
--- a/backend/api/src/serializer/pgpromise/TimeLeaderboardPgPromiseSerializer.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import {TimeLeaderboardSerializer} from "../TimeLeaderboardSerializer.js";
-import {Leaderboard, LeaderboardEntry} from "../../model/Leaderboard.js";
-import {Time} from "../../model/Time.js";
-
-export class TimeLeaderboardPgPromiseSerializer implements TimeLeaderboardSerializer {
-    deserialize(parsedData: Leaderboard<Time>): any {
-        throw new Error("Method not implemented.")
-    }
-
-    serialize(rawData: any): Leaderboard<Time> {
-        return rawData.map((item) => {
-            let newItem: LeaderboardEntry<Time> = {
-                rank: item.rank,
-                username: item.name,
-                score: item.total_playtime,
-            }
-            return newItem
-        });
-    }
-}
\ No newline at end of file
diff --git a/backend/api/src/serializer/pgpromise/UserScoresPgPromiseSerializer.ts b/backend/api/src/serializer/pgpromise/UserScoresPgPromiseSerializer.ts
deleted file mode 100644
index 959a193..0000000
--- a/backend/api/src/serializer/pgpromise/UserScoresPgPromiseSerializer.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import {UserScores} from "../../model/UserScores.js";
-import {UserScoresSerializer} from "../UserScoresSerializer.js";
-
-export class UserScoresPgPromiseSerializer implements UserScoresSerializer {
-    deserialize(parsedData: UserScores): any {
-        throw new Error("Method not implemented");
-    }
-
-    serialize(rawData: any): UserScores {
-        return {
-            username: rawData.name,
-            highscore: rawData.highscore,
-            totalScore: rawData.total_score,
-            totalPlaytime: rawData.total_playtime,
-            averageScore: rawData.averageScore,
-            gamesPlayed: rawData.games_played,
-        };
-    }
-
-}
\ No newline at end of file
diff --git a/backend/api/src/userRoute.ts b/backend/api/src/userRoute.ts
index 179cca7..4849c59 100644
--- a/backend/api/src/userRoute.ts
+++ b/backend/api/src/userRoute.ts
@@ -1,30 +1,73 @@
 import express from "express";
-import {Database} from "./Database.js";
+import { body, param, validationResult } from 'express-validator';
+import {UserScoresPgPromiseManager} from "./manager/pgPromise/UserScoresPgPromiseManager.js";
+import {UserPgPromiseManager} from "./manager/pgPromise/UserPgPromiseManager.js";
+import {UserManager} from "./manager/UserManager.js";
 import {UserScoresManager} from "./manager/UserScoresManager.js";
-import {UserScoresPgPromiseSerializer} from "./serializer/pgpromise/UserScoresPgPromiseSerializer.js";
-import bodyParser from "body-parser";
+import {User} from "./model/User.js";
+
 
 export const userRoute = express.Router()
 
-userRoute.use(bodyParser.json)
+userRoute.post(
+    '/register',
+    body('name')
+        .isString()
+        .isLength({min: 3, max: 32})
+        .matches('[a-zA-Z0-9_.\\- ]*'),
+    async (req, res) => {
+        try {
+            //region validate parameters
+            const errors = validationResult(req);
+            if (!errors.isEmpty()) {
+                return res.status(400).json({ errors: errors.array() });
+            }
+            //endregion
 
-userRoute.get('/:username/scores', async (req, res) => {
-    let data = await Database.db.oneOrNone(
-        'SELECT * FROM user_scores INNER JOIN "user" ON user_scores.user_id = "user".id WHERE "user".name = $1;',
-        [req.params.username])
-        .catch((error) => console.log(error.message)
-    )
-    let userDataManager: UserScoresManager = new UserScoresManager(data, new UserScoresPgPromiseSerializer);
-    res.json(userDataManager.content);
-})
+            const username: string = req.body.name;
+            const userManager: UserManager = new UserPgPromiseManager();
 
-userRoute.post('/register', async (req, res) => {
-    if (req.body.name == undefined) {
-        res.status(400).send("'name' was not defined");
-        return;
+            // check if username already exists
+            if (await userManager.withNameExists(username)) {
+                return res.status(400).json({ errors: [{msg: `User with name '${username}' already exists.`}] })
+            }
+            // insert & return user
+            const inserted: User = await userManager.insert({name: username});
+            res.json(inserted);
+        } catch (error) {
+            // handle errors
+            console.log(error)
+            res.status(500).json({ errors: [{msg: "Internal server error"}]})
+        }
     }
-    await Database.db.none(
-        'INSERT INTO "user" (name) VALUES ($1);', [req.body.name]
-    );
-    res.status(200).send();
-})
\ No newline at end of file
+)
+
+userRoute.get('/:userId/scores',
+    param('userId').isInt({min: 1}),
+    async (req, res) => {
+        //region validate parameters
+        const errors = validationResult(req);
+        if (!errors.isEmpty()) {
+            return res.status(400).json({ errors: errors.array() });
+        }
+        //endregion
+
+        const userId: number = req.params.userId;
+        const userManager: UserManager = new UserPgPromiseManager;
+
+        try {
+            // check if user with given id exists
+            if (!await userManager.withIdExists(userId)) {
+                return res.status(400).json({ errors: [{msg: `User with id ${userId} does not exist.`}] })
+            }
+            // get & return data
+            const userScoresManager: UserScoresManager = new UserScoresPgPromiseManager;
+            const userScores = await userScoresManager.getById(userId);
+            res.json(userScores);
+        } catch (error) {
+            // handle errors
+            console.log(error)
+            res.status(500).json({ errors: [{msg: "Internal server error"}]})
+        }
+    }
+)
diff --git a/backend/db/initScripts/_createSchema.sql b/backend/db/initScripts/_createSchema.sql
index 626b0bb..d1a8ad7 100644
--- a/backend/db/initScripts/_createSchema.sql
+++ b/backend/db/initScripts/_createSchema.sql
@@ -4,7 +4,7 @@ CREATE TABLE "user" (
 );
 
 CREATE TABLE user_scores (
-    user_id INT PRIMARY KEY REFERENCES "user",
+    user_id INT PRIMARY KEY,
     highscore INT NOT NULL DEFAULT 0,
     total_score INT NOT NULL DEFAULT 0,
     total_playtime TIME NOT NULL DEFAULT '00:00:00',