Skip to content

Commit 58b5f49

Browse files
committed
#1525 added shipped status and return json
1 parent da8253c commit 58b5f49

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ export default class ProjectsController {
176176
assemblyId,
177177
pdmFileName
178178
);
179-
return material;
179+
return res.status(200).json(material);
180180
} catch (error: unknown) {
181181
next(error);
182182
}

src/backend/src/utils/validation.utils.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,7 @@ export const isAccount = (validationObject: ValidationChain): ValidationChain =>
4646
};
4747

4848
export const isMaterialStatus = (validationObject: ValidationChain): ValidationChain => {
49-
return validationObject.isString().isIn([MaterialStatus.Ordered, MaterialStatus.Received, MaterialStatus.Unordered]);
49+
return validationObject
50+
.isString()
51+
.isIn([MaterialStatus.Ordered, MaterialStatus.Received, MaterialStatus.Unordered, MaterialStatus.Shipped]);
5052
};

src/shared/src/types/project-types.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,5 +99,6 @@ export interface LinkCreateArgs {
9999
export enum MaterialStatus {
100100
Ordered = 'ORDERED',
101101
Received = 'RECEIVED',
102-
Unordered = 'UNORDERED'
102+
Unordered = 'UNORDERED',
103+
Shipped = 'SHIPPED'
103104
}

0 commit comments

Comments
 (0)