[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.spec.ts

@@ -2,6 +2,7 @@ import { DonationService } from './donations.service';
 import { DonationsController } from './donations.controller';
 import { Test, TestingModule } from '@nestjs/testing';
 import { mock } from 'jest-mock-extended';
+import { Donation } from './donations.entity';
 
 const mockDonationService = mock<DonationService>();
 
@@ -38,4 +39,17 @@ describe('DonationsController', () => {
       expect(mockDonationService.getNumberOfDonations).toHaveBeenCalled();
     });
   });
+
+  describe('GET /:donationId', () => {
+    it('should return a donation for a given donation ID', async () => {
+      const mockDonation: Partial<Donation> = { donationId: 1 };
+
+      mockDonationService.findOne.mockResolvedValue(mockDonation as Donation);
+
+      const result = await controller.getDonation(1);
+
+      expect(result).toBe(mockDonation);
+      expect(mockDonationService.findOne).toHaveBeenCalledWith(1);
+    });
+  });
 });

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')
@@ -43,15 +42,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 },
@@ -61,11 +51,18 @@ export class DonationsController {
           example: RecurrenceEnum.NONE,
         },
         recurrenceFreq: { type: 'integer', example: 1, nullable: true },
-        nextDonationDates: {
-          type: 'array',
-          items: { type: 'string', format: 'date-time' },
-          example: ['2024-07-01T00:00:00Z', '2024-08-01T00:00:00Z'],
+        repeatOnDays: {
+          type: 'object',
           nullable: true,
+          properties: {
+            Sunday: { type: 'boolean', example: false },
+            Monday: { type: 'boolean', example: true },
+            Tuesday: { type: 'boolean', example: false },
+            Wednesday: { type: 'boolean', example: false },
+            Thursday: { type: 'boolean', example: false },
+            Friday: { type: 'boolean', example: false },
+            Saturday: { type: 'boolean', example: false },
+          },
         },
         occurrencesRemaining: { type: 'integer', example: 2, nullable: true },
       },

apps/backend/src/donations/donations.module.ts

@@ -3,17 +3,12 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 import { Donation } from './donations.entity';
 import { DonationService } from './donations.service';
 import { DonationsController } from './donations.controller';
-import { ManufacturerModule } from '../foodManufacturers/manufacturer.module';
 import { AuthModule } from '../auth/auth.module';
 import { FoodManufacturer } from '../foodManufacturers/manufacturers.entity';
 import { DonationsSchedulerService } from './donations.scheduler';
 
 @Module({
-  imports: [
-    TypeOrmModule.forFeature([Donation, FoodManufacturer]),
-    ManufacturerModule,
-    AuthModule,
-  ],
+  imports: [TypeOrmModule.forFeature([Donation, FoodManufacturer]), AuthModule],
   controllers: [DonationsController],
   providers: [DonationService, DonationsSchedulerService],
 })