Skip to content

[SSF-125] Move Food Request Fields #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tarun-Nagesh wants to merge 19 commits into
base: main
Choose a base branch
from
Open

[SSF-125] Move Food Request Fields #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a3ec50a
Updated logic for moving fields
Tarun-Nagesh Feb 8, 2026
f4a22c2
Added/changed tests
Tarun-Nagesh Feb 8, 2026
bb71e3e
Some scuffed workaround, unsure if it has any other implications
Tarun-Nagesh Feb 8, 2026
4dd7a44
cleanup and comments
Tarun-Nagesh Feb 19, 2026
aee1b48
merging main
Tarun-Nagesh Feb 20, 2026
fda0ece
linting
Tarun-Nagesh Feb 20, 2026
4b16f21
fixed test
Tarun-Nagesh Feb 20, 2026
e1dc7c0
Added status back to FoodRequest
Tarun-Nagesh Feb 20, 2026
66805a8
resolve comments
maxn990 Feb 23, 2026
9f2a664
fix test
maxn990 Feb 23, 2026
699b0a5
fix test
maxn990 Feb 23, 2026
4d5bba1
fix tests
maxn990 Feb 23, 2026
53cfb2f
Merge branch 'main' into TN/SSF-125-move-food-request-fields
maxn990 Feb 23, 2026
6ed0047
resolve comments
maxn990 Feb 24, 2026
b332d10
fix modules
maxn990 Feb 24, 2026
19af4cb
fix order entity
maxn990 Feb 24, 2026
0f58f88
resolve comments
maxn990 Feb 24, 2026
48351e7
resolve comments
maxn990 Feb 25, 2026
ce69a90
resolve comments
maxn990 Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/backend/src/config/migrations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { AddFoodRescueToDonationItems1770679339809 } from '../migrations/1770679
import { UpdateManufacturerEntity1768680807820 } from '../migrations/1768680807820-UpdateManufacturerEntity';
import { AddUserPoolId1769189327767 } from '../migrations/1769189327767-AddUserPoolId';
import { UpdateOrderEntity1769990652833 } from '../migrations/1769990652833-UpdateOrderEntity';
import { MoveRequestFieldsToOrders1770571145350 } from '../migrations/1770571145350-MoveRequestFieldsToOrders';
import { RenameDonationMatchingStatus1771260403657 } from '../migrations/1771260403657-RenameDonationMatchingStatus';

