[SSF-111] food manufacturer application frontend

apps/backend/src/app.module.ts

@@ -10,7 +10,7 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
 import { MulterModule } from '@nestjs/platform-express';
 import typeorm from './config/typeorm';
 import { OrdersModule } from './orders/order.module';
-import { ManufacturerModule } from './foodManufacturers/manufacturer.module';
+import { ManufacturerModule } from './foodManufacturers/manufacturers.module';
 import { DonationModule } from './donations/donations.module';
 import { DonationItemsModule } from './donationItems/donationItems.module';
 import { AllocationModule } from './allocations/allocations.module';

apps/backend/src/config/typeorm.ts

@@ -27,6 +27,7 @@ import { RemoveMultipleVolunteerTypes1764811878152 } from '../migrations/1764811
 import { RemoveUnusedStatuses1764816885341 } from '../migrations/1764816885341-RemoveUnusedStatuses';
 import { UpdatePantryFields1763762628431 } from '../migrations/1763762628431-UpdatePantryFields';
 import { PopulateDummyData1768501812134 } from '../migrations/1768501812134-populateDummyData';
+import { UpdateManufacturerEntity1768680807820 } from '../migrations/1768680807820-UpdateManufacturerEntity';
 
 const config = {
   type: 'postgres',
@@ -67,6 +68,7 @@ const config = {
     RemoveMultipleVolunteerTypes1764811878152,
     RemoveUnusedStatuses1764816885341,
     PopulateDummyData1768501812134,
+    UpdateManufacturerEntity1768680807820,
   ],
 };
 

apps/backend/src/donations/donations.entity.ts

@@ -6,7 +6,7 @@ import {
   JoinColumn,
   ManyToOne,
 } from 'typeorm';
-import { FoodManufacturer } from '../foodManufacturers/manufacturer.entity';
+import { FoodManufacturer } from '../foodManufacturers/manufacturers.entity';
 import { DonationStatus } from './types';
 
 @Entity('donations')

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

@@ -5,8 +5,8 @@ import { AuthService } from '../auth/auth.service';
 import { Donation } from './donations.entity';
 import { DonationService } from './donations.service';
 import { DonationsController } from './donations.controller';
