Merge pull request #897 from utmstack/bugfix/10.5.16/unable-to-create-incidents

Bugfix/10.5.16/unable to create incidents

Author: c3s4rfred

CHANGELOG.md

@@ -1,4 +1,7 @@
-# UTMStack 10.5.16 Release Notes
+# UTMStack 10.5.17 Release Notes
 ## Bugfix
-- False positive alerts displayed in Dashboard Overview
-- Correct query parsing for filterType conditions with special characters
+-Fixed an issue preventing incident status updates when entering long solutions.
+-Fixed an issue blocking incident creation from the Alerts panel.
+-Added Asia/Jakarta timezone to the TIMEZONES list.
+-Fixed Timezone changes on an instance don't get updated when access by Federation Server
+-Fixed Last log not displayed for a generated alert 

backend/src/main/java/com/park/utmstack/repository/incident/UtmIncidentAlertRepository.java

@@ -23,4 +23,6 @@ public interface UtmIncidentAlertRepository extends JpaRepository<UtmIncidentAle
     void updateAlertStatusByAlertIdIn(@Param("alertIds") List<String> alertIds, @Param("status") Integer status);
 
     List<UtmIncidentAlert> findAllByIncidentId(Long incidentId);
+
+    List<UtmIncidentAlert> findByAlertIdIn(List<String> alertIds);
 }

backend/src/main/java/com/park/utmstack/service/incident/UtmIncidentAlertService.java

@@ -14,6 +14,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * Service Implementation for managing UtmIncidentAlert.
@@ -98,4 +99,26 @@ public void saveAll(List<UtmIncidentAlert> utmIncidentAlerts) {
     public List<UtmIncidentAlert> findAllByIncidentId(Long incidentId) {
         return utmIncidentAlertRepository.findAllByIncidentId(incidentId);
     }
+
+
+    /**
+     * Checks if any of the provided alert IDs exist in the database.
+     *
+     * @param alertIds List of alert IDs to check.
+     * @return True if at least one alert exists, false otherwise.
+     */
+    public List<String> existsAnyAlert(List<String> alertIds) {
+        return utmIncidentAlertRepository.findByAlertIdIn(alertIds)
+                .stream()
+                .map(UtmIncidentAlert::getAlertId)
+                .collect(Collectors.toList());
+    }
+
+    public String formatAlertMessage(List<String> alertIds) {
+        return "The following alert(s) are already associated with another incident:<br><br>" +
+                "<ul>" +
+                alertIds.stream().map(alertId -> "<li>" + alertId + "</li>").collect(Collectors.joining()) +
+                "</ul>" +
+                "<br>Please review the incidents section for more details.";
+    }
 }

backend/src/main/java/com/park/utmstack/web/rest/incident/UtmIncidentResource.java

@@ -3,10 +3,8 @@
 import com.park.utmstack.domain.application_events.enums.ApplicationEventType;
 import com.park.utmstack.domain.incident.UtmIncident;
 import com.park.utmstack.service.application_events.ApplicationEventService;
-import com.park.utmstack.service.dto.incident.AddToIncidentDTO;
-import com.park.utmstack.service.dto.incident.IncidentUserAssignedDTO;
-import com.park.utmstack.service.dto.incident.NewIncidentDTO;
-import com.park.utmstack.service.dto.incident.UtmIncidentCriteria;
+import com.park.utmstack.service.dto.incident.*;
+import com.park.utmstack.service.incident.UtmIncidentAlertService;
 import com.park.utmstack.service.incident.UtmIncidentQueryService;
 import com.park.utmstack.service.incident.UtmIncidentService;
 import com.park.utmstack.util.UtilResponse;
@@ -29,6 +27,7 @@
 import java.net.URISyntaxException;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * REST controller for managing UtmIncident.
