WFPREV-437 Update spatial added badge when spatial file is added to activity (#790)

ssylver93 · web-flow · commit d7db7422c4ad · 2025-06-24T14:18:13.000-07:00
diff --git a/client/wfprev-war/src/main/angular/src/app/components/edit-project/activities/activities.component.ts b/client/wfprev-war/src/main/angular/src/app/components/edit-project/activities/activities.component.ts
@@ -1,5 +1,5 @@
 import { CommonModule } from '@angular/common';
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
+import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
 import { FormBuilder, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
 import { MomentDateAdapter } from '@angular/material-moment-adapter';
 import { MatCheckboxModule } from '@angular/material/checkbox';
@@ -57,7 +57,7 @@ export const CUSTOM_DATE_FORMATS = {
     ],
 })
 
-export class ActivitiesComponent implements OnChanges, OnInit, CanComponentDeactivate{
+export class ActivitiesComponent implements OnChanges, CanComponentDeactivate{
   @Input() fiscalGuid: string = '';
   @Output() boundariesUpdated = new EventEmitter<void>();
 
@@ -90,8 +90,6 @@ export class ActivitiesComponent implements OnChanges, OnInit, CanComponentDeact
       public cd: ChangeDetectorRef
     ) {}
 
-  ngOnInit(): void {
-  }
   ngOnChanges(changes: SimpleChanges): void {
     if (changes['fiscalGuid'] && changes['fiscalGuid'].currentValue) {
       // Clear previous state before loading new fiscal data
@@ -779,5 +777,7 @@ export class ActivitiesComponent implements OnChanges, OnInit, CanComponentDeact
 
   onFilesChanged() {
     this.boundariesUpdated.emit(); // Notify ProjectFiscalsComponent
+    this.getActivities();
   }
+
 }
diff --git a/server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/controllers/ActivityBoundaryController.java b/server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/controllers/ActivityBoundaryController.java
@@ -4,7 +4,9 @@
 import ca.bc.gov.nrs.common.wfone.rest.resource.MessageListRsrc;
 import ca.bc.gov.nrs.wfprev.common.controllers.CommonController;
 import ca.bc.gov.nrs.wfprev.data.models.ActivityBoundaryModel;
+import ca.bc.gov.nrs.wfprev.data.models.ActivityModel;
 import ca.bc.gov.nrs.wfprev.services.ActivityBoundaryService;
+import ca.bc.gov.nrs.wfprev.services.ActivityService;
 import ca.bc.gov.nrs.wfprev.services.CoordinatesService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -37,13 +39,15 @@
 @Slf4j
 @RequestMapping(value = "/projects/{projectGuid}/projectFiscals/{projectPlanFiscalGuid}/activities/{activityGuid}/activityBoundary")
 public class ActivityBoundaryController extends CommonController {
+    private final ActivityService activityService;
     private final ActivityBoundaryService activityBoundaryService;
     private final CoordinatesService coordinatesService;
 
-    public ActivityBoundaryController(ActivityBoundaryService activityBoundaryService, CoordinatesService coordinatesService) {
+    public ActivityBoundaryController(ActivityBoundaryService activityBoundaryService, CoordinatesService coordinatesService, ActivityService activityService) {
         super(ActivityBoundaryController.class.getName());
         this.activityBoundaryService = activityBoundaryService;
         this.coordinatesService = coordinatesService;
+        this.activityService = activityService;
     }
 
     @GetMapping
@@ -142,6 +146,14 @@ public ResponseEntity<ActivityBoundaryModel> createActivityBoundary(
                     projectGuid, projectPlanFiscalGuid, activityGuid, resource);
             coordinatesService.updateProjectCoordinates(projectGuid);
 
+            // Update activity spatial indicator
+            ActivityModel activity = activityService.getActivity(projectGuid, projectPlanFiscalGuid, activityGuid);
+            if(activity != null) {
+                activity.setIsSpatialAddedInd(true);
+                activityService.updateActivity(projectGuid, projectPlanFiscalGuid, activity);
+
+            }
+
             return ResponseEntity.status(201).body(newResource);
         } catch (DataIntegrityViolationException e) {
             log.error(" ### DataIntegrityViolationException while creating Activity Boundary", e);
@@ -182,6 +194,13 @@ public ResponseEntity<ActivityBoundaryModel> updateActivityBoundary(
                     projectGuid, projectPlanFiscalGuid, activityGuid, resource);
             coordinatesService.updateProjectCoordinates(projectGuid);
 
+            // Update activity spatial indicator
+            ActivityModel activity = activityService.getActivity(projectGuid, projectPlanFiscalGuid, activityGuid);
+            if (activity != null) {
+                activity.setIsSpatialAddedInd(true);
+                activityService.updateActivity(projectGuid, projectPlanFiscalGuid, activity);
+            }
+
             return updatedResource == null ? notFound() : ok(updatedResource);
         } catch (DataIntegrityViolationException e) {
             log.error(" ### DataIntegrityViolationException while updating Activity Boundary", e);
@@ -219,6 +238,15 @@ public ResponseEntity<Void> deleteActivityBoundary(
         try {
             activityBoundaryService.deleteActivityBoundary(projectGuid, projectPlanFiscalGuid, activityGuid, id);
             coordinatesService.updateProjectCoordinates(projectGuid);
+
+            // Update activity spatial indicator
+            ActivityModel activity = activityService.getActivity(projectGuid, projectPlanFiscalGuid, activityGuid);
+            if(activity != null) {
+                CollectionModel<ActivityBoundaryModel> boundaries = activityBoundaryService.getAllActivityBoundaries(projectGuid, projectPlanFiscalGuid, activityGuid);
+                activity.setIsSpatialAddedInd(!boundaries.getContent().isEmpty());
+                activityService.updateActivity(projectGuid, projectPlanFiscalGuid, activity);
+            }
+
             return ResponseEntity.noContent().build();
         } catch (EntityNotFoundException e) {
             log.warn(" ### Activity Boundary for deletion not found: {}", id, e);
diff --git a/server/wfprev-api/src/test/java/ca/bc/gov/nrs/wfprev/ActivityBoundaryControllerTest.java b/server/wfprev-api/src/test/java/ca/bc/gov/nrs/wfprev/ActivityBoundaryControllerTest.java
@@ -2,7 +2,9 @@
 
 import ca.bc.gov.nrs.wfprev.controllers.ActivityBoundaryController;
 import ca.bc.gov.nrs.wfprev.data.models.ActivityBoundaryModel;
+import ca.bc.gov.nrs.wfprev.data.models.ActivityModel;
 import ca.bc.gov.nrs.wfprev.services.ActivityBoundaryService;
+import ca.bc.gov.nrs.wfprev.services.ActivityService;
 import ca.bc.gov.nrs.wfprev.services.CoordinatesService;
 import com.nimbusds.jose.shaded.gson.Gson;
 import com.nimbusds.jose.shaded.gson.GsonBuilder;
@@ -17,6 +19,7 @@
 import org.locationtech.jts.geom.LinearRing;
 import org.locationtech.jts.geom.MultiPolygon;
 import org.locationtech.jts.geom.Polygon;
+import org.mockito.ArgumentCaptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
@@ -35,12 +38,16 @@
 import java.util.List;
 import java.util.UUID;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.never;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -59,6 +66,9 @@ class ActivityBoundaryControllerTest {
     @MockBean
     private CoordinatesService coordinatesService;
 
+    @MockBean
+    private ActivityService activityService;
+
     @Autowired
     private MockMvc mockMvc;
 
@@ -200,10 +210,15 @@ void testGetActivityBoundary_EntityNotFoundException() throws Exception {
     @WithMockUser
     void testCreateActivityBoundary_Success() throws Exception {
         ActivityBoundaryModel requestModel = buildActivityBoundaryRequestModel();
+        ActivityModel activity = new ActivityModel();
+        activity.setActivityGuid(requestModel.getActivityGuid());
 
         when(activityBoundaryService.createActivityBoundary(anyString(), anyString(), anyString(), any(ActivityBoundaryModel.class)))
                 .thenReturn(requestModel);
 
+        when(activityService.getActivity(anyString(), anyString(), anyString()))
+                .thenReturn(activity);
+
         String requestJson = activityBoundaryJson.formatted(
                 requestModel.getActivityBoundaryGuid(),
                 requestModel.getActivityGuid(),
@@ -218,8 +233,17 @@ void testCreateActivityBoundary_Success() throws Exception {
                         .content(requestJson))
                 .andExpect(status().isCreated())
                 .andExpect(jsonPath("$.activityBoundaryGuid").value(requestModel.getActivityBoundaryGuid()));
-    }
 
+        // Verify calls to activityService
+        verify(activityService).getActivity(anyString(), anyString(), anyString());
+
+        verify(activityService).updateActivity(
+                anyString(),
+                anyString(),
+                argThat(updatedActivity ->
+                        updatedActivity.getIsSpatialAddedInd() != null && updatedActivity.getIsSpatialAddedInd())
+        );
+    }
     @Test
     @WithMockUser
     void testCreateActivityBoundary_DataIntegrityViolationException() throws Exception {
@@ -243,6 +267,35 @@ void testCreateActivityBoundary_DataIntegrityViolationException() throws Excepti
                 .andExpect(status().isBadRequest());
     }
 
+    @Test
+    @WithMockUser
+    void testCreateActivityBoundary_NoActivityFound() throws Exception {
+        ActivityBoundaryModel requestModel = buildActivityBoundaryRequestModel();
+
+        when(activityBoundaryService.createActivityBoundary(anyString(), anyString(), anyString(), any(ActivityBoundaryModel.class)))
+                .thenReturn(requestModel);
+
+        when(activityService.getActivity(anyString(), anyString(), anyString()))
+                .thenReturn(null);
+
+        String requestJson = activityBoundaryJson.formatted(
+                requestModel.getActivityBoundaryGuid(),
+                requestModel.getActivityGuid(),
+                requestModel.getSystemStartTimestamp().getTime(),
+                requestModel.getSystemEndTimestamp().getTime() + 1000,
+                requestModel.getCollectionDate().getTime()
+        );
+
+        mockMvc.perform(post("/projects/{projectId}/projectFiscals/{projectFiscalId}/activities/{activityId}/activityBoundary",
+                        UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID())
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(requestJson))
+                .andExpect(status().isCreated());
+
+        verify(activityService).getActivity(anyString(), anyString(), anyString());
+        verify(activityService, org.mockito.Mockito.never()).updateActivity(anyString(), anyString(), any(ActivityModel.class));
+    }
+
     @Test
     @WithMockUser
     void testCreateActivityBoundary_Exception() throws Exception {
@@ -293,9 +346,14 @@ void testCreateActivityBoundary_IllegalArgumentException() throws Exception {
     @WithMockUser
     void testUpdateActivityBoundary_Success() throws Exception {
         ActivityBoundaryModel requestModel = buildActivityBoundaryRequestModel();
+        ActivityModel activity = new ActivityModel();
+        activity.setActivityGuid(requestModel.getActivityGuid());
+        activity.setIsSpatialAddedInd(false);
 
         when(activityBoundaryService.updateActivityBoundary(anyString(), anyString(), anyString(), any(ActivityBoundaryModel.class)))
                 .thenReturn(requestModel);
+        when(activityService.getActivity(anyString(), anyString(), anyString()))
+                .thenReturn(activity);
 
         String requestJson = activityBoundaryJson.formatted(
                 requestModel.getActivityBoundaryGuid(),
@@ -311,6 +369,42 @@ void testUpdateActivityBoundary_Success() throws Exception {
                         .content(requestJson))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.activityBoundaryGuid").value(requestModel.getActivityBoundaryGuid()));
+
+        // Verify spatial indicator update
+        verify(activityService).getActivity(anyString(), anyString(), anyString());
+        ArgumentCaptor<ActivityModel> activityCaptor = ArgumentCaptor.forClass(ActivityModel.class);
+        verify(activityService).updateActivity(anyString(), anyString(), activityCaptor.capture());
+
+        assertTrue(activityCaptor.getValue().getIsSpatialAddedInd(), "isSpatialAddedInd should be true after update");
+    }
+
+    @Test
+    @WithMockUser
+    void testUpdateActivityBoundary_NoActivityFound() throws Exception {
+        ActivityBoundaryModel requestModel = buildActivityBoundaryRequestModel();
+
+        when(activityBoundaryService.updateActivityBoundary(anyString(), anyString(), anyString(), any(ActivityBoundaryModel.class)))
+                .thenReturn(requestModel);
+
+        when(activityService.getActivity(anyString(), anyString(), anyString()))
+                .thenReturn(null);
+
+        String requestJson = activityBoundaryJson.formatted(
+                requestModel.getActivityBoundaryGuid(),
+                requestModel.getActivityGuid(),
+                requestModel.getSystemStartTimestamp().getTime(),
+                requestModel.getSystemEndTimestamp().getTime() + 1000,
+                requestModel.getCollectionDate().getTime()
+        );
+
+        mockMvc.perform(put("/projects/{projectId}/projectFiscals/{projectFiscalId}/activities/{activityId}/activityBoundary/{id}",
+                        UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), requestModel.getActivityBoundaryGuid())
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(requestJson))
+                .andExpect(status().isOk());
+
+        verify(activityService).getActivity(anyString(), anyString(), anyString());
+        verify(activityService, never()).updateActivity(anyString(), anyString(), any(ActivityModel.class));
     }
 
     @Test
@@ -410,14 +504,69 @@ void testUpdateActivityBoundary_DataIntegrityViolationException() throws Excepti
     @WithMockUser
     void testDeleteActivityBoundary_Success() throws Exception {
         UUID boundaryId = UUID.randomUUID();
-        doNothing().when(activityBoundaryService).deleteActivityBoundary(anyString(), anyString(), anyString(), anyString());
+        UUID projectId = UUID.randomUUID();
+        UUID fiscalId = UUID.randomUUID();
+        UUID activityId = UUID.randomUUID();
+
+        ActivityModel updatedActivity = new ActivityModel();
+        updatedActivity.setIsSpatialAddedInd(false);
+
+        when(activityService.updateActivity(eq(projectId.toString()), eq(fiscalId.toString()), any(ActivityModel.class)))
+                .thenReturn(updatedActivity);
+
+        doNothing().when(activityBoundaryService).deleteActivityBoundary(
+                eq(projectId.toString()), eq(fiscalId.toString()), eq(activityId.toString()), eq(boundaryId.toString()));
+
+        when(activityService.getActivity(eq(projectId.toString()), eq(fiscalId.toString()), eq(activityId.toString())))
+                .thenReturn(new ActivityModel());
+
+        when(activityBoundaryService.getAllActivityBoundaries(eq(projectId.toString()), eq(fiscalId.toString()), eq(activityId.toString())))
+                .thenReturn(CollectionModel.empty());
+
+        doNothing().when(coordinatesService).updateProjectCoordinates(eq(projectId.toString()));
+
+        when(activityService.updateActivity(eq(projectId.toString()), eq(fiscalId.toString()), any(ActivityModel.class)))
+                .thenReturn(updatedActivity);
+
+        mockMvc.perform(delete("/projects/{projectId}/projectFiscals/{projectFiscalId}/activities/{activityId}/activityBoundary/{id}",
+                        projectId, fiscalId, activityId, boundaryId)
+                        .header(HttpHeaders.AUTHORIZATION, "Bearer test-token"))
+                .andExpect(status().isNoContent());
+
+        verify(activityBoundaryService).deleteActivityBoundary(eq(projectId.toString()), eq(fiscalId.toString()), eq(activityId.toString()), eq(boundaryId.toString()));
+        verify(coordinatesService).updateProjectCoordinates(eq(projectId.toString()));
+        verify(activityService).getActivity(eq(projectId.toString()), eq(fiscalId.toString()), eq(activityId.toString()));
+        verify(activityBoundaryService).getAllActivityBoundaries(eq(projectId.toString()), eq(fiscalId.toString()), eq(activityId.toString()));
+
+        ArgumentCaptor<ActivityModel> activityCaptor = ArgumentCaptor.forClass(ActivityModel.class);
+        verify(activityService).updateActivity(eq(projectId.toString()), eq(fiscalId.toString()), activityCaptor.capture());
+
+        assertFalse(activityCaptor.getValue().getIsSpatialAddedInd(), "isSpatialAddedInd should be false after deleting last boundary");
+    }
+
+    @Test
+    @WithMockUser
+    void testDeleteActivityBoundary_NoActivityFound() throws Exception {
+        UUID boundaryId = UUID.randomUUID();
+        UUID projectId = UUID.randomUUID();
+        UUID fiscalId = UUID.randomUUID();
+        UUID activityId = UUID.randomUUID();
+
+        doNothing().when(activityBoundaryService).deleteActivityBoundary(
+                eq(projectId.toString()), eq(fiscalId.toString()), eq(activityId.toString()), eq(boundaryId.toString()));
+        doNothing().when(coordinatesService).updateProjectCoordinates(eq(projectId.toString()));
+        when(activityService.getActivity(eq(projectId.toString()), eq(fiscalId.toString()), eq(activityId.toString())))
+                .thenReturn(null);
 
         mockMvc.perform(delete("/projects/{projectId}/projectFiscals/{projectFiscalId}/activities/{activityId}/activityBoundary/{id}",
-                        UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), boundaryId)
+                        projectId, fiscalId, activityId, boundaryId)
                         .header(HttpHeaders.AUTHORIZATION, "Bearer test-token"))
                 .andExpect(status().isNoContent());
 
-        verify(activityBoundaryService).deleteActivityBoundary(anyString(), anyString(), anyString(), eq(boundaryId.toString()));
+        verify(activityBoundaryService).deleteActivityBoundary(eq(projectId.toString()), eq(fiscalId.toString()), eq(activityId.toString()), eq(boundaryId.toString()));
+        verify(coordinatesService).updateProjectCoordinates(eq(projectId.toString()));
+        verify(activityService).getActivity(eq(projectId.toString()), eq(fiscalId.toString()), eq(activityId.toString()));
+        verify(activityService, org.mockito.Mockito.never()).updateActivity(anyString(), anyString(), any(ActivityModel.class));
     }
 
     ActivityBoundaryModel buildActivityBoundaryRequestModel() {
