Multicylinders

api/src/model/entitites/cylinder.entity.ts

@@ -4,6 +4,7 @@ import {
   CreateDateColumn,
   DeleteDateColumn,
   Entity,
+  ManyToMany,
   ManyToOne,
   OneToMany,
   PrimaryGeneratedColumn,
@@ -20,7 +21,7 @@ export class Cylinder {
   @Column({ nullable: false, unique: true })
   name: string;
 
-  @OneToMany(() => Key, (key) => key.cylinder)
+  @ManyToMany(() => Key, (key) => key.cylinder)
   keys: Key[];
 
   @ManyToOne(() => KeySystem, (sys) => sys.cylinders)

api/src/model/entitites/key.entity.ts

@@ -3,6 +3,8 @@ import {
   CreateDateColumn,
   DeleteDateColumn,
   Entity,
+  JoinTable,
+  ManyToMany,
   ManyToOne,
   PrimaryGeneratedColumn,
   UpdateDateColumn,
@@ -28,8 +30,9 @@ export class Key implements IKey {
   @Column({ name: 'lost', default: false })
   keyLost: boolean;
 
-  @ManyToOne(() => Cylinder, (cylinder) => cylinder.keys)
-  cylinder: Cylinder;
+  @ManyToMany(() => Cylinder, (cylinder) => cylinder.keys)
+  @JoinTable()
+  cylinder: Cylinder[];
 
   @ManyToOne(() => Customer, (customer) => customer.keys)
   customer: Customer;

api/src/model/entitites/key_activity.entity.ts

@@ -2,6 +2,7 @@ import {
   Column,
   CreateDateColumn,
   Entity,
+  ManyToMany,
   ManyToOne,
   PrimaryGeneratedColumn,
 } from 'typeorm';
@@ -27,8 +28,8 @@ export class KeyActivity implements IKey {
   @Column({ name: 'handed_out', default: false })
   handedOut: boolean;
 
-  @ManyToOne(() => Cylinder)
-  cylinder: Cylinder;
+  @ManyToMany(() => Cylinder)
+  cylinder: Cylinder[];
 
   @ManyToOne(() => Customer)
   customer: Customer;

api/src/model/interface/key.interface.ts

@@ -5,7 +5,7 @@ export interface IKey {
   name: string;
   nr: string;
   handedOut: boolean;
-  cylinder: Cylinder;
+  cylinder: Cylinder[];
   customer: Customer;
   createdAt: Date;
 }