itizawa hace 5 años
padre
commit
a6d1ba5400

+ 0 - 4
packages/slackbot-proxy/src/entities/order.ts

@@ -2,7 +2,6 @@ import {
   Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn, ManyToOne, OneToOne,
 } from 'typeorm';
 import { Installation } from './installation';
-import { Relation } from './relation';
 
 @Entity()
 export class Order {
@@ -19,9 +18,6 @@ export class Order {
   @ManyToOne(() => Installation)
   readonly installation: number;
 
-  @OneToOne(() => Relation, relation => relation.order)
-  relation: Relation;
-
   @Column({ nullable: true, default: false })
   isCompleted?: boolean;
 

+ 4 - 6
packages/slackbot-proxy/src/entities/relation.ts

@@ -1,10 +1,10 @@
 import {
-  Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn, ManyToOne, OneToOne, JoinColumn,
+  Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn, ManyToOne,Index
 } from 'typeorm';
 import { Installation } from './installation';
-import { Order } from './order';
 
 @Entity()
+@Index(["installation", "growiUri"], { unique: true })
 export class Relation {
 
   @PrimaryGeneratedColumn()
@@ -19,14 +19,12 @@ export class Relation {
   @ManyToOne(() => Installation)
   readonly installation: number;
 
-  @OneToOne(() => Order)
-  @JoinColumn()
-  order: Order;
-
   @Column()
+  @Index({ unique: true })
   tokenGtoP: string;
 
   @Column()
+  @Index()
   tokenPtoG: string;
 
   @Column()