From d6a41d5a82e3c1e3593a494f6292eb25f1f6533d Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 7 Jan 2021 16:13:31 +0100 Subject: [PATCH] Ajusted the way scan distances are implemented --- src/models/entities/Scan.ts | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/models/entities/Scan.ts b/src/models/entities/Scan.ts index 3c1cb67..c525eb3 100644 --- a/src/models/entities/Scan.ts +++ b/src/models/entities/Scan.ts @@ -15,7 +15,7 @@ import { Runner } from "./Runner"; */ @Entity() @TableInheritance({ column: { name: "type", type: "varchar" } }) -export abstract class Scan { +export class Scan { /** * Autogenerated unique id (primary key). */ @@ -31,14 +31,6 @@ export abstract class Scan { @ManyToOne(() => Runner, runner => runner.scans, { nullable: false }) runner: Runner; - /** - * The scan's distance in meters. - * Can be set manually or derived from another object. - */ - @IsInt() - @IsPositive() - abstract distance: number; - /** * Is the scan valid (for fraud reasons). * The determination of validity will work differently for every child class. @@ -48,6 +40,24 @@ export abstract class Scan { @IsBoolean() valid: boolean = true; + /** + * The scan's distance in meters. + * Can be set manually or derived from another object. + */ + @Column({ nullable: true }) + @IsInt() + private _distance?: number; + + /** + * The scan's distance in meters. + * Can be set manually or derived from another object. + */ + @IsInt() + @IsPositive() + public get distance(): number { + return this._distance; + } + /** * Turns this entity into it's response class. */