Merge branch 'main' into jw/ssf-173-fm-donationitem-endpoints

Author: Juwang110

apps/backend/src/config/migrations.ts

@@ -33,6 +33,7 @@ import { UpdateOrderEntity1769990652833 } from '../migrations/1769990652833-Upda
 import { DonationItemFoodTypeNotNull1771524930613 } from '../migrations/1771524930613-DonationItemFoodTypeNotNull';
 import { MoveRequestFieldsToOrders1770571145350 } from '../migrations/1770571145350-MoveRequestFieldsToOrders';
 import { RenameDonationMatchingStatus1771260403657 } from '../migrations/1771260403657-RenameDonationMatchingStatus';
+import { AddAssigneeToOrders1773009000618 } from '../migrations/1773009000618-AddAssigneeToOrders';
 import { DropDonationTotalColumns1772241115031 } from '../migrations/1772241115031-DropDonationTotalColumns';
 import { FixTrackingLinks1773041840374 } from '../migrations/1773041840374-FixTrackingLinks';
 import { CleanupRequestsAndAllocations1771821377918 } from '../migrations/1771821377918-CleanupRequestsAndAllocations';
@@ -75,6 +76,7 @@ const schemaMigrations = [
   DonationItemFoodTypeNotNull1771524930613,
   MoveRequestFieldsToOrders1770571145350,
   RenameDonationMatchingStatus1771260403657,
+  AddAssigneeToOrders1773009000618,
   DropDonationTotalColumns1772241115031,
   FixTrackingLinks1773041840374,
   CleanupRequestsAndAllocations1771821377918,

apps/backend/src/donationItems/dtos/create-donation-items.dto.ts

@@ -8,8 +8,9 @@ import {
   IsNotEmpty,
   Length,
   IsOptional,
+  IsInt,
 } from 'class-validator';
-import { Type } from 'class-transformer';
+import { Transform, Type } from 'class-transformer';
 import { FoodType } from '../types';
 
 export class CreateDonationItemDto {
@@ -18,21 +19,30 @@ export class CreateDonationItemDto {
   @Length(1, 255)
   itemName!: string;
 
-  @IsNumber()
-  @Min(1)
+  @Transform(({ value }) => parseInt(value, 10))
+  @IsInt({ message: 'Quantity must be an integer value' })
+  @Min(1, { message: 'Quantity must be at least 1' })
   quantity!: number;
 
-  @IsNumber()
+  @IsInt()
   @Min(0)
   reservedQuantity!: number;
 
-  @IsNumber()
-  @Min(0.01)
+  @Transform(({ value }) => parseFloat(value))
+  @IsNumber(
+    { maxDecimalPlaces: 2 },
+    { message: 'Oz per item must have at most 2 decimal places' },
+  )
+  @Min(0.01, { message: 'Oz per item must be at least 0.01' })
   @IsOptional()
   ozPerItem?: number;
 
-  @IsNumber()
-  @Min(0.01)
+  @Transform(({ value }) => parseFloat(value))
+  @IsNumber(
+    { maxDecimalPlaces: 2 },
+    { message: 'Estimated value must have at most 2 decimal places' },
+  )
+  @Min(0.01, { message: 'Estimated value must be at least 0.01' })
   @IsOptional()
   estimatedValue?: number;
 

apps/backend/src/migrations/1773009000618-AddAssigneeToOrders.ts

@@ -0,0 +1,30 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddAssigneeToOrders1773009000618 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE orders ADD COLUMN assignee_id INT`);
+
+    await queryRunner.query(`
+      UPDATE orders o SET assignee_id = (
+        SELECT va.volunteer_id FROM volunteer_assignments va
+        JOIN food_requests fr ON fr.pantry_id = va.pantry_id
+        WHERE fr.request_id = o.request_id
+        LIMIT 1
+      )
+    `);
+
+    await queryRunner.query(`
+      ALTER TABLE orders
+        ALTER COLUMN assignee_id SET NOT NULL,
+        ADD CONSTRAINT fk_assignee_id FOREIGN KEY (assignee_id) REFERENCES users(user_id) ON DELETE RESTRICT
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE orders
+        DROP CONSTRAINT IF EXISTS fk_assignee_id,
+        DROP COLUMN assignee_id
+    `);
+  }
+}

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

@@ -11,6 +11,7 @@ import { FoodRequest } from '../foodRequests/request.entity';
 import { FoodManufacturer } from '../foodManufacturers/manufacturers.entity';
 import { OrderStatus } from './types';
 import { Allocation } from '../allocations/allocations.entity';
+import { User } from '../users/users.entity';
 
 @Entity('orders')
 export class Order {
@@ -99,4 +100,11 @@ export class Order {
     },
   })
   shippingCost!: number | null;
+
+  @ManyToOne(() => User, { nullable: false, onDelete: 'RESTRICT' })
+  @JoinColumn({ name: 'assignee_id' })
+  assignee!: User;
+
+  @Column({ name: 'assignee_id', type: 'int' })
+  assigneeId!: number;
 }

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

@@ -578,7 +578,6 @@ describe('OrdersService', () => {
     it('should update order with delivery details and set status to delivered but request remains active', async () => {
       const orderRepo = testDataSource.getRepository(Order);
       const requestRepo = testDataSource.getRepository(FoodRequest);
-
       // Get an existing shipped order
       const existingShippedOrder = await orderRepo.findOne({
         where: { status: OrderStatus.SHIPPED },
@@ -594,6 +593,7 @@ describe('OrdersService', () => {
       const secondOrder = orderRepo.create({
         requestId: existingShippedOrder.requestId,
         foodManufacturerId: existingShippedOrder.foodManufacturerId,
+        assigneeId: existingShippedOrder.assigneeId,
         status: OrderStatus.SHIPPED,
         shippedAt: new Date(),
       });

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

@@ -31,7 +31,7 @@ export class OrdersService {
       .createQueryBuilder('order')
       .leftJoinAndSelect('order.request', 'request')
       .leftJoinAndSelect('request.pantry', 'pantry')
-      .leftJoinAndSelect('pantry.volunteers', 'volunteers')
+      .leftJoinAndSelect('order.assignee', 'assignee')
       .select([
         'order.orderId',
         'order.status',
@@ -40,9 +40,9 @@ export class OrdersService {
         'order.deliveredAt',
         'request.pantryId',
         'pantry.pantryName',
-        'volunteers.id',
-        'volunteers.firstName',
-        'volunteers.lastName',
+        'assignee.id',
+        'assignee.firstName',
+        'assignee.lastName',
       ]);
 
     if (filters?.status) {

apps/backend/src/users/users.service.spec.ts

@@ -232,6 +232,11 @@ describe('UsersService', () => {
 
   describe('remove', () => {
     it('should remove a user by id', async () => {
+      await testDataSource.query(
+        `DELETE FROM allocations WHERE order_id IN (SELECT order_id FROM orders WHERE assignee_id = 6)`,
+      );
+      await testDataSource.query(`DELETE FROM orders WHERE assignee_id = 6`);
+
       const result = await service.remove(6);
 
       expect(result.email).toBe('james.t@volunteer.org');

apps/backend/src/volunteers/volunteers.service.spec.ts

@@ -139,7 +139,8 @@ describe('VolunteersService', () => {
 
   describe('getVolunteersAndPantryAssignments', () => {
     it('returns an empty array when there are no volunteers', async () => {
-      // Delete all users with role 'volunteer' (CASCADE will handle related data)
+      await testDataSource.query(`DELETE FROM allocations`);
+      await testDataSource.query(`DELETE FROM orders`);
       await testDataSource.query(
         `DELETE FROM "users" WHERE role = 'volunteer'`,
       );

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

@@ -78,6 +78,12 @@ declare module '@chakra-ui/react' {
   export interface NativeSelectFieldProps
     extends ComponentPropsLenientChildren {}
 
+  // Tooltip components
+  export interface TooltipTriggerProps extends ComponentPropsLenientChildren {}
+  export interface TooltipPositionerProps
+    extends ComponentPropsLenientChildren {}
+  export interface TooltipContentProps extends ComponentPropsLenientChildren {}
+
   // Common components
   export interface ButtonProps extends ComponentPropsStrictChildren {}
   export interface IconButtonProps extends ComponentPropsStrictChildren {}