Revert "Merge branch 'DCMFOSS-26' into Spike_analysis"

This reverts commit 8e74ac3, reversing changes made to 3bb827c.
eclipse-tractusx · Dec 12, 2023 · b8d6d1f · b8d6d1f
1 parent 8e74ac3
commit b8d6d1f
Show file tree

Hide file tree

Showing 51 changed files with 976 additions and 1,955 deletions.
diff --git a/...se/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/controllers/AlertController.java b/...se/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/controllers/AlertController.java
diff --git a/...g/eclipse/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/entities/AlertEntity.java b/...g/eclipse/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/entities/AlertEntity.java
diff --git a/.../tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/entities/DedicatedAlertEntity.java b/.../tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/entities/DedicatedAlertEntity.java
diff --git a/.../tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/entities/MaterialDemandEntity.java b/.../tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/entities/MaterialDemandEntity.java
@@ -25,13 +25,14 @@
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import jakarta.persistence.*;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.UUID;
 import lombok.*;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.enums.EventType;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.enums.MaterialDemandStatus;
 
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.UUID;
+
 @Entity
 @Cacheable(false)
 @Table(name = "material_demand")

diff --git a/.../tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/entities/TriggeredAlertEntity.java b/.../tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/entities/TriggeredAlertEntity.java
diff --git a/...ctusx/demandcapacitymgmt/demandcapacitymgmtbackend/entities/enums/AlertThresholdType.java b/...ctusx/demandcapacitymgmt/demandcapacitymgmtbackend/entities/enums/AlertThresholdType.java
diff --git a/...x/demandcapacitymgmt/demandcapacitymgmtbackend/entities/enums/AlertsMonitoredObjects.java b/...x/demandcapacitymgmt/demandcapacitymgmtbackend/entities/enums/AlertsMonitoredObjects.java
diff --git a/.../tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/repositories/AlertsRepository.java b/.../tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/repositories/AlertsRepository.java
diff --git a/...x/demandcapacitymgmt/demandcapacitymgmtbackend/repositories/MaterialDemandRepository.java b/...x/demandcapacitymgmt/demandcapacitymgmtbackend/repositories/MaterialDemandRepository.java
@@ -23,19 +23,19 @@
 package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.repositories;
 
 import jakarta.persistence.Cacheable;
-import java.util.List;
-import java.util.UUID;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.MaterialDemandEntity;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.enums.MaterialDemandStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.UUID;
+
 @Repository
 @Cacheable(false)
 public interface MaterialDemandRepository extends JpaRepository<MaterialDemandEntity, UUID> {
     List<MaterialDemandEntity> findBySupplierId_Id(UUID id);
-
     @Query("select m from MaterialDemandEntity m where m.customerId.id = ?1")
     List<MaterialDemandEntity> findByCustomerId_Id(UUID id);
 

diff --git a/.../eclipse/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/services/AlertService.java b/.../eclipse/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/services/AlertService.java