Skip to content

backend validation accept/deny #119

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
swarkewalia wants to merge 10 commits into
base: main
Choose a base branch
from
+33 −7
Open

backend validation accept/deny #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8193770
backend validation accept/deny
swarkewalia Mar 8, 2026
bbbeeb5
Merge branch 'main' into sk/SSF-151-restrict-actions
swarkewalia Mar 8, 2026
d6c4176
Merge branch 'main' into sk/SSF-151-restrict-actions
swarkewalia Mar 9, 2026
aa2ca10
Merge branch 'main' into sk/SSF-151-restrict-actions
swarkewalia Mar 11, 2026
3a13f56
Merge branch 'main' into sk/SSF-151-restrict-actions
swarkewalia Mar 11, 2026
f1503f5
updated exception
swarkewalia Mar 11, 2026
9b50f1e
Merge branch 'sk/SSF-151-restrict-actions' of https://github.com/Code…
swarkewalia Mar 11, 2026
bbc6369
Merge branch 'main' into sk/SSF-151-restrict-actions
swarkewalia Mar 14, 2026
2d54612
fixed findone bug
swarkewalia Mar 14, 2026
a2d4cc6
Merge branch 'sk/SSF-151-restrict-actions' of https://github.com/Code…
swarkewalia Mar 14, 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
27 changes: 20 additions & 7 deletions apps/backend/src/foodManufacturers/manufacturers.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import { Injectable, NotFoundException } from '@nestjs/common';
import {
Injectable,
NotFoundException,
ConflictException,
} from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { FoodManufacturer } from './manufacturers.entity';
import { Repository } from 'typeorm';
Expand Down Expand Up @@ -28,6 +32,7 @@ export class FoodManufacturersService {

const foodManufacturer = await this.repo.findOne({
where: { foodManufacturerId },
relations: ['foodManufacturerRepresentative'],
});

if (!foodManufacturer) {
Expand Down Expand Up @@ -119,13 +124,17 @@ export class FoodManufacturersService {
async approve(id: number) {
validateId(id, 'Food Manufacturer');

const foodManufacturer = await this.repo.findOne({
where: { foodManufacturerId: id },
});
const foodManufacturer = await this.findOne(id);
if (!foodManufacturer) {
Copy link
Collaborator

@sam-schu sam-schu Mar 17, 2026

Choose a reason for hiding this comment

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

Now that we're using the service's findOne function, that function will throw if the manufacturer is not found, so we don't need this existence check here or in the manufacturer deny function

throw new NotFoundException(`Food Manufacturer ${id} not found`);
}

if (foodManufacturer.status !== ApplicationStatus.PENDING) {
throw new ConflictException(
`Cannot approve a Food Manufacturer with status: ${foodManufacturer.status}`,
);
}

const createUserDto: userSchemaDto = {
email: foodManufacturer.foodManufacturerRepresentative.email,
firstName: foodManufacturer.foodManufacturerRepresentative.firstName,
Expand All @@ -145,13 +154,17 @@ export class FoodManufacturersService {
async deny(id: number) {
validateId(id, 'Food Manufacturer');

const foodManufacturer = await this.repo.findOne({
where: { foodManufacturerId: id },
});
const foodManufacturer = await this.findOne(id);
if (!foodManufacturer) {
throw new NotFoundException(`Food Manufacturer ${id} not found`);
}

if (foodManufacturer.status !== ApplicationStatus.PENDING) {
throw new ConflictException(
`Cannot deny a Food Manufacturer with status: ${foodManufacturer.status}`,
);
}

await this.repo.update(id, { status: ApplicationStatus.DENIED });
}
}
13 changes: 13 additions & 0 deletions apps/backend/src/pantries/pantries.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
Inject,
Injectable,
NotFoundException,
ConflictException,
} from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { In, Repository } from 'typeorm';
Expand Down Expand Up @@ -117,6 +118,12 @@ export class PantriesService {
throw new NotFoundException(`Pantry ${id} not found`);
}

if (pantry.status !== ApplicationStatus.PENDING) {
throw new ConflictException(
`Cannot approve a pantry with status: ${pantry.status}`,
);
}

const createUserDto: userSchemaDto = {
...pantry.pantryUser,
role: Role.PANTRY,
Expand All @@ -138,6 +145,12 @@ export class PantriesService {
throw new NotFoundException(`Pantry ${id} not found`);
}

if (pantry.status !== ApplicationStatus.PENDING) {
throw new ConflictException(
`Cannot deny a pantry with status: ${pantry.status}`,
);
}

await this.repo.update(id, { status: ApplicationStatus.DENIED });
}

Expand Down
Loading