PSP-8186 : Property File Change Log Update

source/backend/apimodels/CodeTypes/PropertyPPHStatusTypes.cs

@@ -0,0 +1,24 @@
+using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+
+namespace Pims.Api.Models.CodeTypes
+{
+    [JsonConverter(typeof(JsonStringEnumMemberConverter))]
+    public enum PropertyPPHStatusTypes
+    {
+        [EnumMember(Value = "ARTERY")]
+        ARTERY,
+
+        [EnumMember(Value = "COMBO")]
+        COMBO,
+
+        [EnumMember(Value = "NONPPH")]
+        NONPPH,
+
+        [EnumMember(Value = "PPH")]
+        PPH,
+
+        [EnumMember(Value = "UNKNOWN")]
+        UNKNOWN,
+    }
+}

source/backend/dal/Pims.Dal.csproj

@@ -43,6 +43,7 @@
     <None Remove=".env" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\apimodels\Pims.Api.Models.csproj" />
     <ProjectReference Include="..\entities\Pims.Dal.Entities.csproj" />
     <ProjectReference Include="..\core\Pims.Core.csproj" />
   </ItemGroup>

source/backend/dal/Repositories/PropertyRepository.cs

@@ -6,6 +6,7 @@
 using LinqKit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
+using Pims.Api.Models.CodeTypes;
 using Pims.Core.Exceptions;
 using Pims.Core.Extensions;
 using Pims.Core.Helpers;
@@ -346,7 +347,8 @@ public PimsProperty Update(PimsProperty property, bool overrideLocation = false)
             property.IsVisibleToOtherAgencies = existingProperty.IsVisibleToOtherAgencies;
             property.IsSensitive = existingProperty.IsSensitive;
 
