Ledda/kadi_backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleaned up naming scheme and finalised StoredPlayer, stats updaters, and generic templates for StoredObjectCollection and StoredObject

Browse Source
This commit is contained in:
Daniel Ledda
2020-06-26 00:24:19 +02:00
parent 11bf3821a9
commit 094e3a3295
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/models/player.ts
View File

@@ -1,13 +1,11 @@
import mongoose from "mongoose";
import { import {
IPlayerStats, OutcomeType,
IPlayerStatsDoc, OutcomeType,
PlayerGameResults, PlayerGameResults,
PlayerStats, PlayerStats,
PlayerStatsMongoObjectInterface, PlayerStatsUpdater
PlayerStatsSchema, PlayerStatsUpdater
} from "./stats"; } from "./stats";
import { import {
getMongoObjectCollection,
MongoStoredObject, MongoStoredObjectCollection, MongoStoredObject, MongoStoredObjectCollection,
} from "./utils"; } from "./utils";
import {CellValue} from "../controllers/statsController"; import {CellValue} from "../controllers/statsController";
@@ -65,9 +63,10 @@ class MongoStoredPlayer extends MongoStoredObject implements StoredPlayer {
} }
async updateStats(playerGameResults: PlayerGameResults & {outcome: OutcomeType}, ruleset: Ruleset) { async updateStats(playerGameResults: PlayerGameResults & {outcome: OutcomeType}, ruleset: Ruleset) {
const statsInterface = new PlayerStatsMongoObjectInterface(this.data.stats); const statsUpdater = new PlayerStatsUpdater(this.data.stats);
await statsInterface.updateStats(playerGameResults, ruleset); await statsUpdater.updateStats(playerGameResults, ruleset);
} }
} }
export default PlayerCollection; const StoredPlayers = new MongoStoredPlayerCollection(getMongoObjectCollection("players"));
export default StoredPlayers;

4
src/models/stats.ts
View File

@@ -137,8 +137,8 @@ class BaseStatsUpdater {
} }
} }
class RulesetMongoObjectInterface { class MongoStoredRuleset {
private data: Ruleset; private readonly data: Ruleset;
constructor(data: Ruleset) { constructor(data: Ruleset) {
this.data = data; this.data = data;
} }

11
src/models/utils.ts
View File

@@ -1,6 +1,5 @@
import mongo, {MongoClient, Db} from "mongodb"; import mongo, {MongoClient, Db} from "mongodb";
import Settings from "../server-config.json"; import Settings from "../server-config.json";
import {PlayerData, StoredPlayer} from "./player";
let SessionDbClient: Db; let SessionDbClient: Db;
export async function initMongoSessionClient() { export async function initMongoSessionClient() {
@@ -10,7 +9,7 @@ export async function initMongoSessionClient() {
} }
return SessionDbClient; return SessionDbClient;
} }
export async function getMongoObjectCollection(collectionName: string) { export function getMongoObjectCollection(collectionName: string) {
if (SessionDbClient === undefined) { if (SessionDbClient === undefined) {
throw new MongoError("Cannot retrieve a collection before the session client has been initialised!"); throw new MongoError("Cannot retrieve a collection before the session client has been initialised!");
} }
@@ -19,7 +18,7 @@ export async function getMongoObjectCollection(collectionName: string) {
} }
} }
export abstract class MongoStoredObjectCollection<T extends MongoStoredObject> { export abstract class MongoStoredObjectCollection<T extends MongoStoredObject<any>> {
protected mongoDbClientCollection: mongo.Collection; protected mongoDbClientCollection: mongo.Collection;
protected constructor(collectionClient: mongo.Collection) { protected constructor(collectionClient: mongo.Collection) {
this.mongoDbClientCollection = collectionClient; this.mongoDbClientCollection = collectionClient;
@@ -36,14 +35,14 @@ export abstract class MongoStoredObjectCollection<T extends MongoStoredObject> {
} }
} }
export abstract class MongoStoredObject { export abstract class MongoStoredObject<T> {
protected constructor(protected data: {_id: string} & any) {} protected constructor(protected data: {_id: string} & T) {}
id(): string { id(): string {
return this.data._id; return this.data._id;
} }
rawData(): PlayerData { rawData(): T {
return this.data; return this.data;
} }
} }