[SSF-121] Remove User ID from Routes for Current User Pages

apps/backend/src/auth/auth.service.ts

@@ -6,7 +6,6 @@ import {
   ConfirmForgotPasswordCommand,
   ConfirmSignUpCommand,
   ForgotPasswordCommand,
-  ListUsersCommand,
   SignUpCommand,
 } from '@aws-sdk/client-cognito-identity-provider';
 

apps/backend/src/foodRequests/request.controller.spec.ts

@@ -193,7 +193,9 @@ describe('RequestsController', () => {
 
       // Mock Photos
       const mockStream = new Readable();
-      mockStream._read = () => {};
+      mockStream._read = () => {
+        // no-op
+      };
 
       const photos: Express.Multer.File[] = [
         {

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

@@ -24,7 +24,6 @@ import { OrderStatus } from '../orders/types';
 import { OrderDetailsDto } from './dtos/order-details.dto';
 
 @Controller('requests')
-// @UseInterceptors()
 export class RequestsController {
   constructor(
     private requestsService: RequestsService,
@@ -41,14 +40,14 @@ export class RequestsController {
   }
 
   @Roles(Role.PANTRY, Role.ADMIN)
-  @Get('/get-all-requests/:pantryId')
+  @Get('/:pantryId/all')
   async getAllPantryRequests(
     @Param('pantryId', ParseIntPipe) pantryId: number,
   ): Promise<FoodRequest[]> {
     return this.requestsService.find(pantryId);
   }
 
-  @Get('/all-order-details/:requestId')
+  @Get('/:requestId/order-details')
   async getAllOrderDetailsFromRequest(
     @Param('requestId', ParseIntPipe) requestId: number,
   ): Promise<OrderDetailsDto[]> {

apps/backend/src/pantries/pantries.controller.spec.ts

@@ -15,6 +15,8 @@ import {
   ServeAllergicChildren,
 } from './types';
 import { ApplicationStatus } from '../shared/types';
+import { NotFoundException, UnauthorizedException } from '@nestjs/common';
+import { User } from '../users/user.entity';
 
 const mockPantriesService = mock<PantriesService>();
 const mockOrdersService = mock<OrdersService>();
@@ -121,12 +123,24 @@ describe('PantriesController', () => {
   });
 
   describe('getPantry', () => {
-    it('should return a single pantry by id', async () => {
-      mockPantriesService.findOne.mockResolvedValueOnce(mockPantry as Pantry);
+    it('should return a pantry by ID', async () => {
+      const mockUser: Partial<User> = {
+        id: 1,
+        firstName: 'Test',
+        lastName: 'User',
+        email: 'test@test.com',
+      };
+      const mockPantry: Partial<Pantry> = {
+        pantryId: 1,
+        pantryName: 'Test Pantry',
+        pantryUser: mockUser as User,
+      };
+
+      mockPantriesService.findOne.mockResolvedValue(mockPantry as Pantry);
 
       const result = await controller.getPantry(1);
-
-      expect(result).toEqual(mockPantry as Pantry);
+      expect(result).toEqual(mockPantry);
+      expect(result.pantryUser).toEqual(mockUser);
       expect(mockPantriesService.findOne).toHaveBeenCalledWith(1);
     });
 
@@ -232,4 +246,35 @@ describe('PantriesController', () => {
       expect(mockOrdersService.getOrdersByPantry).toHaveBeenCalledWith(24);
     });
   });
+
+  describe('getCurrentUserPantryId', () => {
+    it('returns pantryId when req.currentUser is present', async () => {
+      const req = { user: { id: 1 } };
+      const pantry: Partial<Pantry> = { pantryId: 10 };
+      mockPantriesService.findByUserId.mockResolvedValueOnce(pantry as Pantry);
+
+      const result = await controller.getCurrentUserPantryId(req);
+
+      expect(result).toEqual(10);
+      expect(mockPantriesService.findByUserId).toHaveBeenCalledWith(1);
+    });
+
+    it('throws UnauthorizedException when unauthenticated', async () => {
+      await expect(controller.getCurrentUserPantryId({})).rejects.toThrow(
+        new UnauthorizedException('Not authenticated'),
+      );
+    });
+
+    it('propagates NotFoundException from service', async () => {
+      const req = { user: { id: 999 } };
+      mockPantriesService.findByUserId.mockRejectedValueOnce(
+        new NotFoundException('Pantry for User 999 not found'),
+      );
+
+      const promise = controller.getCurrentUserPantryId(req);
+      await expect(promise).rejects.toBeInstanceOf(NotFoundException);
+      await expect(promise).rejects.toThrow('Pantry for User 999 not found');
+      expect(mockPantriesService.findByUserId).toHaveBeenCalledWith(999);
+    });
+  });
 });

apps/backend/src/pantries/pantries.controller.ts

@@ -6,6 +6,8 @@ import {
   ParseIntPipe,
   Patch,
   Post,
+  Req,
+  UnauthorizedException,
 } from '@nestjs/common';
 import { Pantry } from './pantries.entity';
 import { PantriesService } from './pantries.service';
@@ -33,6 +35,18 @@ export class PantriesController {
     private ordersService: OrdersService,
   ) {}
 
+  @Roles(Role.PANTRY)
+  @Get('/my-id')
+  async getCurrentUserPantryId(@Req() req): Promise<number> {
+    const currentUser = req.user;
+    if (!currentUser) {
+      throw new UnauthorizedException('Not authenticated');
+    }
+
+    const pantry = await this.pantriesService.findByUserId(currentUser.id);
+    return pantry.pantryId;
+  }
+
   @Roles(Role.ADMIN)
   @Get('/pending')
   async getPendingPantries(): Promise<Pantry[]> {

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

@@ -103,6 +103,7 @@ describe('PantriesService', () => {
       expect(result).toBe(mockPendingPantry);
       expect(mockRepository.findOne).toHaveBeenCalledWith({
         where: { pantryId: 1 },
+        relations: ['pantryUser'],
       });
     });
 
@@ -280,4 +281,24 @@ describe('PantriesService', () => {
       expect(mockRepository.save).toHaveBeenCalled();
     });
   });
+
+  // TODO: once pantry service tests are fixed, uncomment this out
+  // describe('findByUserId', () => {
+  //   it('should return a pantry by user id', async () => {
+  //     const userId = 10;
+  //     const pantry = await service.findByUserId(userId);
+
+  //     expect(pantry.pantryId).toBe(1);
+  //     expect(pantry.pantryName).toBe('Community Food Pantry Downtown');
+  //     expect(mockRepository.findOne).toHaveBeenCalledWith({
+  //       where: { pantryUser: { id: userId } },
+  //     });
+  //   });
+
+  //   it('should throw NotFoundException if pantry not found', async () => {
+  //     await expect(service.findByUserId(999)).rejects.toThrow(
+  //       new NotFoundException('Pantry for User 999 not found'),
+  //     );
+  //   });
+  // });
 });

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

@@ -15,7 +15,10 @@ export class PantriesService {
   async findOne(pantryId: number): Promise<Pantry> {
     validateId(pantryId, 'Pantry');
 
-    const pantry = await this.repo.findOne({ where: { pantryId } });
+    const pantry = await this.repo.findOne({
+      where: { pantryId },
+      relations: ['pantryUser'],
+    });
 
     if (!pantry) {
       throw new NotFoundException(`Pantry ${pantryId} not found`);
@@ -125,4 +128,17 @@ export class PantriesService {
 
     return pantries;
   }
+
+  async findByUserId(userId: number): Promise<Pantry> {
+    validateId(userId, 'User');
+
+    const pantry = await this.repo.findOne({
+      where: { pantryUser: { id: userId } },
+    });
+
+    if (!pantry) {
+      throw new NotFoundException(`Pantry for User ${userId} not found`);
+    }
+    return pantry;
+  }
 }

apps/frontend/src/api/apiClient.ts

@@ -177,9 +177,7 @@ export class ApiClient {
     userId: number,
     body: { role: string },
   ): Promise<void> {
-    return this.axiosInstance
-      .put(`/api/users/${userId}/role`, body)
-      .then(() => {});
+    return this.axiosInstance.put(`/api/users/${userId}/role`, body);
   }
 
   public async getOrderFoodRequest(requestId: number): Promise<FoodRequest> {
@@ -232,7 +230,7 @@ export class ApiClient {
     requestId: number,
   ): Promise<OrderDetails[]> {
     return this.axiosInstance
-      .get(`/api/requests/all-order-details/${requestId}`)
+      .get(`/api/requests/${requestId}/order-details`)
       .then((response) => response.data) as Promise<OrderDetails[]>;
   }
 
@@ -262,7 +260,7 @@ export class ApiClient {
   }
 
   public async getPantryRequests(pantryId: number): Promise<FoodRequest[]> {
-    const data = await this.get(`/api/requests/get-all-requests/${pantryId}`);
+    const data = await this.get(`/api/requests/${pantryId}/all`);
     return data as FoodRequest[];
   }
 
@@ -278,14 +276,19 @@ export class ApiClient {
 
       if (response.status === 200) {
         alert('Delivery confirmation submitted successfully');
-        window.location.href = '/request-form/1';
+        window.location.href = '/request-form';
       } else {
         alert(`Failed to submit: ${response.statusText}`);
       }
     } catch (error) {
       alert(`Error submitting delivery confirmation: ${error}`);
     }
   }
+
+  public async getCurrentUserPantryId(): Promise<number> {
+    const data = await this.get('/api/pantries/my-id');
+    return data as number;
+  }
 }
 
 export default new ApiClient();

apps/frontend/src/app.tsx

@@ -18,7 +18,6 @@ import VolunteerManagement from '@containers/volunteerManagement';
 import FoodManufacturerOrderDashboard from '@containers/foodManufacturerOrderDashboard';
 import DonationManagement from '@containers/donationManagement';
 import AdminDonation from '@containers/adminDonation';
-import { pantryIdLoader } from '@loaders/pantryIdLoader';
 import Homepage from '@containers/homepage';
 import AdminOrderManagement from '@containers/adminOrderManagement';
 import { Amplify } from 'aws-amplify';
@@ -81,14 +80,6 @@ const router = createBrowserRouter([
           </ProtectedRoute>
         ),
       },
-      {
-        path: '/pantry-dashboard/:pantryId',
-        element: (
-          <ProtectedRoute>
-            <PantryDashboard />
-          </ProtectedRoute>
-        ),
-      },
       {
         path: '/pantry-past-orders',
         element: (
@@ -114,13 +105,12 @@ const router = createBrowserRouter([
         ),
       },
       {
-        path: '/pantry-dashboard/:pantryId',
+        path: '/pantry-dashboard',
         element: (
           <ProtectedRoute>
             <PantryDashboard />
           </ProtectedRoute>
         ),
-        loader: pantryIdLoader,
       },
       {
         path: '/pantry-past-orders',
@@ -155,13 +145,13 @@ const router = createBrowserRouter([
         ),
       },
       {
-        path: '/request-form/:pantryId',
+        path: '/request-form',
         element: (
           <ProtectedRoute>
             <FormRequests />
           </ProtectedRoute>
         ),
-        loader: pantryIdLoader,
+        action: submitFoodRequestFormModal,
       },
       {
         path: '/donation-management',
@@ -203,11 +193,6 @@ const router = createBrowserRouter([
           </ProtectedRoute>
         ),
       },
-      // Actions
-      {
-        path: '/food-request',
-        action: submitFoodRequestFormModal,
-      },
       {
         path: '/confirm-delivery',
         action: submitDeliveryConfirmationFormModal,

apps/frontend/src/components/forms/addNewVolunteerModal.tsx

@@ -33,7 +33,6 @@ const NewVolunteerModal: React.FC<NewVolunteerModalProps> = ({
   const [error, setError] = useState('');
 
   const handleSubmit = async () => {
-    console.log('RAW phone value:', phone);
     if (!firstName || !lastName || !email || !phone || phone === '+1') {
       setError('Please fill in all fields. *');
       return;

apps/frontend/src/components/forms/deliveryConfirmationModal.tsx

@@ -177,11 +177,10 @@ export const submitDeliveryConfirmationFormModal: ActionFunction = async ({
       confirmDeliveryData,
     );
     alert('Delivery confirmation submitted successfully');
-    window.location.href = `/request-form/${pantryId}`;
   } catch (error) {
     alert(`Error submitting delivery confirmation: ${error}`);
-    window.location.href = `/request-form/${pantryId}`;
   }
+  window.location.href = '/request-form';
 };
 
 export default DeliveryConfirmationModal;

apps/frontend/src/components/forms/pantryApplicationForm.tsx

@@ -70,7 +70,7 @@ const PantryApplicationForm: React.FC = () => {
   const [secondaryContactPhone, setSecondaryContactPhone] =
     useState<string>('');
   const [activities, setActivities] = useState<string[]>([]);
-  const allergenClientsExactOption: string = 'I have an exact number';
+  const allergenClientsExactOption = 'I have an exact number';
 
   const [allergenClients, setAllergenClients] = useState<string | undefined>();
   const [restrictions, setRestrictions] = useState<string[]>([]);
@@ -1226,7 +1226,7 @@ export const submitPantryApplicationForm: ActionFunction = async ({
 
   const data = Object.fromEntries(pantryApplicationData);
 
-  let submissionSuccessful: boolean = false;
+  let submissionSuccessful = false;
 
   await ApiClient.postPantry(data as PantryApplicationDto).then(
     () => (submissionSuccessful = true),
@@ -1242,7 +1242,6 @@ export const submitPantryApplicationForm: ActionFunction = async ({
         );
       } else {
         alert('Form submission failed; please try again');
-        console.log(error);
       }
     },
   );