[SSF 186] - Dashboard Stats Controller Backend

apps/backend/src/emails/awsSes.wrapper.ts

@@ -67,6 +67,6 @@ export class AmazonSESWrapper {
       },
     });
 
-    return await this.client.send(command);
+    return this.client.send(command);
   }
 }

apps/backend/src/foodManufacturers/manufacturers.service.spec.ts

@@ -531,6 +531,21 @@ describe('FoodManufacturersService', () => {
     });
   });
 
+  describe('findByUserId', () => {
+    it('findByUserId success', async () => {
+      const manufacturer = await service.findOne(1);
+      const userId = manufacturer.foodManufacturerRepresentative.id;
+      const result = await service.findByUserId(userId);
+      expect(result.foodManufacturerId).toBe(1);
+    });
+
+    it('findByUserId with non-existent user throws NotFoundException', async () => {
+      await expect(service.findByUserId(9999)).rejects.toThrow(
+        new NotFoundException('Food Manufacturer for User 9999 not found'),
+      );
+    });
+  });
+
   describe('getStats', () => {
     it('returns proper stats for manufacturer', async () => {
       const manufacturerId = 1;

apps/backend/src/foodManufacturers/manufacturers.service.ts

@@ -1,5 +1,7 @@
 import {
   BadRequestException,
+  forwardRef,
+  Inject,
   Injectable,
   NotFoundException,
   ConflictException,
@@ -34,6 +36,7 @@ export class FoodManufacturersService {
     @InjectRepository(FoodManufacturer)
     private repo: Repository<FoodManufacturer>,
 
+    @Inject(forwardRef(() => UsersService))
     private usersService: UsersService,
     private emailsService: EmailsService,
 
@@ -140,7 +143,7 @@ export class FoodManufacturersService {
   }
 
   async getPendingManufacturers(): Promise<FoodManufacturer[]> {
-    return await this.repo.find({
+    return this.repo.find({
       where: { status: ApplicationStatus.PENDING },
       relations: ['foodManufacturerRepresentative'],
     });
@@ -255,7 +258,7 @@ export class FoodManufacturersService {
 
     Object.assign(manufacturer, foodManufacturerData);
 
-    return await this.repo.save(manufacturer);
+    return this.repo.save(manufacturer);
   }
 
   async approve(id: number) {
@@ -325,6 +328,22 @@ export class FoodManufacturersService {
     await this.repo.update(id, { status: ApplicationStatus.DENIED });
   }
 
+  async findByUserId(userId: number): Promise<FoodManufacturer> {
+    validateId(userId, 'User');
+
+    const foodManufacturer = await this.repo.findOne({
+      where: { foodManufacturerRepresentative: { id: userId } },
+      relations: ['foodManufacturerRepresentative'],
+    });
+
+    if (!foodManufacturer) {
+      throw new NotFoundException(
+        `Food Manufacturer for User ${userId} not found`,
+      );
+    }
+    return foodManufacturer;
+  }
+
   async getStats(id: number): Promise<ManufacturerStatsDto> {
     validateId(id, 'Food Manufacturer');
 

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

@@ -267,7 +267,7 @@ export class RequestsService {
   async find(pantryId: number) {
     validateId(pantryId, 'Pantry');
 
-    return await this.repo.find({
+    return this.repo.find({
       where: { pantryId },
       relations: ['orders', 'pantry'],
     });

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

@@ -24,6 +24,7 @@ import { DonationStatus } from '../donations/types';
 import { User } from '../users/users.entity';
 import { AuthService } from '../auth/auth.service';
 import { DonationService } from '../donations/donations.service';
+import { PantriesService } from '../pantries/pantries.service';
 import { CreateOrderDto } from './dtos/create-order.dto';
 import { DataSource } from 'typeorm';
 import { EmailsService } from '../emails/email.service';
@@ -53,13 +54,8 @@ describe('OrdersService', () => {
         DonationItemsService,
         AllocationsService,
         UsersService,
+        PantriesService,
         DonationService,
-        EmailsService,
-        DonationService,
-        {
-          provide: DataSource,
-          useValue: testDataSource,
-        },
         {
           provide: DataSource,
           useValue: testDataSource,

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

@@ -26,6 +26,8 @@ import { UsersService } from '../users/users.service';
 import { AuthService } from '../auth/auth.service';
 import { User } from '../users/users.entity';
 import { AllocationsService } from '../allocations/allocations.service';
+import { FoodManufacturersService } from '../foodManufacturers/manufacturers.service';
+import { FoodManufacturer } from '../foodManufacturers/manufacturers.entity';
 import { UpdatePantryApplicationDto } from './dtos/update-pantry-application.dto';
 import { EmailsService } from '../emails/email.service';
 import { mock } from 'jest-mock-extended';
@@ -108,6 +110,7 @@ describe('PantriesService', () => {
       providers: [
         PantriesService,
         UsersService,
+        FoodManufacturersService,
         {
           provide: AuthService,
           useValue: {
@@ -138,6 +141,10 @@ describe('PantriesService', () => {
           provide: getRepositoryToken(Donation),
           useValue: testDataSource.getRepository(Donation),
         },
+        {
+          provide: getRepositoryToken(FoodManufacturer),
+          useValue: testDataSource.getRepository(FoodManufacturer),
+        },
       ],
     }).compile();
 

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

@@ -256,7 +256,7 @@ export class PantriesService {
   }
 
   async getPendingPantries(): Promise<Pantry[]> {
-    return await this.repo.find({
+    return this.repo.find({
       where: { status: ApplicationStatus.PENDING },
       relations: ['pantryUser'],
     });
@@ -396,7 +396,7 @@ export class PantriesService {
 
     Object.assign(pantry, pantryData);
 
-    return await this.repo.save(pantry);
+    return this.repo.save(pantry);
   }
 
   async approve(id: number) {
@@ -578,6 +578,7 @@ export class PantriesService {
 
     const pantry = await this.repo.findOne({
       where: { pantryUser: { id: userId } },
+      relations: ['pantryUser'],
     });
 
     if (!pantry) {

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

@@ -29,6 +29,7 @@ describe('UsersController', () => {
     mockUserService.remove.mockReset();
     mockUserService.update.mockReset();
     mockUserService.create.mockReset();
+    mockUserService.getUserDashboardStats.mockReset();
 
     const module: TestingModule = await Test.createTestingModule({
       controllers: [UsersController],
@@ -123,6 +124,23 @@ describe('UsersController', () => {
     });
   });
 
+  describe('GET /:id/stats', () => {
+    it('should call getUserDashboardStats and return the result', async () => {
+      const mockStats = {
+        'Food Requests': '0',
+        Orders: '0',
+        Donations: '0',
+        Volunteers: '4',
+      };
+      mockUserService.getUserDashboardStats.mockResolvedValue(mockStats);
+
+      const result = await controller.getUserDashboardStats(1);
+
+      expect(result).toEqual(mockStats);
+      expect(mockUserService.getUserDashboardStats).toHaveBeenCalledWith(1);
+    });
+  });
+
   describe('POST /api/users', () => {
     it('should create a new user with all required fields', async () => {
       const createUserSchema: userSchemaDto = {

apps/backend/src/users/users.controller.ts

@@ -16,6 +16,9 @@ import { UpdateUserInfoDto } from './dtos/update-user-info.dto';
 import { AuthenticatedRequest } from '../auth/authenticated-request';
 import { JwtAuthGuard } from '../auth/jwt-auth.guard';
 import { UseGuards } from '@nestjs/common';
+import { UserStatsDto } from './dtos/user-stats.dto';
+import { PantryStatsDto } from '../pantries/dtos/pantry-stats.dto';
+import { ManufacturerStatsDto } from '../foodManufacturers/dtos/manufacturer-stats.dto';
 
 @Controller('users')
 export class UsersController {
@@ -32,6 +35,13 @@ export class UsersController {
     return this.usersService.findOne(userId);
   }
 
+  @Get('/:id/stats')
+  async getUserDashboardStats(
+    @Param('id', ParseIntPipe) userId: number,
+  ): Promise<UserStatsDto | PantryStatsDto | ManufacturerStatsDto> {
+    return this.usersService.getUserDashboardStats(userId);
+  }
+
   @Delete('/:id')
   removeUser(@Param('id', ParseIntPipe) userId: number): Promise<User> {
     return this.usersService.remove(userId);

apps/backend/src/users/users.module.ts

@@ -9,12 +9,14 @@ import { EmailsModule } from '../emails/email.module';
 import { FoodRequest } from '../foodRequests/request.entity';
 import { Order } from '../orders/order.entity';
 import { Donation } from '../donations/donations.entity';
+import { ManufacturerModule } from '../foodManufacturers/manufacturers.module';
 
 @Module({
   imports: [
     TypeOrmModule.forFeature([User, FoodRequest, Order, Donation]),
     forwardRef(() => PantriesModule),
     forwardRef(() => AuthModule),
+    forwardRef(() => ManufacturerModule),
     EmailsModule,
   ],
   controllers: [UsersController],