Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ npm-debug.log
yarn-error.log
testem.log
/typings
.nx

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this here? Can we get rid of it?


# System Files
.DS_Store
Expand Down
2 changes: 1 addition & 1 deletion apps/backend/src/auth/auth.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export class AuthController {
signUpDto.firstName,
signUpDto.lastName,
signUpDto.phone,
Role.VOLUNTEER,
Role.STANDARD_VOLUNTEER,
);

return user;
Expand Down
2 changes: 1 addition & 1 deletion apps/backend/src/auth/auth.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export class AuthService {

async signup(
{ firstName, lastName, email, password }: SignUpDto,
role: Role = Role.VOLUNTEER,
role: Role = Role.STANDARD_VOLUNTEER,
): Promise<boolean> {
// Needs error handling
const signUpCommand = new SignUpCommand({
Expand Down
2 changes: 0 additions & 2 deletions apps/backend/src/config/typeorm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import { RemoveOrdersDonationId1761500262238 } from '../migrations/1761500262238
import { AddVolunteerPantryUniqueConstraint1760033134668 } from '../migrations/1760033134668-AddVolunteerPantryUniqueConstraint';
import { AllergyFriendlyToBoolType1763963056712 } from '../migrations/1763963056712-AllergyFriendlyToBoolType';
import { UpdatePantryUserFieldsFixed1764350314832 } from '../migrations/1764350314832-UpdatePantryUserFieldsFixed';
import { RemoveMultipleVolunteerTypes1764811878152 } from '../migrations/1764811878152-RemoveMultipleVolunteerTypes';
import { RemoveUnusedStatuses1764816885341 } from '../migrations/1764816885341-RemoveUnusedStatuses';
import { UpdatePantryFields1763762628431 } from '../migrations/1763762628431-UpdatePantryFields';

Expand Down Expand Up @@ -63,7 +62,6 @@ const config = {
AddVolunteerPantryUniqueConstraint1760033134668,
AllergyFriendlyToBoolType1763963056712,
UpdatePantryUserFieldsFixed1764350314832,
RemoveMultipleVolunteerTypes1764811878152,
RemoveUnusedStatuses1764816885341,
],
};
Expand Down
322 changes: 0 additions & 322 deletions apps/backend/src/foodRequests/request.controller.spec.ts

This file was deleted.

10 changes: 9 additions & 1 deletion apps/backend/src/foodRequests/request.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { OrderStatus } from '../orders/types';

@Controller('requests')
// @UseInterceptors()
export class RequestsController {
export class FoodRequestsController {
constructor(
private requestsService: RequestsService,
private awsS3Service: AWSS3Service,
Expand All @@ -43,6 +43,14 @@ export class RequestsController {
return this.requestsService.find(pantryId);
}

@Get('get-order/:requestId')
async getOrderByRequestId(
@Param('requestId', ParseIntPipe) requestId: number,
): Promise<Order> {
const request = await this.requestsService.findOne(requestId);
return request.order;
}

@Post('/create')
@ApiBody({
description: 'Details for creating a food request',
Expand Down
Loading
Loading