SSF-80 Resolving backend DB inconsistencies

apps/backend/src/allocations/allocations.entity.ts

@@ -15,7 +15,7 @@ export class Allocation {
   @Column({ name: 'order_id', type: 'int' })
   orderId: number;
 
-  @Column({ name: 'item_id', type: 'int' })
+  @Column({ name: 'item_id', type: 'int', nullable: false })
   itemId: number;
 
   @ManyToOne(() => DonationItem, (item) => item.allocations)

apps/backend/src/config/typeorm.ts

@@ -17,6 +17,7 @@ import { UpdateRequestTable1741571847063 } from '../migrations/1741571847063-upd
 import { RemoveOrderIdFromRequests1744133526650 } from '../migrations/1744133526650-removeOrderIdFromRequests.ts';
 import { AddOrders1739496585940 } from '../migrations/1739496585940-addOrders';
 import { UpdatePantriesTable1742739750279 } from '../migrations/1742739750279-updatePantriesTable';
+import { RemoveOrdersDonationId1761500262238 } from '../migrations/1761500262238-RemoveOrdersDonationId';
 
 const config = {
   type: 'postgres',
@@ -47,6 +48,7 @@ const config = {
     UpdateFoodRequests1744051370129,
     RemoveOrderIdFromRequests1744133526650,
     UpdatePantriesTable1742739750279,
+    RemoveOrdersDonationId1761500262238,
   ],
 };
 

apps/backend/src/foodRequests/request.entity.ts

@@ -3,7 +3,7 @@ import {
   Column,
   PrimaryGeneratedColumn,
   CreateDateColumn,
-  OneToOne,
+  OneToMany,
 } from 'typeorm';
 import { Order } from '../orders/order.entity';
 
@@ -40,6 +40,6 @@ export class FoodRequest {
   @Column({ name: 'photos', type: 'text', array: true, nullable: true })
   photos: string[];
 
-  @OneToOne(() => Order, (order) => order.request, { nullable: true })
+  @OneToMany(() => Order, (order) => order.request, { nullable: true })
   order: Order;
 }

apps/backend/src/migrations/1761500262238-RemoveOrdersDonationId.ts

@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RemoveOrdersDonationId1761500262238 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+                    ALTER TABLE orders
+                    DROP COLUMN donation_id
+                `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+                    ALTER TABLE orders
+                    ADD COLUMN donation_id INT NOT NULL
+                `);
+  }
+}

apps/backend/src/orders/order.controller.ts

@@ -12,7 +12,6 @@ import { Order } from './order.entity';
 import { Pantry } from '../pantries/pantries.entity';
 import { FoodManufacturer } from '../foodManufacturers/manufacturer.entity';
 import { FoodRequest } from '../foodRequests/request.entity';
-import { Donation } from '../donations/donations.entity';
 import { AllocationsService } from '../allocations/allocations.service';
 
 @Controller('orders')
@@ -66,13 +65,6 @@ export class OrdersController {
     return this.ordersService.findOrderFoodManufacturer(orderId);
   }
 
-  @Get(':orderId/donation')
-  async getDonationFromOrder(
-    @Param('orderId', ParseIntPipe) orderId: number,
-  ): Promise<Donation> {
-    return this.ordersService.findOrderDonation(orderId);
-  }
-
   @Get('/:orderId')
   async getOrder(
     @Param('orderId', ParseIntPipe) orderId: number,

apps/backend/src/orders/order.entity.ts

@@ -10,7 +10,6 @@ import {
 import { FoodRequest } from '../foodRequests/request.entity';
 import { Pantry } from '../pantries/pantries.entity';
 import { FoodManufacturer } from '../foodManufacturers/manufacturer.entity';
-import { Donation } from '../donations/donations.entity';
 
 @Entity('orders')
 export class Order {
@@ -24,7 +23,7 @@ export class Order {
   })
   pantry: Pantry;
 
-  @OneToOne(() => FoodRequest, { nullable: false })
+  @ManyToOne(() => FoodRequest, { nullable: false })
   @JoinColumn({
     name: 'request_id',
     referencedColumnName: 'requestId',
@@ -34,7 +33,7 @@ export class Order {
   @Column({ name: 'request_id' })
   requestId: number;
 
-  @ManyToOne(() => FoodManufacturer, { nullable: true })
+  @ManyToOne(() => FoodManufacturer, { nullable: false })
   @JoinColumn({
     name: 'shipped_by',
     referencedColumnName: 'foodManufacturerId',
@@ -44,13 +43,6 @@ export class Order {
   @Column({ name: 'shipped_by', nullable: true })
   shippedBy: number;
 
-  @ManyToOne(() => Donation, { nullable: false })
-  @JoinColumn({
-    name: 'donation_id',
-    referencedColumnName: 'donationId',
-  })
-  donation: Donation;
-
   @Column({ name: 'status', type: 'varchar', length: 25, default: 'pending' })
   status: string;
 

apps/backend/src/orders/order.service.ts

@@ -116,20 +116,6 @@ export class OrdersService {
     return order.foodManufacturer;
   }
 
-  async findOrderDonation(orderId: number): Promise<Donation> {
-    validateId(orderId, 'Order');
-
-    const order = await this.repo.findOne({
-      where: { orderId },
-      relations: ['donation'],
-    });
-
-    if (!order) {
-      throw new NotFoundException(`Order ${orderId} not found`);
-    }
-    return order.donation;
-  }
-
   async updateStatus(orderId: number, newStatus: string) {
     validateId(orderId, 'Order');
 

apps/frontend/src/api/apiClient.ts

@@ -144,12 +144,6 @@ export class ApiClient {
     return this.get(`/api/requests/${requestId}`) as Promise<FoodRequest>;
   }
 
-  public async getDonationFromOrder(orderId: number): Promise<Donation | null> {
-    return this.axiosInstance
-      .get(`/api/orders/${orderId}/donation`)
-      .then((response) => response.data);
-  }
-
   public async getOrderDonation(donationId: number): Promise<Donation> {
     return this.get(`/api/donations/${donationId}`) as Promise<Donation>;
   }