psp-7548

bcgov · Jan 27, 2024 · 1f582ce · 1f582ce
1 parent 868b19b
commit 1f582ce
Show file tree

Hide file tree

Showing 17 changed files with 242 additions and 16 deletions.
diff --git a/source/backend/dal/Repositories/DispositionFileRepository.cs b/source/backend/dal/Repositories/DispositionFileRepository.cs
@@ -174,6 +174,186 @@ public LastUpdatedByModel GetLastUpdateBy(long id)
             .ToList();
             lastUpdatedByAggregate.AddRange(propertiesHistoryLastUpdatedBy);
 
+            // Disposition Sales
+            var salesLastUpdatedBy = this.Context.PimsDispositionSales.AsNoTracking()
+                .Where(dp => dp.DispositionFileId == id)
+                .Select(dp => new LastUpdatedByModel()
+                {
+                    ParentId = id,
+                    AppLastUpdateUserid = dp.AppLastUpdateUserid,
+                    AppLastUpdateUserGuid = dp.AppLastUpdateUserGuid,
+                    AppLastUpdateTimestamp = dp.AppLastUpdateTimestamp,
+                })
+                .OrderByDescending(lu => lu.AppLastUpdateTimestamp)
+                .Take(1)
+                .ToList();
+            lastUpdatedByAggregate.AddRange(salesLastUpdatedBy);
+
+            // Disposition Deleted Sales
+            var salesHistoryLastUpdatedBy = Context.PimsDispositionSaleHists.AsNoTracking()
+            .Where(dph => dph.DispositionFileId == id)
+            .Select(dph => new LastUpdatedByModel()
+            {
+                ParentId = id,
+                AppLastUpdateUserid = dph.AppLastUpdateUserid, // TODO: Update this once the DB tracks the user
+                AppLastUpdateUserGuid = dph.AppLastUpdateUserGuid, // TODO: Update this once the DB tracks the user
+                AppLastUpdateTimestamp = dph.EndDateHist ?? DateTime.UnixEpoch,
+            })
+            .OrderByDescending(lu => lu.AppLastUpdateTimestamp)
+            .Take(1)
+            .ToList();
+            lastUpdatedByAggregate.AddRange(salesHistoryLastUpdatedBy);
+
+            // Disposition Offers
+            var offerLastUpdatedBy = this.Context.PimsDispositionOffers.AsNoTracking()
+                .Where(dp => dp.DispositionFileId == id)
+                .Select(dp => new LastUpdatedByModel()
+                {
+                    ParentId = id,
+                    AppLastUpdateUserid = dp.AppLastUpdateUserid,
+                    AppLastUpdateUserGuid = dp.AppLastUpdateUserGuid,
+                    AppLastUpdateTimestamp = dp.AppLastUpdateTimestamp,
+                })
+                .OrderByDescending(lu => lu.AppLastUpdateTimestamp)
+                .Take(1)
+                .ToList();
+            lastUpdatedByAggregate.AddRange(offerLastUpdatedBy);
+
+            // Disposition Deleted Offers
+            var offerHistoryLastUpdatedBy = Context.PimsDispositionOfferHists.AsNoTracking()
+            .Where(dph => dph.DispositionFileId == id)
+            .Select(dph => new LastUpdatedByModel()
+            {
+                ParentId = id,
+                AppLastUpdateUserid = dph.AppLastUpdateUserid, // TODO: Update this once the DB tracks the user
+                AppLastUpdateUserGuid = dph.AppLastUpdateUserGuid, // TODO: Update this once the DB tracks the user
+                AppLastUpdateTimestamp = dph.EndDateHist ?? DateTime.UnixEpoch,
+            })
+            .OrderByDescending(lu => lu.AppLastUpdateTimestamp)
+            .Take(1)
+            .ToList();
+            lastUpdatedByAggregate.AddRange(offerHistoryLastUpdatedBy);
+
+            // Disposition Values
+            var valueLastUpdatedBy = this.Context.PimsDispositionAppraisals.AsNoTracking()
+                .Where(dp => dp.DispositionFileId == id)
+                .Select(dp => new LastUpdatedByModel()
+                {
+                    ParentId = id,
+                    AppLastUpdateUserid = dp.AppLastUpdateUserid,
+                    AppLastUpdateUserGuid = dp.AppLastUpdateUserGuid,
+                    AppLastUpdateTimestamp = dp.AppLastUpdateTimestamp,
+                })
+                .OrderByDescending(lu => lu.AppLastUpdateTimestamp)
+                .Take(1)
+                .ToList();
+            lastUpdatedByAggregate.AddRange(valueLastUpdatedBy);
+
+            // Disposition Deleted Values
+            var valueHistoryLastUpdatedBy = Context.PimsDispositionAppraisalHists.AsNoTracking()
+            .Where(dph => dph.DispositionFileId == id)
+            .Select(dph => new LastUpdatedByModel()
+            {
+                ParentId = id,
+                AppLastUpdateUserid = dph.AppLastUpdateUserid, // TODO: Update this once the DB tracks the user
+                AppLastUpdateUserGuid = dph.AppLastUpdateUserGuid, // TODO: Update this once the DB tracks the user
+                AppLastUpdateTimestamp = dph.EndDateHist ?? DateTime.UnixEpoch,
+            })
+            .OrderByDescending(lu => lu.AppLastUpdateTimestamp)
+            .Take(1)
+            .ToList();
+            lastUpdatedByAggregate.AddRange(valueHistoryLastUpdatedBy);
+
+            // Disposition Checklist
+            var checklistLastUpdatedBy = this.Context.PimsDispositionChecklistItems.AsNoTracking()
+                .Where(dp => dp.DispositionFileId == id)
+                .Select(dp => new LastUpdatedByModel()
+                {
+                    ParentId = id,
+                    AppLastUpdateUserid = dp.AppLastUpdateUserid,
+                    AppLastUpdateUserGuid = dp.AppLastUpdateUserGuid,
+                    AppLastUpdateTimestamp = dp.AppLastUpdateTimestamp,
+                })
+                .OrderByDescending(lu => lu.AppLastUpdateTimestamp)
+                .Take(1)
+                .ToList();
+            lastUpdatedByAggregate.AddRange(checklistLastUpdatedBy);
+
+            // Disposition Deleted Checklists
+            var checklistHistoryLastUpdatedBy = Context.PimsDispositionChecklistItemHists.AsNoTracking()
+            .Where(dph => dph.DispositionFileId == id)
+            .Select(dph => new LastUpdatedByModel()
+            {
+                ParentId = id,
+                AppLastUpdateUserid = dph.AppLastUpdateUserid, // TODO: Update this once the DB tracks the user
+                AppLastUpdateUserGuid = dph.AppLastUpdateUserGuid, // TODO: Update this once the DB tracks the user
+                AppLastUpdateTimestamp = dph.EndDateHist ?? DateTime.UnixEpoch,
+            })
+            .OrderByDescending(lu => lu.AppLastUpdateTimestamp)
+            .Take(1)
+            .ToList();
+            lastUpdatedByAggregate.AddRange(checklistHistoryLastUpdatedBy);
+
+            // Disposition Document
+            var documentLastUpdatedBy = this.Context.PimsDispositionFileDocuments.AsNoTracking()
+                .Where(dp => dp.DispositionFileId == id)
+                .Select(dp => new LastUpdatedByModel()
+                {
+                    ParentId = id,
+                    AppLastUpdateUserid = dp.AppLastUpdateUserid,
+                    AppLastUpdateUserGuid = dp.AppLastUpdateUserGuid,
+                    AppLastUpdateTimestamp = dp.AppLastUpdateTimestamp,
+                })
+                .OrderByDescending(lu => lu.AppLastUpdateTimestamp)
+                .Take(1)
+                .ToList();
+            lastUpdatedByAggregate.AddRange(documentLastUpdatedBy);
+
+            // Disposition Deleted Documents
+            var documentHistoryLastUpdatedBy = Context.PimsDispositionFileDocumentHists.AsNoTracking()
+            .Where(dph => dph.DispositionFileId == id)
+            .Select(dph => new LastUpdatedByModel()
+            {
+                ParentId = id,
+                AppLastUpdateUserid = dph.AppLastUpdateUserid, // TODO: Update this once the DB tracks the user
+                AppLastUpdateUserGuid = dph.AppLastUpdateUserGuid, // TODO: Update this once the DB tracks the user
+                AppLastUpdateTimestamp = dph.EndDateHist ?? DateTime.UnixEpoch,
+            })
+            .OrderByDescending(lu => lu.AppLastUpdateTimestamp)
+            .Take(1)
+            .ToList();
+            lastUpdatedByAggregate.AddRange(documentHistoryLastUpdatedBy);
+
+            // Disposition Notes
+            var notesLastUpdatedBy = this.Context.PimsDispositionFileNotes.AsNoTracking()
+                .Where(dp => dp.DispositionFileId == id)
+                .Select(dp => new LastUpdatedByModel()
+                {
+                    ParentId = id,
+                    AppLastUpdateUserid = dp.AppLastUpdateUserid,
+                    AppLastUpdateUserGuid = dp.AppLastUpdateUserGuid,
+                    AppLastUpdateTimestamp = dp.AppLastUpdateTimestamp,
+                })
+                .OrderByDescending(lu => lu.AppLastUpdateTimestamp)
+                .Take(1)
+                .ToList();
+            lastUpdatedByAggregate.AddRange(notesLastUpdatedBy);
+
+            // Disposition Deleted Notes
+            var notesHistoryLastUpdatedBy = Context.PimsDispositionFileNoteHists.AsNoTracking()
+            .Where(dph => dph.DispositionFileId == id)
+            .Select(dph => new LastUpdatedByModel()
+            {
+                ParentId = id,
+                AppLastUpdateUserid = dph.AppLastUpdateUserid, // TODO: Update this once the DB tracks the user
+                AppLastUpdateUserGuid = dph.AppLastUpdateUserGuid, // TODO: Update this once the DB tracks the user
+                AppLastUpdateTimestamp = dph.EndDateHist ?? DateTime.UnixEpoch,
+            })
+            .OrderByDescending(lu => lu.AppLastUpdateTimestamp)
+            .Take(1)
+            .ToList();
+            lastUpdatedByAggregate.AddRange(notesHistoryLastUpdatedBy);
+
             return lastUpdatedByAggregate.OrderByDescending(x => x.AppLastUpdateTimestamp).FirstOrDefault();
         }
 

