260321:1700 Correct Coresspondence / Doing RFA

backend/src/modules/rfa/entities/rfa-item.entity.ts

@@ -1,14 +1,34 @@
-import { Entity, ManyToOne, JoinColumn, PrimaryColumn } from 'typeorm';
+import {
+  Column,
+  Entity,
+  JoinColumn,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+} from 'typeorm';
 import { RfaRevision } from './rfa-revision.entity';
+import { AsBuiltDrawingRevision } from '../../drawing/entities/asbuilt-drawing-revision.entity';
 import { ShopDrawingRevision } from '../../drawing/entities/shop-drawing-revision.entity';
 
 @Entity('rfa_items')
 export class RfaItem {
-  @PrimaryColumn({ name: 'rfa_revision_id' })
+  @PrimaryGeneratedColumn()
+  id!: number;
+
+  @Column({ name: 'rfa_revision_id' })
   rfaRevisionId!: number;
 
-  @PrimaryColumn({ name: 'shop_drawing_revision_id' })
-  shopDrawingRevisionId!: number;
+  @Column({
+    name: 'item_type',
+    type: 'enum',
+    enum: ['SHOP', 'AS_BUILT'],
+  })
+  itemType!: 'SHOP' | 'AS_BUILT';
+
+  @Column({ name: 'shop_drawing_revision_id', nullable: true })
+  shopDrawingRevisionId?: number;
+
+  @Column({ name: 'asbuilt_drawing_revision_id', nullable: true })
+  asBuiltDrawingRevisionId?: number;
 
   // Relations
   @ManyToOne(() => RfaRevision, (rfaRev) => rfaRev.items, {
@@ -19,5 +39,9 @@ export class RfaItem {
 
   @ManyToOne(() => ShopDrawingRevision)
   @JoinColumn({ name: 'shop_drawing_revision_id' })
-  shopDrawingRevision!: ShopDrawingRevision;
+  shopDrawingRevision?: ShopDrawingRevision;
+
+  @ManyToOne(() => AsBuiltDrawingRevision)
+  @JoinColumn({ name: 'asbuilt_drawing_revision_id' })
+  asBuiltDrawingRevision?: AsBuiltDrawingRevision;
 }