const schemaMigrations = [
Expand Down Expand Up @@ -65,6 +66,7 @@ const schemaMigrations = [
UpdateManufacturerEntity1768680807820,
AddUserPoolId1769189327767,
UpdateOrderEntity1769990652833,
MoveRequestFieldsToOrders1770571145350,
RenameDonationMatchingStatus1771260403657,
];

Expand Down
221 changes: 0 additions & 221 deletions apps/backend/src/foodRequests/request.controller.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,13 @@ import { RequestsService } from './request.service';
import { RequestsController } from './request.controller';
import { Test, TestingModule } from '@nestjs/testing';
import { mock } from 'jest-mock-extended';
import { AWSS3Service } from '../aws/aws-s3.service';
import { OrdersService } from '../orders/order.service';
import { Readable } from 'stream';
import { FoodRequest } from './request.entity';
import { RequestSize } from './types';
import { OrderStatus } from '../orders/types';
import { FoodType } from '../donationItems/types';
import { OrderDetailsDto } from './dtos/order-details.dto';
import { Order } from '../orders/order.entity';

const mockRequestsService = mock<RequestsService>();
const mockOrdersService = mock<OrdersService>();
const mockAWSS3Service = mock<AWSS3Service>();

const foodRequest: Partial<FoodRequest> = {
requestId: 1,
Expand All @@ -28,10 +22,7 @@ describe('RequestsController', () => {
mockRequestsService.findOne.mockReset();
mockRequestsService.find.mockReset();
mockRequestsService.create.mockReset();
mockRequestsService.updateDeliveryDetails?.mockReset();
mockRequestsService.getOrderDetails.mockReset();
mockAWSS3Service.upload.mockReset();
mockOrdersService.updateStatus.mockReset();

const module: TestingModule = await Test.createTestingModule({
controllers: [RequestsController],
Expand All @@ -40,14 +31,6 @@ describe('RequestsController', () => {
provide: RequestsService,
useValue: mockRequestsService,
},
{
provide: OrdersService,
useValue: mockOrdersService,
},
{
provide: AWSS3Service,
useValue: mockAWSS3Service,
},
],
}).compile();

Expand Down Expand Up @@ -151,9 +134,6 @@ describe('RequestsController', () => {
requestedSize: RequestSize.MEDIUM,
requestedItems: ['Test item 1', 'Test item 2'],
additionalInformation: 'Test information.',
dateReceived: null,
feedback: null,
photos: null,
};

const createdRequest: Partial<FoodRequest> = {
Expand All @@ -175,208 +155,7 @@ describe('RequestsController', () => {
createBody.requestedSize,
createBody.requestedItems,
createBody.additionalInformation,
createBody.dateReceived,
createBody.feedback,
createBody.photos,
);
});
});

describe('POST /:requestId/confirm-delivery', () => {
it('should upload photos, update the order, then update the request', async () => {
const requestId = 1;

const body = {
dateReceived: new Date().toISOString(),
feedback: 'Nice delivery!',
};

// Mock Photos
const mockStream = {} as Readable;

const photos: Express.Multer.File[] = [
{
fieldname: 'photos',
originalname: 'photo1.jpg',
encoding: '7bit',
mimetype: 'image/jpeg',
buffer: Buffer.from('image1'),
size: 1000,
destination: '',
filename: '',
path: '',
stream: mockStream,
},
{
fieldname: 'photos',
originalname: 'photo2.jpg',
encoding: '7bit',
mimetype: 'image/jpeg',
buffer: Buffer.from('image2'),
size: 2000,
destination: '',
filename: '',
path: '',
stream: mockStream,
},
];

const uploadedUrls = [
'https://fake-s3/photo1.jpg',
'https://fake-s3/photo2.jpg',
];

// Mock AWS upload
mockAWSS3Service.upload.mockResolvedValue(uploadedUrls);

// Mock RequestsService.findOne
mockRequestsService.findOne.mockResolvedValue({
requestId,
pantryId: 1,
orders: [{ orderId: 99 }],
} as FoodRequest);

mockOrdersService.updateStatus.mockResolvedValue();

const order = new Order();
order.orderId = 99;

const updatedRequest: Partial<FoodRequest> = {
requestId,
pantryId: 1,
dateReceived: new Date(body.dateReceived),
feedback: body.feedback,
photos: uploadedUrls,
orders: [order],
};

mockRequestsService.updateDeliveryDetails.mockResolvedValue(
updatedRequest as FoodRequest,
);

const result = await controller.confirmDelivery(requestId, body, photos);

expect(mockAWSS3Service.upload).toHaveBeenCalledWith(photos);

expect(mockOrdersService.updateStatus).toHaveBeenCalledWith(
99,
OrderStatus.DELIVERED,
);

expect(mockRequestsService.updateDeliveryDetails).toHaveBeenCalledWith(
requestId,
new Date(body.dateReceived),
body.feedback,
uploadedUrls,
);

expect(result).toEqual(updatedRequest);
});

it('should handle no photos being uploaded', async () => {
const requestId = 1;

const body = {
dateReceived: new Date().toISOString(),
feedback: 'No photos delivery!',
};

mockRequestsService.findOne.mockResolvedValue({
requestId,
pantryId: 1,
orders: [{ orderId: 100 }],
} as FoodRequest);

mockOrdersService.updateStatus.mockResolvedValue();

const order = new Order();
order.orderId = 100;

const updatedRequest: Partial<FoodRequest> = {
requestId,
pantryId: 1,
dateReceived: new Date(body.dateReceived),
feedback: body.feedback,
photos: [],
orders: [order],
};

mockRequestsService.updateDeliveryDetails.mockResolvedValue(
updatedRequest as FoodRequest,
);

const result = await controller.confirmDelivery(requestId, body);

expect(mockAWSS3Service.upload).not.toHaveBeenCalled();
expect(mockOrdersService.updateStatus).toHaveBeenCalledWith(
100,
OrderStatus.DELIVERED,
);
expect(mockRequestsService.updateDeliveryDetails).toHaveBeenCalledWith(
requestId,
new Date(body.dateReceived),
body.feedback,
[],
);
expect(result).toEqual(updatedRequest);
});

it('should handle empty photos array', async () => {
const requestId = 1;

const body = {
dateReceived: new Date().toISOString(),
feedback: 'Empty photos array delivery!',
};

mockRequestsService.findOne.mockResolvedValue({
requestId,
pantryId: 1,
orders: [{ orderId: 101 }],
} as FoodRequest);

mockOrdersService.updateStatus.mockResolvedValue();

const order = new Order();
order.orderId = 101;

const updatedRequest: Partial<FoodRequest> = {
requestId,
pantryId: 1,
dateReceived: new Date(body.dateReceived),
feedback: body.feedback,
photos: [],
orders: [order],
};

mockRequestsService.updateDeliveryDetails.mockResolvedValue(
updatedRequest as FoodRequest,
);

const result = await controller.confirmDelivery(requestId, body, []);

expect(mockAWSS3Service.upload).not.toHaveBeenCalled();
expect(mockOrdersService.updateStatus).toHaveBeenCalledWith(
101,
OrderStatus.DELIVERED,
);
expect(mockRequestsService.updateDeliveryDetails).toHaveBeenCalledWith(
requestId,
new Date(body.dateReceived),
body.feedback,
[],
);
expect(result).toEqual(updatedRequest);
});

it('should throw an error for invalid date', async () => {
await expect(
controller.confirmDelivery(
1,
{ dateReceived: 'bad-date', feedback: '' },
[],
),
).rejects.toThrow('Invalid date format for deliveryDate');
});
});
});
Loading