diff --git a/source/frontend/src/constants/dispositionFileStatus.ts b/source/frontend/src/constants/dispositionFileStatus.ts
@@ -0,0 +1,9 @@
+export enum DispositionFileStatus {
+  Active = 'ACTIVE',
+  Archived = 'ARCHIVED',
+  Cancelled = 'CANCELLED',
+  Closed = 'CLOSED',
+  Complete = 'COMPLETE',
+  Draft = 'DRAFT',
+  Hold = 'HOLD',
+}
diff --git a/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.test.tsx b/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.test.tsx
@@ -204,7 +204,7 @@ describe('DispositionContainer component', () => {
     const spinner = getByTestId('filter-backdrop-loading');
     await waitForElementToBeRemoved(spinner);
 
-    await act(async () => viewProps.onSuccess());
+    await act(async () => viewProps.onSuccess(true, true));
 
     expect(mockAxios.history.get.filter(x => x.url === '/dispositionfiles/1')).toHaveLength(2);
   });

diff --git a/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx b/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx
@@ -184,10 +184,12 @@ export const DispositionContainer: React.FunctionComponent<IDispositionContainer
     setIsEditing(false);
   };
 
-  const onSuccess = (refreshProperties?: boolean) => {
-    fetchDispositionFile();
+  const onSuccess = (refreshProperties?: boolean, refreshFile?: boolean) => {
     setIsEditing(false);
     fetchLastUpdatedBy();
+    if (refreshFile) {
+      fetchDispositionFile();
+    }
     if (refreshProperties) {
       mapMachine.refreshMapProperties();
     }

diff --git a/source/frontend/src/features/mapSideBar/disposition/DispositionView.tsx b/source/frontend/src/features/mapSideBar/disposition/DispositionView.tsx
@@ -38,7 +38,7 @@ export interface IDispositionViewProps {
   onCancel: () => void;
   onMenuChange: (selectedIndex: number) => void;
   onShowPropertySelector: () => void;
-  onSuccess: (updateProperties?: boolean) => void;
+  onSuccess: (updateProperties?: boolean, updateFile?: boolean) => void;
   onUpdateProperties: (file: Api_File) => Promise<Api_File | undefined>;
   canRemove: (propertyId: number) => Promise<boolean>;
   isEditing: boolean;

diff --git a/source/frontend/src/features/mapSideBar/disposition/router/DispositionRouter.tsx b/source/frontend/src/features/mapSideBar/disposition/router/DispositionRouter.tsx
@@ -29,7 +29,7 @@ export interface IDispositionRouterProps {
   setIsEditing: (value: boolean) => void;
   defaultFileTab: FileTabType;
   defaultPropertyTab: InventoryTabNames;
-  onSuccess: (updateProperties?: boolean) => void;
+  onSuccess: (updateProperties?: boolean, updateFile?: boolean) => void;
 }
 
 export const DispositionRouter: React.FC<IDispositionRouterProps> = props => {
@@ -84,6 +84,7 @@ export const DispositionRouter: React.FC<IDispositionRouterProps> = props => {
             <UpdateDispositionAppraisalContainer
               dispositionFileId={props.dispositionFile?.id ?? 0}
               View={DispositionAppraisalForm}
+              onSuccess={props.onSuccess}
             ></UpdateDispositionAppraisalContainer>
           )}
           claim={Claims.DISPOSITION_EDIT}
@@ -97,6 +98,7 @@ export const DispositionRouter: React.FC<IDispositionRouterProps> = props => {
             <AddDispositionOfferContainer
               dispositionFileId={props.dispositionFile?.id ?? 0}
               View={DispositionOfferForm}
+              onSuccess={props.onSuccess}
             ></AddDispositionOfferContainer>
           )}
           claim={Claims.DISPOSITION_EDIT}
@@ -111,6 +113,7 @@ export const DispositionRouter: React.FC<IDispositionRouterProps> = props => {
               dispositionFileId={props.dispositionFile?.id ?? 0}
               dispositionOfferId={match.params.offerId}
               View={DispositionOfferForm}
+              onSuccess={props.onSuccess}
             ></UpdateDispositionOfferContainer>
           )}
           claim={Claims.DISPOSITION_EDIT}

diff --git a/source/frontend/src/features/mapSideBar/disposition/tabs/DispositionFileTabs.tsx b/source/frontend/src/features/mapSideBar/disposition/tabs/DispositionFileTabs.tsx
@@ -59,6 +59,7 @@ export const DispositionFileTabs: React.FC<IDispositionFileTabsProps> = ({
         <OffersAndSaleContainer
           dispositionFile={dispositionFile}
           View={OffersAndSaleContainerView}
+          onSuccess={onChildSuccess}
         ></OffersAndSaleContainer>
       ),
       key: FileTabType.OFFERS_AND_SALE,

diff --git a/...ures/mapSideBar/disposition/tabs/fileDetails/detail/update/UpdateDispositionContainer.tsx b/...ures/mapSideBar/disposition/tabs/fileDetails/detail/update/UpdateDispositionContainer.tsx
@@ -3,6 +3,7 @@ import { FormikHelpers, FormikProps } from 'formik';
 import React from 'react';
 
 import { ModalSize } from '@/components/common/GenericModal';
+import { DispositionFileStatus } from '@/constants/dispositionFileStatus';
 import { useDispositionProvider } from '@/hooks/repositories/useDispositionProvider';
 import useApiUserOverride from '@/hooks/useApiUserOverride';
 import { useModalContext } from '@/hooks/useModalContext';
@@ -15,7 +16,7 @@ import { IUpdateDispositionFormProps } from './UpdateDispositionForm';
 
 export interface IUpdateDispositionContainerProps {
   dispositionFile: Api_DispositionFile;
-  onSuccess: () => void;
+  onSuccess: (updateProperties?: boolean, updateFile?: boolean) => void;
   View: React.FC<IUpdateDispositionFormProps>;
 }
 
@@ -50,7 +51,17 @@ export const UpdateDispositionContainer = React.forwardRef<
 
         if (!!response?.id) {
           formikHelpers?.resetForm();
-          onSuccess();
+          const activeTypeCodes = [
+            DispositionFileStatus.Active.toString(),
+            DispositionFileStatus.Draft.toString(),
+            DispositionFileStatus.Hold.toString(),
+          ];
+          //refresh the map properties if this disposition file was set to a final state.
+          onSuccess(
+            !!dispositionFile.fileStatusTypeCode?.id &&
+              !activeTypeCodes.includes(dispositionFile.fileStatusTypeCode.id),
+            true,
+          );
         }
       }
     } finally {

diff --git a/...nd/src/features/mapSideBar/disposition/tabs/offersAndSale/OffersAndSaleContainer.test.tsx b/...nd/src/features/mapSideBar/disposition/tabs/offersAndSale/OffersAndSaleContainer.test.tsx
@@ -39,6 +39,7 @@ const mockDeleteDispositionFileOfferApi = {
   loading: false,
 };
 
+const onSuccess = jest.fn();
 const mockGetDispositionFileApi = mockDispositionFileResponse(1);
 
 jest.mock('@/hooks/repositories/useDispositionProvider', () => ({
@@ -69,6 +70,7 @@ describe('OffersAndSale Container component', () => {
       <OffersAndSaleContainer
         dispositionFile={renderOptions?.props?.dispositionFile ?? mockGetDispositionFileApi}
         View={TestView}
+        onSuccess={onSuccess}
       />,
       {
         history,

diff --git a/...rontend/src/features/mapSideBar/disposition/tabs/offersAndSale/OffersAndSaleContainer.tsx b/...rontend/src/features/mapSideBar/disposition/tabs/offersAndSale/OffersAndSaleContainer.tsx
@@ -13,11 +13,13 @@ import { IOffersAndSaleContainerViewProps } from './OffersAndSaleContainerView';
 export interface IOffersAndSaleContainerProps {
   dispositionFile?: Api_DispositionFile;
   View: React.FC<IOffersAndSaleContainerViewProps>;
+  onSuccess: () => void;
 }
 
 const OffersAndSaleContainer: React.FunctionComponent<IOffersAndSaleContainerProps> = ({
   dispositionFile,
   View,
+  onSuccess,
 }) => {
   const {
     getDispositionFileOffers: { execute: getDispositionFileOffers, loading: loadingOffers },
@@ -67,6 +69,7 @@ const OffersAndSaleContainer: React.FunctionComponent<IOffersAndSaleContainerPro
       if (updatedOffers) {
         setDispositionOffers(updatedOffers);
       }
+      onSuccess();
     }
   };
 

diff --git a/...bs/offersAndSale/dispositionAppraisal/update/UpdateDispositionAppraisalContainer.test.tsx b/...bs/offersAndSale/dispositionAppraisal/update/UpdateDispositionAppraisalContainer.test.tsx
@@ -38,6 +38,8 @@ const mockPostAppraisalApi = {
   loading: false,
 };
 
+const onSuccess = jest.fn();
+
 jest.mock('@/hooks/repositories/useDispositionProvider', () => ({
   useDispositionProvider: () => {
     return {
@@ -62,7 +64,11 @@ describe('Update Disposition Appraisal Container component', () => {
     } = {},
   ) => {
     const component = render(
-      <UpdateDispositionAppraisalContainer dispositionFileId={1} View={TestView} />,
+      <UpdateDispositionAppraisalContainer
+        dispositionFileId={1}
+        View={TestView}
+        onSuccess={onSuccess}
+      />,
       {
         history,
         store: {

diff --git a/...on/tabs/offersAndSale/dispositionAppraisal/update/UpdateDispositionAppraisalContainer.tsx b/...on/tabs/offersAndSale/dispositionAppraisal/update/UpdateDispositionAppraisalContainer.tsx
@@ -13,11 +13,12 @@ import { IDispositionAppraisalFormProps } from '../form/DispositionAppraisalForm
 export interface IUpdateDispositionAppraisalContainerProps {
   dispositionFileId: number;
   View: React.FC<IDispositionAppraisalFormProps>;
+  onSuccess: () => void;
 }
 
 const UpdateDispositionAppraisalContainer: React.FunctionComponent<
   React.PropsWithChildren<IUpdateDispositionAppraisalContainerProps>
-> = ({ dispositionFileId, View }) => {
+> = ({ dispositionFileId, View, onSuccess }) => {
   const history = useHistory();
   const location = useLocation();
   const backUrl = location.pathname.split(`/appraisal`)[0];
@@ -51,7 +52,8 @@ const UpdateDispositionAppraisalContainer: React.FunctionComponent<
     }
   };
 
-  const handleSucces = async () => {
+  const handleSuccess = async () => {
+    onSuccess();
     history.push(backUrl);
   };
 
@@ -73,7 +75,7 @@ const UpdateDispositionAppraisalContainer: React.FunctionComponent<
       initialValues={dispositionAppraisal}
       loading={loadingAppraisal || creatingAppraisal || updatingAppraisal}
       onSave={handleSave}
-      onSuccess={handleSucces}
+      onSuccess={handleSuccess}
       onCancel={() => history.push(backUrl)}
       onError={onError}
     ></View>