-import { ManufacturerModule } from '../foodManufacturers/manufacturer.module';
-import { FoodManufacturer } from '../foodManufacturers/manufacturer.entity';
+import { ManufacturerModule } from '../foodManufacturers/manufacturers.module';
+import { FoodManufacturer } from '../foodManufacturers/manufacturers.entity';
 
 @Module({
   imports: [

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

@@ -4,7 +4,7 @@ import { Repository } from 'typeorm';
 import { Donation } from './donations.entity';
 import { DonationService } from './donations.service';
 import { mock } from 'jest-mock-extended';
-import { FoodManufacturer } from '../foodManufacturers/manufacturer.entity';
+import { FoodManufacturer } from '../foodManufacturers/manufacturers.entity';
 
 const mockDonationRepository = mock<Repository<Donation>>();
 const mockFoodManufacturerRepository = mock<Repository<FoodManufacturer>>();

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

@@ -3,7 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { Donation } from './donations.entity';
 import { validateId } from '../utils/validation.utils';
-import { FoodManufacturer } from '../foodManufacturers/manufacturer.entity';
+import { FoodManufacturer } from '../foodManufacturers/manufacturers.entity';
 import { DonationStatus } from './types';
 
 @Injectable()

apps/backend/src/foodManufacturers/dtos/manufacturer-application.dto.ts

@@ -0,0 +1,114 @@
+import {
+  ArrayNotEmpty,
+  IsBoolean,
+  IsEmail,
+  IsEnum,
+  IsNotEmpty,
+  IsOptional,
+  IsPhoneNumber,
+  IsString,
+  Length,
+  MaxLength,
+} from 'class-validator';
+import { Allergen, DonateWastedFood, ManufacturerAttribute } from '../types';
+
+export class FoodManufacturerApplicationDto {
+  @IsString()
+  @IsNotEmpty()
+  @Length(1, 255)
+  foodManufacturerName: string;
+
+  @IsString()
+  @IsNotEmpty()
+  @Length(1, 255)
+  foodManufacturerWebsite: string;
+
+  @IsString()
+  @IsNotEmpty()
+  @Length(1, 255)
+  contactFirstName: string;
+
+  @IsString()
+  @IsNotEmpty()
+  @Length(1, 255)
+  contactLastName: string;
+
+  @IsEmail()
+  @IsNotEmpty()
+  @Length(1, 255)
+  contactEmail: string;
+
+  @IsString()
+  @IsNotEmpty()
+  @IsPhoneNumber('US', {
+    message:
+      'contactPhone must be a valid phone number (make sure all the digits are correct)',
+  })
+  contactPhone: string;
+
+  @IsOptional()
+  @IsString()
+  @IsNotEmpty()
+  @MaxLength(255)
+  secondaryContactFirstName?: string;
+
+  @IsOptional()
+  @IsString()
+  @IsNotEmpty()
+  @MaxLength(255)
+  secondaryContactLastName?: string;
+
+  @IsOptional()
+  @IsEmail()
+  @IsNotEmpty()
+  @MaxLength(255)
+  secondaryContactEmail?: string;
+
+  @IsOptional()
+  @IsString()
+  @IsPhoneNumber('US', {
+    message:
+      'secondaryContactPhone must be a valid phone number (make sure all the digits are correct)',
+  })
+  @IsNotEmpty()
+  secondaryContactPhone?: string;
+
+  @ArrayNotEmpty()
+  @IsEnum(Allergen, { each: true })
+  unlistedProductAllergens: Allergen[];
+
+  @ArrayNotEmpty()
+  @IsEnum(Allergen, { each: true })
+  facilityFreeAllergens: Allergen[];
+
+  @IsBoolean()
+  productsGlutenFree: boolean;
+
+  @IsBoolean()
+  productsContainSulfites: boolean;
+
+  @IsString()
+  @IsNotEmpty()
+  @Length(1, 255)
+  productsSustainableExplanation: string;
+
+  @IsBoolean()
+  inKindDonations: boolean;
+
+  @IsEnum(DonateWastedFood)
+  donateWastedFood: DonateWastedFood;
+
+  @IsOptional()
+  @IsEnum(ManufacturerAttribute)
+  manufacturerAttribute?: ManufacturerAttribute;
+
+  @IsOptional()
+  @IsString()
+  @IsNotEmpty()
+  @MaxLength(255)
+  additionalComments?: string;
+
+  @IsOptional()
+  @IsBoolean()
+  newsletterSubscription?: boolean;
+}

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

@@ -0,0 +1,131 @@
+import { mock } from 'jest-mock-extended';
+import { FoodManufacturersService } from './manufacturers.service';
+import { FoodManufacturersController } from './manufacturers.controller';
+import { Test, TestingModule } from '@nestjs/testing';
+import { FoodManufacturer } from './manufacturers.entity';
+import { Allergen, DonateWastedFood, Status } from './types';
+import { FoodManufacturerApplicationDto } from './dtos/manufacturer-application.dto';
+
+const mockManufacturersService = mock<FoodManufacturersService>();
+
+const mockManufacturer1: Partial<FoodManufacturer> = {
+  foodManufacturerId: 1,
+  foodManufacturerName: 'Good Foods Inc',
+  status: Status.PENDING,
+};
+
+const mockManufacturer2: Partial<FoodManufacturer> = {
+  foodManufacturerId: 2,
+  foodManufacturerName: 'Healthy Eats LLC',
+  status: Status.PENDING,
+};
+
+describe('FoodManufacturersController', () => {
+  let controller: FoodManufacturersController;
+
+  beforeEach(async () => {
+    jest.clearAllMocks();
+
+    const module: TestingModule = await Test.createTestingModule({
+      controllers: [FoodManufacturersController],
+      providers: [
+        {
+          provide: FoodManufacturersService,
+          useValue: mockManufacturersService,
+        },
+      ],
+    }).compile();
+
+    controller = module.get<FoodManufacturersController>(
+      FoodManufacturersController,
+    );
+  });
+
+  it('should be defined', () => {
+    expect(controller).toBeDefined();
+  });
+
+  describe('GET /pending', () => {
+    it('should return pending food manufacturers', async () => {
+      const mockManufacturers: Partial<FoodManufacturer>[] = [
+        mockManufacturer1,
+        mockManufacturer2,
+      ];
+
+      mockManufacturersService.getPendingManufacturers.mockResolvedValue(
+        mockManufacturers as FoodManufacturer[],
+      );
+
+      const result = await controller.getPendingManufacturers();
+
+      expect(result).toEqual(mockManufacturers);
+      expect(result).toHaveLength(2);
+      expect(result[0].foodManufacturerId).toBe(1);
+      expect(result[1].foodManufacturerId).toBe(2);
+      expect(
+        mockManufacturersService.getPendingManufacturers,
+      ).toHaveBeenCalled();
+    });
+  });
+
+  describe('GET /:id', () => {
+    it('should return a food manufacturer by id', async () => {
+      mockManufacturersService.findOne.mockResolvedValue(
+        mockManufacturer1 as FoodManufacturer,
+      );
+
+      const result = await controller.getFoodManufacturer(1);
+
+      expect(result).toEqual(mockManufacturer1);
+      expect(mockManufacturersService.findOne).toHaveBeenCalledWith(1);
+    });
+  });
+
+  describe('POST /submit-application', () => {
+    it('should submit a food manufacturer application', async () => {
+      const mockApplicationData: FoodManufacturerApplicationDto = {
+        foodManufacturerName: 'Good Foods Inc',
+        foodManufacturerWebsite: 'https://goodfoods.example.com',
+        contactFirstName: 'Alice',
+        contactLastName: 'Johnson',
+        contactEmail: 'alice.johnson@goodfoods.example.com',
+        contactPhone: '555-123-4567',
+        unlistedProductAllergens: [Allergen.EGG],
+        facilityFreeAllergens: [Allergen.EGG],
+        productsGlutenFree: true,
+        productsContainSulfites: false,
+        productsSustainableExplanation: 'We use eco-friendly packaging.',
+        inKindDonations: true,
+        donateWastedFood: DonateWastedFood.SOMETIMES,
+      };
+
+      mockManufacturersService.addFoodManufacturer.mockResolvedValue();
+
+      await controller.submitFoodManufacturerApplication(mockApplicationData);
+
+      expect(mockManufacturersService.addFoodManufacturer).toHaveBeenCalledWith(
+        mockApplicationData,
+      );
+    });
+  });
+
+  describe('POST /approve/:id', () => {
+    it('should approve a food manufacturer', async () => {
+      mockManufacturersService.approve.mockResolvedValue();
+
+      await controller.approveManufacturer(1);
+
+      expect(mockManufacturersService.approve).toHaveBeenCalledWith(1);
+    });
+  });
+
+  describe('POST /deny/:id', () => {
+    it('should deny a food manufacturer', async () => {
+      mockManufacturersService.deny.mockResolvedValue();
+
+      await controller.denyManufacturer(1);
+
+      expect(mockManufacturersService.deny).toHaveBeenCalledWith(1);
+    });
+  });
+});