-            if (property.PphStatusTypeCode != existingProperty.PphStatusTypeCode)
+            if (property.PphStatusTypeCode != existingProperty.PphStatusTypeCode
+                && (property.PphStatusTypeCode != PropertyPPHStatusTypes.UNKNOWN.ToString() && existingProperty.PphStatusTypeCode != null))
             {
                 property.PphStatusUpdateTimestamp = DateTime.UtcNow;
                 property.PphStatusUpdateUserid = User.GetUsername();

source/backend/tests/core/PrincipalHelper.cs

@@ -62,6 +62,7 @@ public static ClaimsPrincipal CreateForPermission(params Permissions[] permissio
             var claims = new List<Claim>
             {
                 new Claim("idir_user_guid", Guid.NewGuid().ToString().Replace("-", string.Empty)),
+                new Claim("idir_username", "username@"),
                 new Claim(ClaimTypes.Email, "[email protected]"),
             };
 

source/backend/tests/unit/dal/Repositories/PropertyRepositoryTest.cs

@@ -5,6 +5,7 @@
 using System.Drawing;
 using System.Linq;
 using FluentAssertions;
+using Pims.Api.Models.CodeTypes;
 using Pims.Core.Exceptions;
 using Pims.Core.Extensions;
 using Pims.Core.Test;
@@ -668,6 +669,61 @@ public void Update_Property_ThrowIfNull()
             // Assert
             act.Should().Throw<ArgumentNullException>();
         }
+
+        [Fact]
+        public void Update_Property_DoesNOT_UPDATE_PPH_Audit()
+        {
+            // Arrange
+            var repository = CreateRepositoryWithPermissions(Permissions.PropertyView, Permissions.PropertyEdit);
+            var property = EntityHelper.CreateProperty(1);
+            property.PphStatusTypeCode = null;
+            property.PphStatusUpdateTimestamp = null;
+            property.PphStatusUpdateUserid = null;
+            property.PphStatusUpdateUserGuid = null;
+
+            _helper.AddAndSaveChanges(property);
+
+            var updateProperty = new PimsProperty();
+            updateProperty.PropertyId = property.PropertyId;
+            updateProperty.PphStatusTypeCode = PropertyPPHStatusTypes.UNKNOWN.ToString();
+
+            // Act
+            var result = repository.Update(updateProperty);
+
+            // Assert
+            Assert.Null(result.PphStatusUpdateTimestamp);
+            Assert.Null(result.PphStatusUpdateUserid);
+            Assert.Null(result.PphStatusUpdateUserGuid);
+        }
+
+        [Fact]
+        public void Update_Property_Update_PPH_Audit()
+        {
+            // Arrange
+            var repository = CreateRepositoryWithPermissions(Permissions.PropertyView, Permissions.PropertyEdit);
+
+            var property = EntityHelper.CreateProperty(1);
+            property.PphStatusTypeCode = PropertyPPHStatusTypes.UNKNOWN.ToString();
+            property.PphStatusUpdateTimestamp = null;
+            property.PphStatusUpdateUserid = null;
+            property.PphStatusUpdateUserGuid = null;
+
+            _helper.AddAndSaveChanges(property);
+
+            var updateProperty = new PimsProperty();
+            updateProperty.PropertyId = property.PropertyId;
+            updateProperty.PphStatusTypeCode = PropertyPPHStatusTypes.COMBO.ToString();
+
+            // Act
+            var result = repository.Update(updateProperty);
+
+            // Assert
+            Assert.Equal(PropertyPPHStatusTypes.COMBO.ToString(), result.PphStatusTypeCode);
+            Assert.NotNull(result.PphStatusUpdateTimestamp);
+            Assert.NotNull(result.PphStatusUpdateUserid);
+            Assert.NotNull(result.PphStatusUpdateUserGuid);
+        }
+
         #endregion
 
         #region Delete

source/backend/tests/unit/dal/Repositories/UserRepositoryTest.cs

@@ -99,6 +99,7 @@ public void Activate_Success()
             // Arrange
             var helper = new TestHelper();
             var user = PrincipalHelper.CreateForPermission(Permissions.AdminUsers);
+
             var updatedUser = user.AddClaim("idir_username", "username@");
             updatedUser = updatedUser.AddClaim(ClaimTypes.GivenName, "first");
             updatedUser = updatedUser.AddClaim(ClaimTypes.Surname, "last");

source/frontend/src/features/mapSideBar/property/tabs/propertyDetails/update/models/UpdatePropertyDetailsFormModel.ts

@@ -1,6 +1,7 @@
 import { GeoJsonProperties } from 'geojson';
 import { isEmpty } from 'lodash';
 
+import { ApiGen_CodeTypes_PropertyPPHStatusTypes } from '@/models/api/generated/ApiGen_CodeTypes_PropertyPPHStatusTypes';
 import { ApiGen_Concepts_Address } from '@/models/api/generated/ApiGen_Concepts_Address';
 import { ApiGen_Concepts_CodeType } from '@/models/api/generated/ApiGen_Concepts_CodeType';
 import { ApiGen_Concepts_Property } from '@/models/api/generated/ApiGen_Concepts_Property';
@@ -152,7 +153,8 @@ export class UpdatePropertyDetailsFormModel {
     model.description = base.description ?? undefined;
     model.isSensitive = base.isSensitive;
     model.isRetired = base.isRetired;
-    model.pphStatusTypeCode = base.pphStatusTypeCode ?? 'UNKNOWN';
+    model.pphStatusTypeCode =
+      base.pphStatusTypeCode ?? ApiGen_CodeTypes_PropertyPPHStatusTypes.UNKNOWN.toString();
     model.isRwyBeltDomPatent = base.isRwyBeltDomPatent ?? undefined;
     model.pphStatusUpdateUserid = base.pphStatusUpdateUserid ?? undefined;
     model.pphStatusUpdateUserGuid = base.pphStatusUpdateUserGuid ?? undefined;

source/frontend/src/models/api/generated/ApiGen_CodeTypes_PropertyPPHStatusTypes.ts

@@ -0,0 +1,11 @@
+/**
+ * File autogenerated by TsGenerator.
+ * Do not manually modify, changes made to this file will be lost when this file is regenerated.
+ */
+export enum ApiGen_CodeTypes_PropertyPPHStatusTypes {
+  ARTERY = 'ARTERY',
+  COMBO = 'COMBO',
+  NONPPH = 'NONPPH',
+  PPH = 'PPH',
+  UNKNOWN = 'UNKNOWN',
+}

source/frontend/src/models/api/generated/ApiGen_CodeTypes_TakeTypes.ts

@@ -0,0 +1,8 @@
+/**
+ * File autogenerated by TsGenerator.
+ * Do not manually modify, changes made to this file will be lost when this file is regenerated.
+ */
+export enum ApiGen_CodeTypes_TakeTypes {
+  TOTAL = 'TOTAL',
+  PARTIAL = 'PARTIAL',
+}