Merge branch 'bugfix/10.5.20/add-compliance-data' into bugfix/10.5.20/update-agent-hostname

Author: mjabascal10

CHANGELOG.md

@@ -1,13 +1,5 @@
-# UTMStack 10.5.19 Release Notes
+# UTMStack 10.5.21 Release Notes
 ## Bug Fixes
-- Fixed issue where log fields in the table didn't match the data when adding filters.
-- Fixed time filter updates not reflecting in the filter string.
-- Fixed index pattern changes not updating the browser URL.
-- Fixed container memory resource distribution
-- Fixed empty column status in cvs export
+
 ## New Features
-- Restricted time filter to a maximum range of one month.
-- Made the timestamp field mandatory and added a summary view when no fields are selected.
-- Moved “Add Filter” button to the left and improved filter UI with better icons.
-- Removed unnecessary header space to enhance table visibility.
-- Added "contains one of" and "does not contain one of" operators to filters.
+- Introduced new standards, sections, dashboards, and visualizations to compliance reports.

backend/src/main/java/com/park/utmstack/repository/chart_builder/UtmDashboardRepository.java

@@ -17,6 +17,7 @@
 public interface UtmDashboardRepository extends JpaRepository<UtmDashboard, Long>, JpaSpecificationExecutor<UtmDashboard> {
 
     Optional<UtmDashboard> findByName(String name);
+    Optional<UtmDashboard> findByIdAndSystemOwnerIsFalse(Long id);
 
     Optional<UtmDashboard> findByIdAndName(Long id, String name);
 

backend/src/main/java/com/park/utmstack/repository/chart_builder/UtmVisualizationRepository.java

@@ -27,4 +27,6 @@ public interface UtmVisualizationRepository extends JpaRepository<UtmVisualizati
     Optional<UtmVisualization> findFirstBySystemOwnerIsTrueOrderByIdDesc();
 
     List<UtmVisualization> findAllByChTypeIn(List<String> types);
+
+    Optional<UtmVisualization> findByIdAndSystemOwnerIsFalse(Long id);
 }

backend/src/main/java/com/park/utmstack/service/impl/chart_builder/UtmDashboardServiceImpl.java

