Merge pull request #670 from catenax-ng/chore/TRACEFOSS-XXX-update-pr…

…ofiles Chore/tracefoss xxx update profiles
eclipse-tractusx · Oct 11, 2023 · faec1d8 · faec1d8
2 parents 63c3ccb + 026e8fa
commit faec1d8
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,11 +31,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - updated maven-site-plugin from 4.0.0-M5 to 4.0.0-M9
 - updated testcontainer-postgresql from 1.17.6 to 1.19.0
 - updated docker/build-push-action from 4 to 5
-
 - Updated user manual to reflect current state of the part views
 
 ### Removed
 - Owner filter and replaced it with the new filter query param
+- Removed profile based feature flag for investigations / alerts
 
 ## [7.1.0 - 29.09.2023]
 ### Added

diff --git a/...nd/src/main/java/org/eclipse/tractusx/traceability/common/config/ApplicationProfiles.java b/...nd/src/main/java/org/eclipse/tractusx/traceability/common/config/ApplicationProfiles.java
@@ -29,6 +29,7 @@ public class ApplicationProfiles {
     public static final String NOT_TESTS = "!" + TESTS;
     public static final String NOT_INTEGRATION_TESTS = "!" + INTEGRATION_SPRING_BOOT;
     public static final String DEV = "dev";
+    public static final String STABLE = "stable";
 
     private ApplicationProfiles() {
     }

diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/FeatureFlags.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/FeatureFlags.java
@@ -21,12 +21,6 @@
 package org.eclipse.tractusx.traceability.common.config;
 
 public class FeatureFlags {
-
-    public static final String NOTIFICATIONS_ENABLED_PROFILES = ApplicationProfiles.LOCAL + " | " +
-            ApplicationProfiles.INTEGRATION_SPRING_BOOT + " | " +
-            ApplicationProfiles.TESTS + " | " +
-            ApplicationProfiles.DEV;
-
     private FeatureFlags() {
     }
 }
diff --git a/...pse/tractusx/traceability/qualitynotification/application/alert/rest/AlertController.java b/...pse/tractusx/traceability/qualitynotification/application/alert/rest/AlertController.java
@@ -30,24 +30,16 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.tractusx.traceability.common.config.FeatureFlags;
 import org.eclipse.tractusx.traceability.common.model.PageResult;
 import org.eclipse.tractusx.traceability.common.request.OwnPageable;
 import org.eclipse.tractusx.traceability.common.response.ErrorResponse;
 import org.eclipse.tractusx.traceability.qualitynotification.application.alert.mapper.AlertResponseMapper;
 import org.eclipse.tractusx.traceability.qualitynotification.application.base.service.QualityNotificationService;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Profile;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import qualitynotification.alert.response.AlertResponse;
 import qualitynotification.base.request.CloseQualityNotificationRequest;
 import qualitynotification.base.request.QualityNotificationStatusRequest;
@@ -60,7 +52,7 @@
 import static org.eclipse.tractusx.traceability.qualitynotification.domain.alert.model.exception.StartQualityNotificationDomain.from;
 import static org.eclipse.tractusx.traceability.qualitynotification.domain.base.model.QualityNotificationStatus.from;
 
-@Profile(FeatureFlags.NOTIFICATIONS_ENABLED_PROFILES)
+
 @RestController
 @RequestMapping(value = "/alerts", consumes = "application/json", produces = "application/json")
 @PreAuthorize("hasAnyRole('ROLE_ADMIN', 'ROLE_SUPERVISOR', 'ROLE_USER')")

diff --git a/...eability/qualitynotification/application/investigation/rest/InvestigationsController.java b/...eability/qualitynotification/application/investigation/rest/InvestigationsController.java
@@ -32,24 +32,16 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.tractusx.traceability.common.config.FeatureFlags;
 import org.eclipse.tractusx.traceability.common.model.PageResult;
 import org.eclipse.tractusx.traceability.common.request.OwnPageable;
 import org.eclipse.tractusx.traceability.common.response.ErrorResponse;
 import org.eclipse.tractusx.traceability.qualitynotification.application.base.service.QualityNotificationService;
 import org.eclipse.tractusx.traceability.qualitynotification.application.investigation.mapper.InvestigationResponseMapper;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Profile;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import qualitynotification.base.request.CloseQualityNotificationRequest;
 import qualitynotification.base.request.QualityNotificationStatusRequest;
 import qualitynotification.base.request.StartQualityNotificationRequest;
@@ -61,7 +53,7 @@
 import static org.eclipse.tractusx.traceability.qualitynotification.application.validation.UpdateQualityNotificationValidator.validate;
 import static org.eclipse.tractusx.traceability.qualitynotification.domain.alert.model.exception.StartQualityNotificationDomain.from;
 import static org.eclipse.tractusx.traceability.qualitynotification.domain.base.model.QualityNotificationStatus.from;
-@Profile(FeatureFlags.NOTIFICATIONS_ENABLED_PROFILES)
+
 @RestController
 @RequestMapping(value = "/investigations", consumes = "application/json", produces = "application/json")
 @PreAuthorize("hasAnyRole('ROLE_ADMIN', 'ROLE_SUPERVISOR', 'ROLE_USER')")

diff --git a/...g/eclipse/tractusx/traceability/qualitynotification/infrastructure/edc/EdcController.java b/...g/eclipse/tractusx/traceability/qualitynotification/infrastructure/edc/EdcController.java
@@ -30,14 +30,12 @@
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.tractusx.traceability.common.config.FeatureFlags;
 import org.eclipse.tractusx.traceability.common.response.ErrorResponse;
 import org.eclipse.tractusx.traceability.qualitynotification.domain.alert.service.AlertsReceiverService;
 import org.eclipse.tractusx.traceability.qualitynotification.domain.investigation.model.exception.InvestigationIllegalUpdate;
 import org.eclipse.tractusx.traceability.qualitynotification.domain.investigation.service.InvestigationsReceiverService;
 import org.eclipse.tractusx.traceability.qualitynotification.infrastructure.edc.model.EDCNotification;
 import org.eclipse.tractusx.traceability.qualitynotification.infrastructure.edc.model.NotificationType;
-import org.springframework.context.annotation.Profile;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -46,7 +44,6 @@
 import static org.eclipse.tractusx.traceability.common.model.SecurityUtils.sanitize;
 
 @Slf4j
-@Profile(FeatureFlags.NOTIFICATIONS_ENABLED_PROFILES)
 @Hidden
 @RestController
 @Validated