latest work #20

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

View File

@ -7,6 +7,7 @@ import {
IsString, IsString,
} from "class-validator"; } from "class-validator";
import { Participant } from "./Participant"; import { Participant } from "./Participant";
import { RunnerOrganisation } from "./RunnerOrganisation";
/** /**
* Defines a address (to be used for contact information). * Defines a address (to be used for contact information).
@ -77,4 +78,10 @@ export class Address {
*/ */
@OneToMany(() => Participant, participant => participant.address) @OneToMany(() => Participant, participant => participant.address)
participants: Participant[]; participants: Participant[];
/**
* Used to link the address to runner groups.
*/
@OneToMany(() => RunnerOrganisation, group => group.address)
groups: RunnerOrganisation[];
} }

View File

@ -1,4 +1,4 @@
import { Entity, Column } from "typeorm"; import { Entity, Column, ManyToOne } from "typeorm";
import { IsOptional,} from "class-validator"; import { IsOptional,} from "class-validator";
import { RunnerGroup } from "./RunnerGroup"; import { RunnerGroup } from "./RunnerGroup";
import { Address } from "./Address"; import { Address } from "./Address";
@ -15,6 +15,6 @@ export class RunnerOrganisation extends RunnerGroup {
*/ */
@Column() @Column()
@IsOptional() @IsOptional()
//TODO: Relationship @ManyToOne(() => Address, address => address.groups)
address?: Address; address?: Address;
} }