SSF-57 Making up to date

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,8 @@ import { UpdateRequestTable1741571847063 } from '../migrations/1741571847063-upd
 import { RemoveOrderIdFromRequests1744133526650 } from '../migrations/1744133526650-removeOrderIdFromRequests';
 import { AddOrders1739496585940 } from '../migrations/1739496585940-addOrders';
 import { UpdatePantriesTable1742739750279 } from '../migrations/1742739750279-updatePantriesTable';
+import { UpdatePantryUserFields1731171000000 } from '../migrations/1731171000000-UpdatePantryUserFields';
+import { RemoveOrdersDonationId1761500262238 } from '../migrations/1761500262238-RemoveOrdersDonationId';
 
 const config = {
   type: 'postgres',
@@ -47,6 +49,8 @@ const config = {
     UpdateFoodRequests1744051370129,
     RemoveOrderIdFromRequests1744133526650,
     UpdatePantriesTable1742739750279,
+    UpdatePantryUserFields1731171000000,
+    RemoveOrdersDonationId1761500262238,
   ],
 };
 

apps/backend/src/donationItems/donationItems.entity.ts

@@ -14,9 +14,6 @@ export class DonationItem {
   @PrimaryGeneratedColumn({ name: 'item_id' })
   itemId: number;
 
-  @Column({ name: 'donation_id', type: 'int' })
-  donationId: number;
-
   @ManyToOne(() => Donation, { nullable: false })
   @JoinColumn({ name: 'donation_id', referencedColumnName: 'donationId' })
   donation: Donation;

apps/backend/src/donationItems/donationItems.module.ts

@@ -5,9 +5,10 @@ import { DonationItem } from './donationItems.entity';
 import { JwtStrategy } from '../auth/jwt.strategy';
 import { AuthService } from '../auth/auth.service';
 import { DonationItemsController } from './donationItems.controller';
+import { Donation } from '../donations/donations.entity';
 
 @Module({
-  imports: [TypeOrmModule.forFeature([DonationItem])],
+  imports: [TypeOrmModule.forFeature([DonationItem, Donation])],
   controllers: [DonationItemsController],
   providers: [DonationItemsService, AuthService, JwtStrategy],
 })

apps/backend/src/donationItems/donationItems.service.ts

@@ -3,16 +3,18 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { DonationItem } from './donationItems.entity';
 import { validateId } from '../utils/validation.utils';
+import { Donation } from '../donations/donations.entity';
 
 @Injectable()
 export class DonationItemsService {
   constructor(
     @InjectRepository(DonationItem) private repo: Repository<DonationItem>,
+    @InjectRepository(Donation) private donationRepo: Repository<Donation>,
   ) {}
 
   async getAllDonationItems(donationId: number): Promise<DonationItem[]> {
     validateId(donationId, 'Donation');
-    return this.repo.findBy({ donationId });
+    return this.repo.find({ where: { donation: { donationId } } });
   }
 
   async create(
@@ -25,8 +27,12 @@ export class DonationItemsService {
     estimatedValue: number,
     foodType: string,
   ) {
+    validateId(donationId, 'Donation');
+    const donation = await this.donationRepo.findOneBy({ donationId });
+    if (!donation) throw new NotFoundException('Donation not found');
+
     const donationItem = this.repo.create({
-      donationId,
+      donation,
       itemName,
       quantity,
       reservedQuantity,

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/1731171000000-UpdatePantryUserFields.ts

@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class UpdatePantryUserFields1731171000000 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE pantries DROP COLUMN IF EXISTS ssf_representative_id;
+       ALTER TABLE pantries RENAME COLUMN pantry_representative_id TO pantry_user_id;`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE pantries RENAME COLUMN pantry_user_id TO pantry_representative_id;
+       ALTER TABLE pantries ADD COLUMN ssf_representative_id INT;
+       ALTER TABLE pantries ADD CONSTRAINT fk_ssf_representative_id 
+       FOREIGN KEY (ssf_representative_id) REFERENCES users(user_id);`,
+    );
+  }
+}

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

@@ -5,12 +5,11 @@
   CreateDateColumn,
   ManyToOne,
   JoinColumn,
   OneToOne,
 } from 'typeorm';
 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 @@
   })
   pantry: Pantry;
 
