PSP-6527 : FT-REG: Lease & License - When a new license is created, t…

…he Created By and Last updated By dates are not displayed and the user is always USER (#3336) Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com>
bcgov · Jul 18, 2023 · 5411ba7 · 5411ba7
1 parent aeb41d7
commit 5411ba7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/source/backend/api/Models/Concepts/Lease/LeaseModel.cs b/source/backend/api/Models/Concepts/Lease/LeaseModel.cs
@@ -1,13 +1,13 @@
-using Pims.Api.Models.Tenant;
 using System;
 using System.Collections.Generic;
+using Pims.Api.Models.Tenant;
 
 namespace Pims.Api.Models.Concepts
 {
  /// <summary>
  /// Provides a lease-oriented model.
  /// </summary>
- public class LeaseModel
+ public class LeaseModel : BaseAppModel
  {
  #region Properties
 
@@ -16,11 +16,6 @@ public class LeaseModel
  /// </summary>
  public long Id { get; set; }
 
- /// <summary>
- /// get/set - The concurrency row version.
- /// </summary>
- public long RowVersion { get; set; }
-
  /// <summary>
  /// get/set - The lease amount.
  /// </summary>

diff --git a/source/frontend/src/features/mapSideBar/lease/common/LeaseHeader.test.tsx b/source/frontend/src/features/mapSideBar/lease/common/LeaseHeader.test.tsx
@@ -39,6 +39,8 @@ describe('LeaseHeader component', () => {
  const { getByText, getAllByText } = setup({ lease: testLease });
 
  expect(getByText(testLease.lFileNo!)).toBeVisible();
+ expect(getByText(testLease.appCreateUserid!)).toBeVisible();
+ expect(getByText(testLease.appLastUpdateUserid!)).toBeVisible();
  expect(getAllByText(prettyFormatDate(testLease.appCreateTimestamp))[0]).toBeVisible();
  expect(getAllByText(prettyFormatDate(testLease.appLastUpdateTimestamp))[0]).toBeVisible();
  });

diff --git a/source/frontend/src/features/mapSideBar/lease/common/__snapshots__/LeaseHeader.test.tsx.snap b/source/frontend/src/features/mapSideBar/lease/common/__snapshots__/LeaseHeader.test.tsx.snap
@@ -306,7 +306,7 @@ exports[`LeaseHeader component renders as expected when no data is provided 1`]
  id="userNameTooltip"
  >
  <strong>
- USER
+ USER_B
  </strong>
  </span>
  </span>
@@ -332,7 +332,7 @@ exports[`LeaseHeader component renders as expected when no data is provided 1`]
  id="userNameTooltip"
  >
  <strong>
- USER
+ USER_A
  </strong>
  </span>
  </span>

diff --git a/source/frontend/src/mocks/lease.mock.ts b/source/frontend/src/mocks/lease.mock.ts
@@ -246,4 +246,8 @@ export const getMockApiLease: () => Api_Lease = () => ({
  consultations: [],
  appCreateTimestamp: '2022-01-01T00:56:06.693',
  appLastUpdateTimestamp: '2022-01-01T00:56:06.693',
+ appLastUpdateUserid: 'USER_A',
+ appCreateUserid: 'USER_B',
+ appLastUpdateUserGuid: '77777777-7777-7777-7777-777777777777',
+ appCreateUserGuid: '77777777-7777-7777-7777-777777777777',
 });