@@ -43,20 +42,37 @@ public class UtmIncidentResource {
 
     private final UtmIncidentService utmIncidentService;
 
+    private final UtmIncidentAlertService utmIncidentAlertService;
+
     private final UtmIncidentQueryService utmIncidentQueryService;
     private final ApplicationEventService applicationEventService;
 
-    public UtmIncidentResource(UtmIncidentService utmIncidentService, UtmIncidentQueryService utmIncidentQueryService, ApplicationEventService applicationEventService) {
+    public UtmIncidentResource(UtmIncidentService utmIncidentService,
+                               UtmIncidentAlertService utmIncidentAlertService,
+                               UtmIncidentQueryService utmIncidentQueryService,
+                               ApplicationEventService applicationEventService) {
         this.utmIncidentService = utmIncidentService;
+        this.utmIncidentAlertService = utmIncidentAlertService;
         this.utmIncidentQueryService = utmIncidentQueryService;
         this.applicationEventService = applicationEventService;
     }
 
     /**
-     * POST  /utm-incidents : Create a new utmIncident.
+     * Creates a new incident based on the provided details.
+     *
+     * This endpoint accepts a {@link NewIncidentDTO} object, validates the data,
+     * and attempts to create a new incident. The process includes:
+     * - Verifying that the alert list is not empty.
+     * - Checking if any of the provided alerts are already associated with another incident.
+     * - Creating the incident if all validations pass.
      *
-     * @param newIncidentDTO the utmIncident to create
-     * @return the ResponseEntity with status 201 (Created) and with body the new utmIncident, or with status 400 (Bad Request) if the utmIncident has already an ID
+     * @param newIncidentDTO the DTO containing the details of the incident to create, including associated alerts.
+     * @return a {@link ResponseEntity} containing:
+     *         - HTTP 201 (Created) if the incident is successfully created.
+     *         - HTTP 400 (Bad Request) if the alert list is empty.
+     *         - HTTP 409 (Conflict) if one or more alerts are already associated with another incident.
+     *         - HTTP 500 (Internal Server Error) if an unexpected error occurs during processing.
+     * @throws IllegalArgumentException if the input data is invalid.
      */
     @PostMapping("/utm-incidents")
     public ResponseEntity<UtmIncident> createUtmIncident(@Valid @RequestBody NewIncidentDTO newIncidentDTO) {
@@ -68,6 +84,22 @@ public ResponseEntity<UtmIncident> createUtmIncident(@Valid @RequestBody NewInci
                 applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
                 return UtilResponse.buildErrorResponse(HttpStatus.BAD_REQUEST, msg);
             }
+
+            List<String> alertIds = newIncidentDTO.getAlertList().stream()
+                    .map(RelatedIncidentAlertsDTO::getAlertId)
+                    .collect(Collectors.toList());
+
+            List<String> alertsFound = utmIncidentAlertService.existsAnyAlert(alertIds);
+
+            if (!alertsFound.isEmpty()) {
+                String alertIdsList = String.join(", ", alertIds);
+                String msg = "Some alerts are already linked to another incident. Alert IDs: " + alertIdsList + ". Check the related incidents for more details.";
+                log.error(msg);
+                applicationEventService.createEvent(ctx + ": " + msg , ApplicationEventType.ERROR);
+                return UtilResponse.buildErrorResponse(HttpStatus.CONFLICT, utmIncidentAlertService.formatAlertMessage(alertsFound));
+            }
+
+
             return ResponseEntity.ok(utmIncidentService.createIncident(newIncidentDTO));
         } catch (Exception e) {
             String msg = ctx + ": " + e.getMessage();
@@ -78,10 +110,17 @@ public ResponseEntity<UtmIncident> createUtmIncident(@Valid @RequestBody NewInci
     }
 
     /**
-     * POST  /utm-incidents : Create a new utmIncident.
+     * POST /utm-incidents/add-alerts : Add alerts to an existing utmIncident.
      *
-     * @param addToIncidentDTO the utmIncident to add alerts to
-     * @return the ResponseEntity with status 201 (Created) and with body the new utmIncident, or with status 400 (Bad Request) if the utmIncident has already an ID
+     * This endpoint allows users to associate a list of alerts with an existing utmIncident.
+     * If any of the provided alerts are already linked to another incident, a conflict response is returned.
+     *
+     * @param addToIncidentDTO the DTO containing the details of the utmIncident and the list of alerts to add
+     * @return the ResponseEntity with:
+     *         - status 201 (Created) and the updated utmIncident if successful,
+     *         - status 400 (Bad Request) if the alert list is empty,
+     *         - status 409 (Conflict) if some alerts are already associated with another incident,
+     *         - status 500 (Internal Server Error) if an unexpected error occurs.
      * @throws URISyntaxException if the Location URI syntax is incorrect
      */
     @PostMapping("/utm-incidents/add-alerts")
@@ -92,6 +131,19 @@ public ResponseEntity<UtmIncident> addAlertsToUtmIncident(@Valid @RequestBody Ad
             if (CollectionUtils.isEmpty(addToIncidentDTO.getAlertList())) {
                 throw new BadRequestAlertException("Add utmIncident cannot already have an empty related alerts", ENTITY_NAME, "alertList");
             }
+            List<String> alertIds = addToIncidentDTO.getAlertList().stream()
+                    .map(RelatedIncidentAlertsDTO::getAlertId)
+                    .collect(Collectors.toList());
+
+            List<String> alertsFound = utmIncidentAlertService.existsAnyAlert(alertIds);
+
+            if (!alertsFound.isEmpty()) {
+                String alertIdsList = String.join(", ", alertIds);
+                String msg = "Some alerts are already linked to another incident. Alert IDs: " + alertIdsList + ". Check the related incidents for more details.";
+                log.error(msg);
+                applicationEventService.createEvent(ctx + ": " + msg , ApplicationEventType.ERROR);
+                return UtilResponse.buildErrorResponse(HttpStatus.CONFLICT, utmIncidentAlertService.formatAlertMessage(alertsFound));
+            }
             UtmIncident result = utmIncidentService.addAlertsIncident(addToIncidentDTO);
             return ResponseEntity.created(new URI("/api/utm-incidents/add-alerts" + result.getId()))
                 .headers(HeaderUtil.createEntityCreationAlert(ENTITY_NAME, result.getId().toString()))

backend/src/main/resources/config/liquibase/changelog/20241122001_alter_action_detail_length.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
+
+    <changeSet id="20241122001" author="manuel">
+        <sql dbms="postgresql" splitStatements="true" stripComments="true">
+            ALTER TABLE utm_incident_history
+            ALTER COLUMN action_detail TYPE VARCHAR(1000);
+        </sql>
+    </changeSet>
+</databaseChangeLog>

backend/src/main/resources/config/liquibase/master.xml

@@ -65,5 +65,6 @@
 
     <include file="/config/liquibase/changelog/20240517001_add_collectors_source_menu.xml" relativeToChangelogFile="false"/>
 
+    <include file="/config/liquibase/changelog/20241122001_alter_action_detail_length.xml" relativeToChangelogFile="false"/>
 
 </databaseChangeLog>

frontend/src/app/app-management/app-management.module.ts

@@ -10,7 +10,6 @@ import {NgxSortableModule} from 'ngx-sortable-2';
 import {ComplianceManagementModule} from '../compliance/compliance-management/compliance-management.module';
 import {NavBehavior} from '../shared/behaviors/nav.behavior';
 import {VersionUpdateBehavior} from '../shared/behaviors/version-update.behavior';
-import {TimezoneFormatService} from '../shared/services/utm-timezone.service';
 import {UtmSharedModule} from '../shared/utm-shared.module';
 import {AppConfigComponent} from './app-config/app-config.component';
 import {AppLogsComponent} from './app-logs/app-logs.component';
@@ -102,7 +101,7 @@ import {UtmApiDocComponent} from './utm-api-doc/utm-api-doc.component';
     HealthChecksComponent,
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA],
-  providers: [NavBehavior, VersionUpdateBehavior, TimezoneFormatService]
+  providers: [NavBehavior, VersionUpdateBehavior]
 })
 export class AppManagementModule {
 }

frontend/src/app/app.component.ts

@@ -8,7 +8,6 @@ import {ThemeChangeBehavior} from './shared/behaviors/theme-change.behavior';
 import {ADMIN_ROLE, USER_ROLE} from './shared/constants/global.constant';
 import {AppThemeLocationEnum} from './shared/enums/app-theme-location.enum';
 import {UtmAppThemeService} from './shared/services/theme/utm-app-theme.service';
-import {TimezoneFormatService} from './shared/services/utm-timezone.service';
 
 @Component({
   selector: 'app-root',
@@ -32,8 +31,7 @@ export class AppComponent implements OnInit {
     private themeChangeBehavior: ThemeChangeBehavior,
     private utmAppThemeService: UtmAppThemeService,
     private router: Router, private renderer: Renderer2,
-    private apiServiceCheckerService: ApiServiceCheckerService,
-    private timezoneFormatService: TimezoneFormatService) {
+    private apiServiceCheckerService: ApiServiceCheckerService) {
 
     this.translate.setDefaultLang('en');
 
@@ -128,7 +126,6 @@ export class AppComponent implements OnInit {
   }
 
    init() {
-    this.timezoneFormatService.loadTimezoneAndFormat();
     this.getReportLogo();
   }
 }

frontend/src/app/app.module.ts

@@ -1,5 +1,5 @@
 import {HTTP_INTERCEPTORS, HttpClient, HttpClientModule} from '@angular/common/http';
-import {CUSTOM_ELEMENTS_SCHEMA, Injector, NgModule} from '@angular/core';
+import {APP_INITIALIZER, CUSTOM_ELEMENTS_SCHEMA, Injector, NgModule} from '@angular/core';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {BrowserModule} from '@angular/platform-browser';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
@@ -36,6 +36,10 @@ import {TimezoneFormatService} from './shared/services/utm-timezone.service';
 import {UtmSharedModule} from './shared/utm-shared.module';
 import {AccountService} from "./core/auth/account.service";
 
+export function initTimezoneFormat(timezoneService: TimezoneFormatService) {
+  return () => timezoneService.loadTimezoneAndFormat();
+}
+
 @NgModule({
   declarations: [
     AppComponent,
@@ -105,11 +109,16 @@ import {AccountService} from "./core/auth/account.service";
       useClass: ManageHttpInterceptor,
       multi: true,
     },
+    {
+      provide: APP_INITIALIZER,
+      useFactory: initTimezoneFormat,
+      deps: [TimezoneFormatService],
+      multi: true
+    },
     NewAlertBehavior,
     NavBehavior,
     AlertIncidentStatusChangeBehavior,
-    GettingStartedBehavior,
-    TimezoneFormatService
+    GettingStartedBehavior
   ],
   bootstrap: [AppComponent],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
@@ -118,6 +127,5 @@ export class AppModule {
   constructor(private dpConfig: NgbDatepickerConfig, private config: NgbModalConfig) {
     this.dpConfig.minDate = {year: moment().year() - 100, month: 1, day: 1};
     config.backdrop = 'static';
-    //timezoneFormatService.loadTimezoneAndFormat();
   }
 }

frontend/src/app/data-management/alert-management/alert-view/alert-view.component.html

@@ -227,6 +227,7 @@ <h6 class="card-title text-blue-800 font-weight-light">
                            [alert]="alertDetail"
                            [hideEmptyField]=" true"
                            [tags]="tags"
+                           [timeFilter]="getFilterTime()"
                            [dataType]="dataType"></app-alert-view-detail>
   </div>
 </div>

frontend/src/app/data-management/alert-management/alert-view/alert-view.component.ts

@@ -550,6 +550,10 @@ export class AlertViewComponent implements OnInit, OnDestroy {
     modal.componentInstance.alert = alert;
   }
 
+  getFilterTime(){
+    return this.filters.find(f => f.field === ALERT_TIMESTAMP_FIELD);
+  }
+
   ngOnDestroy(): void {
     this.destroy$.next();
     this.destroy$.complete();

frontend/src/app/data-management/alert-management/shared/components/alert-view-detail/alert-view-detail.component.html

@@ -176,6 +176,11 @@
             </span>
           </div>
         </ng-template>
+        <ng-container *ngIf="isEmptyResponse()">
+          <div class="d-flex has-fixed-height w-100 justify-content-center align-items-center">
+            <app-no-data-found></app-no-data-found>
+          </div>
+        </ng-container>
       </div>
     </div>
   </div>