Skip to content

Commit f718d82

Browse files
committed
#1592 Use CR Tranformer
1 parent 2b63a93 commit f718d82

4 files changed

Lines changed: 10 additions & 29 deletions

File tree

src/backend/src/routes/projects.routes.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ projectRouter.post(
1818
validateInputs,
1919
ProjectsController.createProject
2020
);
21+
2122
projectRouter.post(
2223
'/edit',
2324
intMinZero(body('projectId')),

src/backend/src/services/change-requests.services.ts

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import {
22
ChangeRequest,
3-
ChangeRequestReason,
4-
ChangeRequestStatus,
53
isAdmin,
64
isGuest,
75
isLeadership,
@@ -603,7 +601,7 @@ export default class ChangeRequestsService {
603601
);
604602
});
605603

606-
const createdProposedSolutions = await Promise.all(proposedSolutionPromises);
604+
await Promise.all(proposedSolutionPromises);
607605

608606
const project = createdCR.wbsElement.workPackage?.project || createdCR.wbsElement.project;
609607
const teams = project?.teams;
@@ -618,28 +616,12 @@ export default class ChangeRequestsService {
618616
await Promise.all(completion);
619617
}
620618

621-
return {
622-
...createdCR,
623-
what,
624-
why: why.map((why) => ({ explain: why.explain, type: why.type as ChangeRequestReason })),
625-
type,
626-
wbsNum: {
627-
carNumber,
628-
projectNumber,
629-
workPackageNumber
630-
},
631-
wbsName: wbsElement.name,
632-
submitter,
633-
status: ChangeRequestStatus.Open,
634-
requestedReviewers: [],
635-
dateReviewed: undefined,
636-
accepted: undefined,
637-
reviewNotes: undefined,
638-
scopeImpact: '',
639-
budgetImpact: 0,
640-
timelineImpact: 0,
641-
proposedSolutions: createdProposedSolutions
642-
};
619+
const finishedCR = await prisma.change_Request.findUnique({
620+
where: { crId: createdCR.crId },
621+
...changeRequestQueryArgs
622+
});
623+
624+
return changeRequestTransformer(finishedCR!) as StandardChangeRequest;
643625
}
644626

645627
/**

src/backend/src/transformers/change-requests.transformer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ const changeRequestTransformer = (
6262
};
6363
};
6464

65-
export default changeRequestTransformer;
65+
export default changeRequestTransformer;

src/frontend/src/pages/CreateChangeRequestPage/CreateChangeRequest.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import { useHistory } from 'react-router-dom';
77
import { ChangeRequestReason, ChangeRequestType, ProposedSolution, validateWBS } from 'shared';
8-
import { useAuth } from '../../hooks/auth.hooks';
98
import { useCreateStandardChangeRequest } from '../../hooks/change-requests.hooks';
109
import { useQuery } from '../../hooks/utils.hooks';
1110
import { routes } from '../../utils/routes';
@@ -24,15 +23,14 @@ export interface FormInput {
2423
}
2524

2625
const CreateChangeRequest: React.FC<CreateChangeRequestProps> = () => {
27-
const auth = useAuth();
2826
const query = useQuery();
2927
const history = useHistory();
3028
const { isLoading, isError, error, mutateAsync } = useCreateStandardChangeRequest();
3129
const [proposedSolutions, setProposedSolutions] = useState<ProposedSolution[]>([]);
3230
const [wbsNum, setWbsNum] = useState(query.get('wbsNum') || '');
3331
const toast = useToast();
3432

35-
if (isLoading || !auth.user) return <LoadingIndicator />;
33+
if (isLoading) return <LoadingIndicator />;
3634
if (isError) return <ErrorPage message={error?.message} />;
3735

3836
const handleConfirm = async (data: FormInput) => {

0 commit comments

Comments
 (0)