[SSF-134]: Update FM Management Frontend

apps/backend/src/config/migrations.ts

@@ -26,9 +26,11 @@ import { UpdatePantryFields1763762628431 } from '../migrations/1763762628431-Upd
 import { PopulateDummyData1768501812134 } from '../migrations/1768501812134-populateDummyData';
 import { RemovePantryFromOrders1769316004958 } from '../migrations/1769316004958-RemovePantryFromOrders';
 import { AddDonationRecurrenceFields1770080947285 } from '../migrations/1770080947285-AddDonationRecurrenceFields';
+import { AddFoodRescueToDonationItems1770679339809 } from '../migrations/1770679339809-AddFoodRescueToDonationItems';
 import { UpdateManufacturerEntity1768680807820 } from '../migrations/1768680807820-UpdateManufacturerEntity';
 import { AddUserPoolId1769189327767 } from '../migrations/1769189327767-AddUserPoolId';
 import { UpdateOrderEntity1769990652833 } from '../migrations/1769990652833-UpdateOrderEntity';
+import { RenameDonationMatchingStatus1771260403657 } from '../migrations/1771260403657-RenameDonationMatchingStatus';
 
 const schemaMigrations = [
   User1725726359198,
@@ -59,9 +61,11 @@ const schemaMigrations = [
   PopulateDummyData1768501812134,
   RemovePantryFromOrders1769316004958,
   AddDonationRecurrenceFields1770080947285,
+  AddFoodRescueToDonationItems1770679339809,
   UpdateManufacturerEntity1768680807820,
   AddUserPoolId1769189327767,
   UpdateOrderEntity1769990652833,
+  RenameDonationMatchingStatus1771260403657,
 ];
 
 export default schemaMigrations;

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

@@ -13,29 +13,29 @@ import { FoodType } from './types';
 @Entity('donation_items')
 export class DonationItem {
   @PrimaryGeneratedColumn({ name: 'item_id' })
-  itemId: number;
+  itemId!: number;
 
   @Column({ name: 'donation_id', type: 'int' })
-  donationId: number;
+  donationId!: number;
 
   @ManyToOne(() => Donation, { nullable: false })
   @JoinColumn({ name: 'donation_id', referencedColumnName: 'donationId' })
-  donation: Donation;
+  donation!: Donation;
 
   @Column({ name: 'item_name', type: 'varchar', length: 255 })
-  itemName: string;
+  itemName!: string;
 
   @Column({ name: 'quantity', type: 'int' })
-  quantity: number;
+  quantity!: number;
 
   @Column({ name: 'reserved_quantity', type: 'int', default: 0 })
-  reservedQuantity: number;
+  reservedQuantity!: number;
 
   @Column({ name: 'oz_per_item', type: 'int', nullable: true })
-  ozPerItem: number;
+  ozPerItem?: number;
 
   @Column({ name: 'estimated_value', type: 'int', nullable: true })
-  estimatedValue: number;
+  estimatedValue?: number;
 
   @Column({
     name: 'food_type',
@@ -44,8 +44,11 @@ export class DonationItem {
     enumName: 'food_type_enum',
     nullable: true,
   })
-  foodType: FoodType;
+  foodType?: FoodType;
 
   @OneToMany(() => Allocation, (allocation) => allocation.item)
-  allocations: Allocation[];
+  allocations!: Allocation[];
+
+  @Column({ name: 'food_rescue', type: 'boolean', default: false })
+  foodRescue!: boolean;
 }

apps/backend/src/donations/donations.controller.ts

@@ -7,12 +7,11 @@ import {
   Param,
   NotFoundException,
   ParseIntPipe,
-  BadRequestException,
 } from '@nestjs/common';
 import { ApiBody } from '@nestjs/swagger';
 import { Donation } from './donations.entity';
 import { DonationService } from './donations.service';
-import { DonationStatus, RecurrenceEnum } from './types';
+import { RecurrenceEnum } from './types';
 import { CreateDonationDto } from './dtos/create-donation.dto';
 
 @Controller('donations')
@@ -29,7 +28,14 @@ export class DonationsController {
     return this.donationService.getNumberOfDonations();
   }
 
-  @Get('/:donationId')
+  @Get('/by-fm-id/:foodManufacturerId')
+  async getDonationsByFoodManufacturer(
+    @Param('foodManufacturerId', ParseIntPipe) foodManufacturerId: number,
+  ): Promise<Donation[]> {
+    return this.donationService.getByFoodManufacturer(foodManufacturerId);
+  }
+
+  @Get('/by-donation-id/:donationId')
   async getDonation(
     @Param('donationId', ParseIntPipe) donationId: number,
   ): Promise<Donation> {
@@ -43,15 +49,6 @@ export class DonationsController {
       type: 'object',
       properties: {
         foodManufacturerId: { type: 'integer', example: 1 },
-        dateDonated: {
-          type: 'string',
-          format: 'date-time',
-        },
-        status: {
-          type: 'string',
-          enum: Object.values(DonationStatus),
-          example: DonationStatus.AVAILABLE,
-        },
         totalItems: { type: 'integer', example: 100 },
         totalOz: { type: 'number', example: 100.5 },
         totalEstimatedValue: { type: 'number', example: 100.5 },

apps/backend/src/donations/donations.service.ts

@@ -22,7 +22,6 @@ export class DonationService {
       where: { donationId },
       relations: ['foodManufacturer'],
     });
-
     if (!donation) {
       throw new NotFoundException(`Donation ${donationId} not found`);
     }
@@ -39,6 +38,25 @@ export class DonationService {
     return this.repo.count();
   }
 
+  async getByFoodManufacturer(foodManufacturerId: number): Promise<Donation[]> {
+    validateId(foodManufacturerId, 'Food Manufacturer');
+
+    const manufacturer = await this.manufacturerRepo.findOne({
+      where: { foodManufacturerId: foodManufacturerId },
+    });
+
+    if (!manufacturer) {
+      throw new NotFoundException(
+        `Food Manufacturer ${foodManufacturerId} not found`,
+      );
+    }
+
+    return this.repo.find({
+      where: { foodManufacturer: { foodManufacturerId } },
+      relations: ['foodManufacturer'],
+    });
+  }
+
   async create(donationData: CreateDonationDto): Promise<Donation> {
     validateId(donationData.foodManufacturerId, 'Food Manufacturer');
     const manufacturer = await this.manufacturerRepo.findOne({
@@ -52,8 +70,8 @@ export class DonationService {
     }
     const donation = this.repo.create({
       foodManufacturer: manufacturer,
-      dateDonated: donationData.dateDonated,
-      status: donationData.status,
+      dateDonated: new Date(),
+      status: DonationStatus.AVAILABLE,
       totalItems: donationData.totalItems,
       totalOz: donationData.totalOz,
       totalEstimatedValue: donationData.totalEstimatedValue,

apps/backend/src/donations/dtos/create-donation.dto.ts

@@ -9,23 +9,14 @@ import {
   Min,
   ValidateIf,
 } from 'class-validator';
-import { DonationStatus, RecurrenceEnum } from '../types';
+import { RecurrenceEnum } from '../types';
 import { Type } from 'class-transformer';
 
 export class CreateDonationDto {
   @IsNumber()
   @Min(1)
   foodManufacturerId!: number;
 
-  @Type(() => Date)
-  @IsDate()
-  @IsNotEmpty()
-  dateDonated!: Date;
-
-  @IsNotEmpty()
-  @IsEnum(DonationStatus)
-  status!: DonationStatus;
-
   @IsNumber()
   @Min(1)
   @IsOptional()

apps/backend/src/donations/types.ts

@@ -1,7 +1,7 @@
 export enum DonationStatus {
   AVAILABLE = 'available',
   FULFILLED = 'fulfilled',
-  MATCHING = 'matching',
+  MATCHED = 'matched',
 }
 
 export enum RecurrenceEnum {

apps/backend/src/migrations/1770679339809-AddFoodRescueToDonationItems.ts

@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddFoodRescueToDonationItems1770679339809
+  implements MigrationInterface
+{
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+            ALTER TABLE donation_items
+            ADD COLUMN food_rescue boolean NOT NULL DEFAULT false
+        `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+            ALTER TABLE donation_items
+            DROP COLUMN food_rescue
+        `);
+  }
+}

apps/backend/src/migrations/1771260403657-RenameDonationMatchingStatus.ts

@@ -0,0 +1,71 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RenameDonationMatchingStatus1771260403657
+  implements MigrationInterface
+{
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+            ALTER TABLE donations
+              ALTER COLUMN status DROP DEFAULT;
+
+            CREATE TYPE donations_status_enum_new AS ENUM (
+              'available',
+              'matched',
+              'fulfilled'
+            );
+
+            ALTER TABLE donations
+              ALTER COLUMN status
+              TYPE donations_status_enum_new
+              USING (
+                CASE
+                  WHEN status = 'matching'
+                    THEN 'matched'
+                  ELSE status::text
+                END
+              )::donations_status_enum_new;
+
+            DROP TYPE donations_status_enum;
+
+            ALTER TYPE donations_status_enum_new
+              RENAME TO donations_status_enum;
+
+            ALTER TABLE donations
+              ALTER COLUMN status
+              SET DEFAULT 'available';
+        `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+            ALTER TABLE donations
+              ALTER COLUMN status DROP DEFAULT;
+
+            CREATE TYPE donations_status_enum_old AS ENUM (
+              'available',
+              'matching',
+              'fulfilled'
+            );
+
+            ALTER TABLE donations
+              ALTER COLUMN status
+              TYPE donations_status_enum_old
+              USING (
+                CASE
+                  WHEN status = 'matched'
+                    THEN 'matching'
+                  ELSE status::text
+                END
+              )::donations_status_enum_old;
+
+            DROP TYPE donations_status_enum;
+
+            ALTER TYPE donations_status_enum_old
+              RENAME TO donations_status_enum;
+
+            ALTER TABLE donations
+              ALTER COLUMN status
+              SET DEFAULT 'available';
+        `);
+  }
+}

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

@@ -21,7 +21,7 @@ describe('OrdersService', () => {
     }
 
     // Clean database at the start
-    await testDataSource.query(`DROP SCHEMA public CASCADE`);
+    await testDataSource.query(`DROP SCHEMA IF EXISTS public CASCADE`);
     await testDataSource.query(`CREATE SCHEMA public`);
 
     const module: TestingModule = await Test.createTestingModule({

apps/frontend/src/api/apiClient.ts

@@ -101,6 +101,14 @@ export class ApiClient {
       .then((response) => response.data);
   }
 
+  public async getAllDonationsByFoodManufacturer(
+    foodManufacturerId: number,
+  ): Promise<Donation[]> {
+    return this.axiosInstance
+      .get(`/api/donations/by-fm-id/${foodManufacturerId}`)
+      .then((response) => response.data);
+  }
+
   public async fulfillDonation(
     donationId: number,
     body?: unknown,
@@ -180,12 +188,14 @@ export class ApiClient {
     await this.axiosInstance.put(`/api/users/${userId}/role`, body);
   }
 
-  public async getOrderFoodRequest(requestId: number): Promise<FoodRequest> {
+  public async getFoodRequest(requestId: number): Promise<FoodRequest> {
     return this.get(`/api/requests/${requestId}`) as Promise<FoodRequest>;
   }
 
-  public async getOrderDonation(donationId: number): Promise<Donation> {
-    return this.get(`/api/donations/${donationId}`) as Promise<Donation>;
+  public async getDonation(donationId: number): Promise<Donation> {
+    return this.get(
+      `/api/donations/by-donation-id/${donationId}`,
+    ) as Promise<Donation>;
   }
 
   public async getDonationItemsByDonationId(

apps/frontend/src/app.tsx

@@ -7,7 +7,6 @@ import PantryPastOrders from '@containers/pantryPastOrders';
 import Pantries from '@containers/pantries';
 import Orders from '@containers/orders';
 import PantryDashboard from '@containers/pantryDashboard';
-import submitFoodRequestFormModal from '@components/forms/requestFormModal';
 import { submitDeliveryConfirmationFormModal } from '@components/forms/deliveryConfirmationModal';
 import FormRequests from '@containers/formRequests';
 import PantryApplication from '@containers/pantryApplication';
@@ -22,6 +21,8 @@ import Homepage from '@containers/homepage';
 import AdminOrderManagement from '@containers/adminOrderManagement';
 import { Amplify } from 'aws-amplify';
 import CognitoAuthConfig from './aws-exports';
+import { Button } from '@chakra-ui/react';
+import FoodManufacturerDonationManagement from '@containers/foodManufacturerDonationManagement';
 import LoginPage from '@containers/loginPage';
 import SignupPage from '@containers/signupPage';
 import ForgotPasswordPage from '@containers/forgotPasswordPage';
@@ -153,10 +154,10 @@ const router = createBrowserRouter([
         ),
       },
       {
-        path: '/donation-management',
+        path: '/fm-donation-management',
         element: (
           <ProtectedRoute>
-            <DonationManagement />
+            <FoodManufacturerDonationManagement />
           </ProtectedRoute>
         ),
       },

apps/frontend/src/chakra-ui.d.ts

@@ -70,6 +70,10 @@ declare module '@chakra-ui/react' {
   export interface FieldRootProps extends ComponentPropsLenientChildren {}
   export interface FieldHelperTextProps extends ComponentPropsLenientChildren {}
 
+  // Native Select components
+  export interface NativeSelectFieldProps
+    extends ComponentPropsLenientChildren {}
+
   // Common components
   export interface ButtonProps extends ComponentPropsStrictChildren {}
   export interface IconButtonProps extends ComponentPropsStrictChildren {}
@@ -79,4 +83,6 @@ declare module '@chakra-ui/react' {
   export interface CardProps extends ComponentPropsStrictChildren {}
   export interface CardBodyProps extends ComponentPropsStrictChildren {}
   export interface TextareaProps extends ComponentPropsStrictChildren {}
+  export interface NumberInputInputProps
+    extends ComponentPropsLenientChildren {}
 }