PSP-7618 : Re-add project/product to Disposition Files (Create, Update and View File Summary) #3777

eddherrera · 2024-02-07T00:18:12Z

…e and View File Summary)

github-actions · 2024-02-07T00:20:19Z

✅ No secrets were detected in the code.

github-actions · 2024-02-07T00:35:25Z

✅ No secrets were detected in the code.

codecov · 2024-02-07T00:39:57Z

Codecov Report

Attention: 69 lines in your changes are missing coverage. Please review.

Comparison is base (354e7ff) 77.54% compared to head (43401a1) 75.65%.

Additional details and impacted files

@@            Coverage Diff             @@
##              dev    #3777      +/-   ##
==========================================
- Coverage   77.54%   75.65%   -1.90%     
==========================================
  Files         493     1448     +955     
  Lines       17099    37910   +20811     
  Branches     1122     7133    +6011     
==========================================
+ Hits        13260    28682   +15422     
- Misses       3560     8945    +5385     
- Partials      279      283       +4

Flag	Coverage Δ
unittests	`75.65% <55.76%> (-1.90%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
...rce/backend/api/Services/DispositionFileService.cs	`85.56% <ø> (ø)`
...els/Concepts/DispositionFile/DispositionFileMap.cs	`100.00% <100.00%> (ø)`
...Concepts/DispositionFile/DispositionFileSaleMap.cs	`100.00% <100.00%> (ø)`
...ispositionFile/DispositionSalePurchaserAgentMap.cs	`100.00% <ø> (ø)`
...sitionFile/DispositionSalePurchaserSolicitorMap.cs	`100.00% <ø> (ø)`
source/backend/dal/Repositories/BaseRepository.cs	`100.00% <ø> (ø)`
...tionSale/form/DispositionSalePurchasersSubForm.tsx	`94.73% <100.00%> (ø)`
...SideBar/disposition/models/DispositionFormModel.ts	`91.46% <87.50%> (ø)`
.../disposition/models/DispositionSaleContactModel.ts	`73.33% <50.00%> (ø)`
...Bar/disposition/models/DispositionSaleFormModel.ts	`88.76% <80.00%> (ø)`
... and 5 more

... and 947 files with indirect coverage changes

devinleighsmith · 2024-02-07T16:43:54Z

source/backend/apimodels/Models/Concepts/DispositionFile/DispositionFileModel.cs

+        public long? ProjectId { get; set; }
+
+        /// <summary>
+        /// get/set - The acquisition project.


acquisition -> disposition

devinleighsmith · 2024-02-07T16:47:31Z

source/backend/dal/Repositories/BaseRepository.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Security.Claims;
+using Microsoft.EntityFrameworkCore.Storage;


this looks unused to me (remove)

devinleighsmith · 2024-02-07T16:48:25Z

source/backend/dal/Repositories/DispositionFileRepository.cs

+            {
+                Context.Remove(existingSale.DspPurchAgent);
+                dispositionSale.DspPurchAgentId = null;
+            }


Test coverage on these conditionals is a bit spotty, can you add some tests for this?

devinleighsmith · 2024-02-07T16:52:29Z

source/frontend/src/features/disposition/list/DispositionListView.test.tsx

@@ -108,7 +112,7 @@ describe('Disposition List View', () => {
  it('searches by pid', async () => {
    let results = mockPagedResults([
      {
-        ...mockDispositionFileResponse(),
+        ...(mockDispositionFileResponse() as unknown as Api_DispositionFile),


I'm having trouble understanding the need for this, if the entire point of this mock is to create a disposition file, why are you needing to cast this to an Api_DispositionFile via an unknown?

I am casting from the new generated models ApiGen_Concepts_XXX I am limiting the use of the new models scoped to what I am currently working and not trying to spill over everywhere. The story to do the removal of old models would just need to remove the casting.

ah ok. I see. That is fine for now then.

Actually, can you log a follow-up task for is74 that would cover correcting this once we merge 5.1

That way we don't forget.

Task created.

devinleighsmith · 2024-02-07T16:58:32Z

source/frontend/src/features/mapSideBar/disposition/form/DispositionForm.tsx

+          if (param[0].id) {
+            const result = await retrieveProjectProducts(param[0].id);
+            if (result) {
+              setProjectProducts(result as unknown as ApiGen_Concepts_Product[]);


I still don't understand why all this casting is necessary. Is this not the type returned by the API?

same as previous comment. Related to the use of the new generated models but limiting to the scope of what I am working on.

devinleighsmith · 2024-02-07T16:59:06Z

source/frontend/src/features/mapSideBar/disposition/form/DispositionForm.tsx

+    );
+
+    useEffect(() => {
+      console.log(initialValues.project);


console.log

devinleighsmith · 2024-02-07T17:00:47Z

source/frontend/src/features/mapSideBar/disposition/form/DispositionForm.tsx

+                      onChange={(vals: IAutocompletePrediction[]) => {
+                        onMinistryProjectSelected(vals);
+                        if (vals.length === 0) {
+                          formikProps.setFieldValue('project', 0);


Is this correct? Or should this be product?

it should be product. updated.

github-actions · 2024-02-07T19:48:05Z

✅ No secrets were detected in the code.

devinleighsmith · 2024-02-07T20:44:21Z

...src/features/mapSideBar/disposition/tabs/fileDetails/detail/update/UpdateDispositionForm.tsx

+  );
+
+  useEffect(() => {
+    console.log(initialValues.project);


console.log

github-actions · 2024-02-07T21:01:26Z

✅ No secrets were detected in the code.

devinleighsmith · 2024-02-07T22:18:36Z

@eddherrera removing a purchaser solicitor or purchaser agent causes the db to throw a foreign key violation exception. Are you missing unit tests for that case?

devinleighsmith · 2024-02-07T22:19:14Z

SqlException: *** [PIMS_DSPPUR_I_S_U_TR], Line 14. Errno 547: The UPDATE statement conflicted with the FOREIGN KEY constraint "PIM_DSPSAL_PIM_DSPPUR_FK". The conflict occurred in database "pims", table "dbo.PIMS_DISPOSITION_SALE", column 'DISPOSITION_SALE_ID'.

devinleighsmith · 2024-02-07T22:22:05Z

Similarly, I received the following with this test:

Add two purchaser names
Delete one
Update the other

SqlException: *** [PIMS_DSPPUR_I_S_U_TR], Line 14. Errno 547: The UPDATE statement conflicted with the FOREIGN KEY constraint "PIM_DSPSAL_PIM_DSPPUR_FK". The conflict occurred in database "pims", table "dbo.PIMS_DISPOSITION_SALE", column 'DISPOSITION_SALE_ID'.

devinleighsmith · 2024-02-07T22:26:54Z

Also, the "product" field does not seem to be cleared appropriately when the parent project is removed:

Add a project and product.
Remove the project
Add another, different project.
(Unexpectedly, the product I chose for 1 is being inserted when I select the new project in step 3)

github-actions · 2024-02-08T17:21:00Z

✅ No secrets were detected in the code.

github-actions · 2024-02-08T17:35:31Z

✅ No secrets were detected in the code.

github-actions · 2024-02-08T17:41:16Z

✅ No secrets were detected in the code.

eddherrera · 2024-02-08T18:37:14Z

@devinleighsmith updated issue with project-product and fixed issue with FK.

github-actions · 2024-02-08T19:31:54Z

✅ No secrets were detected in the code.

github-actions · 2024-02-08T19:57:06Z

✅ No secrets were detected in the code.

Eduardo Herrera added 3 commits February 5, 2024 13:02

- DB scaffolding model updates

9b25b0a

PSP-7618 : Re-add project/product to Disposition Files (Create, Updat…

d90df9a

…e and View File Summary)

- linting

aa809d7

eddherrera added the enhancement New feature or request label Feb 7, 2024

eddherrera requested review from asanchezr and devinleighsmith February 7, 2024 00:18

eddherrera self-assigned this Feb 7, 2024

Eduardo Herrera added 3 commits February 6, 2024 16:23

Merge branch 'dev' into psp-7618

bc10cb4

- linting

9fa2ae4

- linting

003ae8e

devinleighsmith reviewed Feb 7, 2024

View reviewed changes

Eduardo Herrera added 2 commits February 7, 2024 11:40

- updates

1209403

Merge branch 'dev' into psp-7618

97530aa

eddherrera requested a review from devinleighsmith February 7, 2024 19:59

devinleighsmith reviewed Feb 7, 2024

View reviewed changes

- updates

453aeef

eddherrera requested a review from devinleighsmith February 7, 2024 21:12

- updates

15a16d6

- test updates

dcdda15

Merge branch 'dev' into psp-7618

cda8a85

Merge branch 'dev' into psp-7618

d9dab1d

- test updates

43401a1

devinleighsmith approved these changes Feb 8, 2024

View reviewed changes

eddherrera merged commit 04b3dd0 into bcgov:dev Feb 8, 2024
9 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PSP-7618 : Re-add project/product to Disposition Files (Create, Update and View File Summary) #3777

PSP-7618 : Re-add project/product to Disposition Files (Create, Update and View File Summary) #3777

eddherrera commented Feb 7, 2024

github-actions bot commented Feb 7, 2024

github-actions bot commented Feb 7, 2024

codecov bot commented Feb 7, 2024 •

edited

Loading

devinleighsmith Feb 7, 2024

devinleighsmith Feb 7, 2024

eddherrera Feb 7, 2024

devinleighsmith Feb 7, 2024

eddherrera Feb 7, 2024

devinleighsmith Feb 7, 2024

eddherrera Feb 7, 2024 •

edited

Loading

devinleighsmith Feb 7, 2024

devinleighsmith Feb 7, 2024

eddherrera Feb 7, 2024

devinleighsmith Feb 7, 2024

eddherrera Feb 7, 2024

devinleighsmith Feb 7, 2024

eddherrera Feb 7, 2024

devinleighsmith Feb 7, 2024

eddherrera Feb 7, 2024

github-actions bot commented Feb 7, 2024

devinleighsmith Feb 7, 2024

eddherrera Feb 7, 2024

github-actions bot commented Feb 7, 2024

devinleighsmith commented Feb 7, 2024

devinleighsmith commented Feb 7, 2024

devinleighsmith commented Feb 7, 2024

devinleighsmith commented Feb 7, 2024 •

edited

Loading

github-actions bot commented Feb 8, 2024

github-actions bot commented Feb 8, 2024

github-actions bot commented Feb 8, 2024

eddherrera commented Feb 8, 2024

github-actions bot commented Feb 8, 2024

github-actions bot commented Feb 8, 2024

PSP-7618 : Re-add project/product to Disposition Files (Create, Update and View File Summary) #3777

PSP-7618 : Re-add project/product to Disposition Files (Create, Update and View File Summary) #3777

Conversation

eddherrera commented Feb 7, 2024

github-actions bot commented Feb 7, 2024

github-actions bot commented Feb 7, 2024

codecov bot commented Feb 7, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eddherrera Feb 7, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Feb 7, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Feb 7, 2024

devinleighsmith commented Feb 7, 2024

devinleighsmith commented Feb 7, 2024

devinleighsmith commented Feb 7, 2024

devinleighsmith commented Feb 7, 2024 • edited Loading

github-actions bot commented Feb 8, 2024

github-actions bot commented Feb 8, 2024

github-actions bot commented Feb 8, 2024

eddherrera commented Feb 8, 2024

github-actions bot commented Feb 8, 2024

github-actions bot commented Feb 8, 2024

codecov bot commented Feb 7, 2024 •

edited

Loading

eddherrera Feb 7, 2024 •

edited

Loading

devinleighsmith commented Feb 7, 2024 •

edited

Loading