psp-7095 add default status to new management activities, display sta…

…tus as required field.
bcgov · Oct 31, 2023 · baed0e0 · baed0e0
1 parent b857440
commit baed0e0
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/source/backend/api/Services/PropertyService.cs b/source/backend/api/Services/PropertyService.cs
@@ -230,6 +230,11 @@ public PimsPropertyActivity CreateActivity(PimsPropertyActivity propertyActivity
             _logger.LogInformation("Creating property Activity...");
             _user.ThrowIfNotAuthorized(Permissions.ManagementAdd, Permissions.PropertyEdit);
 
+            if (propertyActivity.PropMgmtActivityStatusTypeCode == null)
+            {
+                propertyActivity.PropMgmtActivityStatusTypeCode = "NOTSTARTED";
+            }
+
             var propertyActivityResult = _propertyActivityRepository.Create(propertyActivity);
             _propertyActivityRepository.CommitTransaction();
 

diff --git a/source/backend/tests/unit/api/Services/PropertyServiceTest.cs b/source/backend/tests/unit/api/Services/PropertyServiceTest.cs
@@ -297,6 +297,37 @@ public void Update_PropertyManagement_NoPermission()
             repository.Verify(x => x.UpdatePropertyManagement(It.IsAny<PimsProperty>()), Times.Never);
         }
 
+        [Fact]
+        public void Create_PropertyManagementActivity_NoPermission()
+        {
+            // Arrange
+            var service = this.CreatePropertyServiceWithPermissions();
+            var repository = this._helper.GetService<Mock<IPropertyActivityRepository>>();
+
+            // Act
+            Action act = () => service.CreateActivity(new PimsPropertyActivity());
+
+            // Assert
+            act.Should().Throw<NotAuthorizedException>();
+            repository.Verify(x => x.Create(It.IsAny<PimsPropertyActivity>()), Times.Never);
+        }
+
+        [Fact]
+        public void Create_PropertyManagementActivity_Success()
+        {
+            // Arrange
+            var service = this.CreatePropertyServiceWithPermissions(Permissions.ManagementAdd, Permissions.PropertyEdit);
+            var repository = this._helper.GetService<Mock<IPropertyActivityRepository>>();
+            var activity = new PimsPropertyActivity();
+
+            // Act
+            var result = service.CreateActivity(activity);
+
+            // Assert
+            activity.PropMgmtActivityStatusTypeCode.Should().Be("NOTSTARTED");
+            repository.Verify(x => x.Create(It.IsAny<PimsPropertyActivity>()), Times.Once);
+        }
+
 
         [Fact]
         public void Get_PropertyManagement_Activities_NoPermission()

diff --git a/...ideBar/property/tabs/propertyDetailsManagement/activity/edit/PropertyActivityEditForm.tsx b/...ideBar/property/tabs/propertyDetailsManagement/activity/edit/PropertyActivityEditForm.tsx
@@ -131,7 +131,7 @@ export const PropertyActivityEditForm: React.FunctionComponent<
                             placeholder="Select subtype"
                           />
                         </SectionField>
-                        <SectionField label="Activity status" contentWidth="7">
+                        <SectionField label="Activity status" contentWidth="7" required>
                           <Select
                             field="activityStatusCode"
                             options={activityStatusOptions}