latest work #20

Merged
philipp merged 233 commits from dev into main 2020-12-09 18:49:33 +00:00
2 changed files with 10 additions and 3 deletions
Showing only changes of commit f32291d714 - Show all commits

View File

@ -1,4 +1,4 @@
import { Entity, PrimaryGeneratedColumn, Column } from "typeorm";
import { Entity, PrimaryGeneratedColumn, Column, ManyToOne } from "typeorm";
import {
IsBoolean,
IsInt,
@ -34,7 +34,7 @@ export class ScanStation {
*/
@Column()
@IsNotEmpty()
//TODO: Relation
@ManyToOne(() => Track, track => track.stations)
track: Track;
/**

View File

@ -1,4 +1,4 @@
import { Entity, PrimaryGeneratedColumn, Column } from "typeorm";
import { Entity, PrimaryGeneratedColumn, Column, OneToMany } from "typeorm";
import {
IsInt,
IsNotEmpty,
@ -6,6 +6,7 @@ import {
IsPositive,
IsString,
} from "class-validator";
import { ScanStation } from "./ScanStation";
/**
* Defines a track of given length.
@ -35,4 +36,10 @@ export class Track {
@IsInt()
@IsPositive()
distance: number;
/**
* Used to link scan stations to track.
*/
@OneToMany(() => ScanStation, station => station.track)
stations: ScanStation[];
}