@@ -17,6 +17,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import javax.persistence.EntityNotFoundException;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.*;
@@ -98,6 +99,8 @@ public Optional<UtmDashboard> findOne(Long id) {
     @Override
     public void delete(Long id) {
         log.debug("Request to delete UtmDashboard : {}", id);
+        dashboardRepository.findByIdAndSystemOwnerIsFalse(id)
+                .orElseThrow(() -> new NoSuchElementException(String.format("Dashboard %1$s not found", id)));
         dashboardRepository.deleteById(id);
     }
 

backend/src/main/java/com/park/utmstack/service/impl/chart_builder/UtmVisualizationServiceImpl.java

@@ -17,6 +17,7 @@
 import org.springframework.util.StringUtils;
 
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Optional;
 
 /**
@@ -127,6 +128,8 @@ public Optional<UtmVisualization> findOne(Long id) {
     @Override
     public void delete(Long id) {
         log.debug("Request to delete UtmVisualization : {}", id);
+        utmVisualizationRepository.findByIdAndSystemOwnerIsFalse(id)
+                .orElseThrow(() -> new NoSuchElementException(String.format("Visualization %1$s not found", id)));
         utmVisualizationRepository.deleteById(id);
     }
 

backend/src/main/java/com/park/utmstack/web/rest/chart_builder/UtmDashboardResource.java

@@ -33,6 +33,7 @@
 import java.time.ZoneOffset;
 import java.util.Arrays;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Optional;
 
 /**
@@ -78,7 +79,7 @@ public ResponseEntity<UtmDashboard> createUtmDashboard(@Valid @RequestBody UtmDa
         UtmDashboard result = null;
         try {
             utmDashboard.setUserCreated(
-                SecurityUtils.getCurrentUserLogin().orElseThrow(() -> new UtmEntityCreationException("Missing user login")));
+                    SecurityUtils.getCurrentUserLogin().orElseThrow(() -> new UtmEntityCreationException("Missing user login")));
             utmDashboard.setCreatedDate(LocalDateTime.now().toInstant(ZoneOffset.UTC));
 
             // Set the next system sequence value only if the environment is dev
@@ -89,19 +90,19 @@ public ResponseEntity<UtmDashboard> createUtmDashboard(@Valid @RequestBody UtmDa
 
             result = utmDashboardService.save(utmDashboard);
             return ResponseEntity.created(new URI("/api/utm-dashboards/" + result.getId())).headers(
-                HeaderUtil.createEntityCreationAlert(ENTITY_NAME, result.getId().toString())).body(result);
+                    HeaderUtil.createEntityCreationAlert(ENTITY_NAME, result.getId().toString())).body(result);
         } catch (DataIntegrityViolationException e) {
             String msg = ctx + ": " + e.getMostSpecificCause().getMessage().replaceAll("\n", "");
             log.error(msg);
             applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
             return ResponseEntity.status(HttpStatus.CONFLICT).headers(HeaderUtil.createFailureAlert(ENTITY_NAME, null, msg))
-                .body(result);
+                    .body(result);
         } catch (Exception e) {
             String msg = ctx + ": " + e.getMessage();
             log.error(msg);
             applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).headers(
-                HeaderUtil.createFailureAlert(ENTITY_NAME, null, msg)).body(result);
+                    HeaderUtil.createFailureAlert(ENTITY_NAME, null, msg)).body(result);
         }
     }
 
@@ -123,25 +124,25 @@ public ResponseEntity<UtmDashboard> updateUtmDashboard(@Valid @RequestBody UtmDa
         UtmDashboard result = null;
         try {
             utmDashboard.setUserModified(
-                SecurityUtils.getCurrentUserLogin().orElseThrow(() -> new UtmEntityCreationException("Missing user login")));
+                    SecurityUtils.getCurrentUserLogin().orElseThrow(() -> new UtmEntityCreationException("Missing user login")));
             utmDashboard.setModifiedDate(Instant.now());
             utmDashboard.setSystemOwner(utmDashboard.getSystemOwner() == null ? utmDashboard.getId() < 1000000 : utmDashboard.getSystemOwner());
 
             result = utmDashboardService.save(utmDashboard);
             return ResponseEntity.ok().headers(
-                HeaderUtil.createEntityUpdateAlert(ENTITY_NAME, utmDashboard.getId().toString())).body(result);
+                    HeaderUtil.createEntityUpdateAlert(ENTITY_NAME, utmDashboard.getId().toString())).body(result);
         } catch (DataIntegrityViolationException e) {
             String msg = ctx + ": " + e.getMostSpecificCause().getMessage().replaceAll("\n", "");
             log.error(msg);
             applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
             return ResponseEntity.status(HttpStatus.CONFLICT).headers(HeaderUtil.createFailureAlert(ENTITY_NAME, null, msg))
-                .body(result);
+                    .body(result);
         } catch (Exception e) {
             String msg = ctx + ": " + e.getMessage();
             log.error(msg);
             applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).headers(
-                HeaderUtil.createFailureAlert(ENTITY_NAME, null, msg)).body(result);
+                    HeaderUtil.createFailureAlert(ENTITY_NAME, null, msg)).body(result);
         }
     }
 
@@ -163,7 +164,7 @@ public ResponseEntity<List<UtmDashboard>> getAllUtmDashboards(UtmDashboardCriter
             log.error(msg);
             applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).headers(
-                HeaderUtil.createFailureAlert(null, null, msg)).body(null);
+                    HeaderUtil.createFailureAlert(null, null, msg)).body(null);
         }
     }
 
@@ -184,14 +185,15 @@ public ResponseEntity<UtmDashboard> getUtmDashboard(@PathVariable Long id) {
             log.error(msg);
             applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).headers(
-                HeaderUtil.createFailureAlert(null, null, msg)).body(null);
+                    HeaderUtil.createFailureAlert(null, null, msg)).body(null);
         }
     }
 
     /**
      * DELETE  /utm-dashboards/:id : delete the "id" utmDashboard.
      *
      * @param id the id of the utmDashboard to delete
+     * @throws NoSuchElementException 404 (Not Found) if the dashboard does not exist or is a system owner
      * @return the ResponseEntity with status 200 (OK)
      */
     @DeleteMapping("/utm-dashboards/{id}")
@@ -200,12 +202,18 @@ public ResponseEntity<Void> deleteUtmDashboard(@PathVariable Long id) {
         try {
             utmDashboardService.delete(id);
             return ResponseEntity.ok().headers(HeaderUtil.createEntityDeletionAlert(ENTITY_NAME, id.toString())).build();
+        } catch (NoSuchElementException e) {
+            String msg = ctx + ": " + e.getMessage();
+            log.error(msg);
+            applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).headers(
+                    HeaderUtil.createFailureAlert("", "", msg)).body(null);
         } catch (Exception e) {
             String msg = ctx + ": " + e.getMessage();
             log.error(msg);
             applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).headers(
-                HeaderUtil.createFailureAlert(null, null, msg)).body(null);
+                    HeaderUtil.createFailureAlert(null, null, msg)).body(null);
         }
     }
 
@@ -223,13 +231,13 @@ public ResponseEntity<Void> importDashboards(@Valid @RequestBody ImportDashboard
                 log.error(msg);
                 applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
                 return ResponseEntity.status(HttpStatus.CONFLICT).headers(HeaderUtil.createFailureAlert(ENTITY_NAME, null, msg))
-                    .build();
+                        .build();
             }
             msg = ctx + ": " + e.getMessage();
             log.error(msg);
             applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).headers(
-                HeaderUtil.createFailureAlert(ENTITY_NAME, null, msg)).build();
+                    HeaderUtil.createFailureAlert(ENTITY_NAME, null, msg)).build();
         }
     }
 

backend/src/main/java/com/park/utmstack/web/rest/chart_builder/UtmVisualizationResource.java

@@ -38,10 +38,7 @@
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * REST controller for managing UtmVisualization.
@@ -251,6 +248,7 @@ public ResponseEntity<UtmVisualization> getUtmVisualization(@PathVariable Long i
      * DELETE  /utm-visualizations/:id : delete the "id" utmVisualization.
      *
      * @param id the id of the utmVisualization to delete
+     * @throws NoSuchElementException 404 (Not Found) if the visualization does not exist or is a system owner
      * @return the ResponseEntity with status 200 (OK)
      */
     @DeleteMapping("/utm-visualizations/{id}")
@@ -259,7 +257,14 @@ public ResponseEntity<Void> deleteUtmVisualization(@PathVariable Long id) {
         try {
             visualizationService.delete(id);
             return ResponseEntity.ok().headers(HeaderUtil.createEntityDeletionAlert(ENTITY_NAME, id.toString())).build();
-        } catch (Exception e) {
+        } catch (NoSuchElementException e) {
+            String msg = ctx + ": " + e.getMessage();
+            log.error(msg);
+            applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).headers(
+                    HeaderUtil.createFailureAlert("", "", msg)).body(null);
+        }
+        catch (Exception e) {
             String msg = ctx + ": " + e.getMessage();
             log.error(msg);
             applicationEventService.createEvent(msg, ApplicationEventType.ERROR);