fix: Add companyId, applicationId to update amend application (#1330)

bcgov · Apr 12, 2024 · 37c9844 · 37c9844
1 parent a4a5596
commit 37c9844
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 22 deletions.
diff --git a/frontend/src/features/permits/apiManager/permitsAPI.ts b/frontend/src/features/permits/apiManager/permitsAPI.ts
@@ -89,8 +89,13 @@ export const createApplication = async (
 export const updateApplication = async (
   application: ApplicationFormData,
   applicationId: string,
+  companyIdParam?: Nullable<string>,
 ): Promise<AxiosResponse<ApplicationResponseData>> => {
-  const companyId = getDefaultRequiredVal("", getCompanyIdFromSession());
+  const companyId = getDefaultRequiredVal(
+    "",
+    getCompanyIdFromSession(),
+    companyIdParam,
+  );
   return await httpPUTRequest(
     `${APPLICATIONS_API_ROUTES.UPDATE(companyId)}/${applicationId}`,
     replaceEmptyValuesWithNull({
@@ -539,12 +544,14 @@ export const amendPermit = async (
  */
 export const modifyAmendmentApplication = async ({
   application,
-  applicationNumber,
+  applicationId,
+  companyId,
 }: {
   application: AmendPermitFormData;
-  applicationNumber: string;
+  applicationId: string;
+  companyId: string;
 }) => {
-  return await updateApplication(application, applicationNumber);
+  return await updateApplication(application, applicationId, companyId);
 };
 
 /**

diff --git a/frontend/src/features/permits/hooks/hooks.ts b/frontend/src/features/permits/hooks/hooks.ts
@@ -285,7 +285,8 @@ export const useIssuePermits = (companyIdParam?: Nullable<string>) => {
   const queryClient = useQueryClient();
 
   const mutation = useMutation({
-    mutationFn: (applicationIds: string[]) => issuePermits(applicationIds, companyIdParam),
+    mutationFn: (applicationIds: string[]) =>
+      issuePermits(applicationIds, companyIdParam),
     retry: false,
     onSuccess: (issueResponseData) => {
       queryClient.invalidateQueries({
@@ -311,9 +312,7 @@ export const useIssuePermits = (companyIdParam?: Nullable<string>) => {
 export const useAmendPermit = (companyIdParam?: Nullable<string>) => {
   const queryClient = useQueryClient();
   return useMutation({
-    mutationFn: async (
-      data: AmendPermitFormData,
-    ) => {
+    mutationFn: async (data: AmendPermitFormData) => {
       const amendResult = await amendPermit(data, companyIdParam);
       if (amendResult.status === 200 || amendResult.status === 201) {
         queryClient.invalidateQueries({
@@ -344,7 +343,8 @@ export const useModifyAmendmentApplication = () => {
   return useMutation({
     mutationFn: async (data: {
       application: AmendPermitFormData;
-      applicationNumber: string;
+      applicationId: string;
+      companyId: string;
     }) => {
       const amendResult = await modifyAmendmentApplication(data);
       if (amendResult.status === 200 || amendResult.status === 201) {

diff --git a/frontend/src/features/permits/pages/Amend/components/AmendPermitForm.tsx b/frontend/src/features/permits/pages/Amend/components/AmendPermitForm.tsx
@@ -43,15 +43,12 @@ export const AmendPermitForm = () => {
     getLinks,
   } = useContext(AmendPermitContext);
 
-  const {
-    companyLegalName,
-    idirUserDetails,
-  } = useContext(OnRouteBCContext);
+  const { companyLegalName, idirUserDetails } = useContext(OnRouteBCContext);
   const { companyId } = useParams();
 
   const isStaffActingAsCompany = Boolean(idirUserDetails?.userAuthGroup);
-  const doingBusinessAs = isStaffActingAsCompany && companyLegalName ?
-    companyLegalName : "";
+  const doingBusinessAs =
+    isStaffActingAsCompany && companyLegalName ? companyLegalName : "";
 
   const navigate = useNavigate();
 
@@ -61,7 +58,10 @@ export const AmendPermitForm = () => {
     amendmentApplication,
   );
 
-  const { createdDateTime, updatedDateTime } = getDatetimes(amendmentApplication, permit);
+  const { createdDateTime, updatedDateTime } = getDatetimes(
+    amendmentApplication,
+    permit,
+  );
 
   //The name of this feature that is used for id's, keys, and associating form components
   const FEATURE = "amend-permit";
@@ -157,15 +157,14 @@ export const AmendPermitForm = () => {
 
     const response = shouldUpdateApplication
       ? await modifyAmendmentMutation.mutateAsync({
-          applicationNumber: getDefaultRequiredVal(
+          applicationId: getDefaultRequiredVal(
             "",
-            permitToBeAmended.applicationNumber,
+            permitToBeAmended.permitId,
           ),
           application: permitToBeAmended,
+          companyId: companyId as string,
         })
-      : await amendPermitMutation.mutateAsync(
-          permitToBeAmended,
-        );
+      : await amendPermitMutation.mutateAsync(permitToBeAmended);
 
     if (response.application) {
       onSaveSuccess(response.application);

diff --git a/frontend/src/features/permits/pages/Amend/components/AmendPermitReview.tsx b/frontend/src/features/permits/pages/Amend/components/AmendPermitReview.tsx
@@ -20,6 +20,7 @@ import {
   usePowerUnitSubTypesQuery,
   useTrailerSubTypesQuery,
 } from "../../../../manageVehicles/apiManager/hooks";
+import { useParams } from "react-router-dom";
 
 export const AmendPermitReview = () => {
   const { permit, amendmentApplication, permitHistory, back, next, getLinks } =
@@ -40,7 +41,8 @@ export const AmendPermitReview = () => {
     isValidTransaction(history.paymentMethodTypeCode, history.pgApproved),
   );
 
-  const { data: companyInfo } = useCompanyInfoDetailsQuery();
+  const { companyId } = useParams();
+  const { data: companyInfo } = useCompanyInfoDetailsQuery(companyId);
   const powerUnitSubTypesQuery = usePowerUnitSubTypesQuery();
   const trailerSubTypesQuery = useTrailerSubTypesQuery();