Skip to content

Commit 64b119a

Browse files
committed
#1523 : Fixed final review
1 parent aa01802 commit 64b119a

3 files changed

Lines changed: 3 additions & 4 deletions

File tree

src/backend/src/controllers/projects.controllers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ export default class ProjectsController {
196196
static async deleteManufacturer(req: Request, res: Response, next: NextFunction) {
197197
try {
198198
const user: User = await getCurrentUser(res);
199-
const { manufacturerName } = req.body;
199+
const { manufacturerName } = req.params;
200200
const deletedManufacturer: Manufacturer = await ProjectsService.deleteManufacturer(user, manufacturerName);
201201
res.status(200).json(deletedManufacturer);
202202
} catch (error: unknown) {

src/backend/src/prisma/schema.prisma

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ model User {
114114
createdAssemblies Assembly[] @relation(name: "assemblyCreator")
115115
deletedMaterials Material[] @relation(name: "materialDeleter")
116116
createdMaterials Material[] @relation(name: "materialCreator")
117-
deletedManufacturers Manufacturer[] @relation(name: "deletedManufacturer")
117+
deletedManufacturers Manufacturer[] @relation(name: "deletedManufacturer")
118118
}
119119

120120
model Team {

src/backend/src/services/projects.services.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -798,11 +798,10 @@ export default class ProjectsService {
798798
* Deletes a manufacturer
799799
* @param user the user who's deleting the manufacturer
800800
* @param name the name of the manufacturer
801-
* @throws if the user is not at least a head (includes admin), or if the provided name isn't a manufacturer
801+
* @throws if the user is not at least a head, or if the provided name isn't a manufacturer, or if the manufacturer has already been soft-deleted
802802
* @returns the deleted manufacturer
803803
*/
804804
static async deleteManufacturer(user: User, name: string) {
805-
console.log('e');
806805
if (!isHead(user.role)) {
807806
throw new AccessDeniedException('Only heads and above can delete a manufacturer');
808807
}

0 commit comments

Comments
 (0)