-  @OneToOne(() => FoodRequest, { nullable: false })
+  @ManyToOne(() => FoodRequest, { nullable: false })
   @JoinColumn({
     name: 'request_id',
     referencedColumnName: 'requestId',
@@ -34,7 +33,7 @@
   @Column({ name: 'request_id' })
   requestId: number;
 
-  @ManyToOne(() => FoodManufacturer, { nullable: true })
+  @ManyToOne(() => FoodManufacturer, { nullable: false })
   @JoinColumn({
     name: 'shipped_by',
     referencedColumnName: 'foodManufacturerId',
@@ -44,13 +43,6 @@
   @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.spec.ts

@@ -28,7 +28,7 @@ const mockPantry: Pantry = {
   serveAllergicChildren: '',
   newsletterSubscription: false,
   restrictions: [],
-  pantryRepresentative: null as unknown as User,
+  pantryUser: null as unknown as User,
   status: 'active',
   dateApplied: new Date(),
   activities: [],

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

@@ -5,7 +5,7 @@
 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 { validateId } from '../utils/validation.utils';
 
 @Injectable()
@@ -116,20 +116,6 @@
     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/backend/src/pantries/pantries.controller.ts

@@ -8,7 +8,6 @@ import {
 } from '@nestjs/common';
 import { Pantry } from './pantries.entity';
 import { PantriesService } from './pantries.service';
-import { User } from '../users/user.entity';
 import { PantryApplicationDto } from './dtos/pantry-application.dto';
 import { ApiBody } from '@nestjs/swagger';
 
@@ -21,13 +20,6 @@ export class PantriesController {
     return this.pantriesService.getPendingPantries();
   }
 
-  @Get('/:pantryId/ssf-contact')
-  async getSSFRep(
-    @Param('pantryId', ParseIntPipe) pantryId: number,
-  ): Promise<User> {
-    return this.pantriesService.findSSFRep(pantryId);
-  }
-
   @Get('/:pantryId')
   async getPantry(
     @Param('pantryId', ParseIntPipe) pantryId: number,

apps/backend/src/pantries/pantries.entity.ts

@@ -4,7 +4,6 @@ import {
   PrimaryGeneratedColumn,
   OneToOne,
   JoinColumn,
-  ManyToOne,
 } from 'typeorm';
 import { User } from '../users/user.entity';
 
@@ -89,22 +88,15 @@ export class Pantry {
   @Column({ name: 'restrictions', type: 'text', array: true })
   restrictions: string[];
 
-  @ManyToOne(() => User, { nullable: true })
-  @JoinColumn({
-    name: 'ssf_representative_id',
-    referencedColumnName: 'id',
-  })
-  ssfRepresentative?: User;
-
   // cascade: ['insert'] means that when we create a new
-  // pantry, the representative will automatically be added
+  // pantry, the pantry user will automatically be added
   // to the User table
-  @OneToOne(() => User, { nullable: false, cascade: ['insert'] })
+  @OneToOne(() => User, { nullable: false, cascade: ['insert'], onDelete: 'CASCADE' })  
   @JoinColumn({
-    name: 'pantry_representative_id',
+    name: 'pantry_user_id',
     referencedColumnName: 'id',
   })
-  pantryRepresentative: User;
+  pantryUser: User;
 
   @Column({ name: 'status', type: 'varchar', length: 50, default: 'pending' })
   status: string;

apps/backend/src/pantries/pantries.service.ts

@@ -23,7 +23,10 @@ export class PantriesService {
   }
 
   async getPendingPantries(): Promise<Pantry[]> {
-    return await this.repo.find({ where: { status: 'pending' } });
+    return await this.repo.find({
+      where: { status: 'pending' },
+      relations: ['pantryUser'],
+    });
   }
 
   async addPantry(pantryData: PantryApplicationDto) {
@@ -36,7 +39,7 @@ export class PantriesService {
     pantryContact.email = pantryData.contactEmail;
     pantryContact.phone = pantryData.contactPhone;
 
-    pantry.pantryRepresentative = pantryContact;
+    pantry.pantryUser = pantryContact;
 
     pantry.pantryName = pantryData.pantryName;
     pantry.addressLine1 = pantryData.addressLine1;
@@ -86,19 +89,4 @@ export class PantriesService {
 
     await this.repo.update(id, { status: 'denied' });
   }
-
-  async findSSFRep(pantryId: number): Promise<User> {
-    validateId(pantryId, 'Pantry');
-
-    const pantry = await this.repo.findOne({
-      where: { pantryId },
-      relations: ['ssfRepresentative'],
-    });
-
-    if (!pantry) {
-      throw new NotFoundException(`Pantry ${pantryId} not found`);
-    }
-
-    return pantry.ssfRepresentative;
-  }
 }

apps/backend/src/volunteerAssignments/volunteerAssignments.entity.ts

@@ -4,7 +4,7 @@
   OneToOne,
   JoinColumn,
   ManyToOne,
   Column,
 } from 'typeorm';
 import { User } from '../users/user.entity';
 import { Pantry } from '../pantries/pantries.entity';
@@ -14,9 +14,6 @@
   @PrimaryGeneratedColumn({ name: 'assignment_id' })
   assignmentId: number;
 
-  @Column({ name: 'volunteer_id' })
-  volunteerId: number;
-
   @ManyToOne(() => User, { nullable: false })
   @JoinColumn({
     name: 'volunteer_id',

apps/frontend/src/api/apiClient.ts

@@ -151,12 +151,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>;
   }