Replace enums

src/main/java/pl/ateam/disasteralerts/API/WeatherMonitoringService.java

@@ -6,7 +6,7 @@
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import pl.ateam.disasteralerts.disaster.DisasterFacade;
-import pl.ateam.disasteralerts.disaster.DisasterType;
+import pl.ateam.disasteralerts.util.enums.DisasterType;
 import pl.ateam.disasteralerts.disaster.dto.DisasterAddDTO;
 import pl.ateam.disasteralerts.disaster.dto.DisasterDTO;
 import pl.ateam.disasteralerts.util.CitiesInPoland;

src/main/java/pl/ateam/disasteralerts/disaster/Disaster.java

@@ -10,8 +10,9 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import pl.ateam.disasteralerts.disaster.enums.DisasterStatus;
+import pl.ateam.disasteralerts.util.enums.DisasterStatus;
 import pl.ateam.disasteralerts.util.EntityAudit;
+import pl.ateam.disasteralerts.util.enums.DisasterType;
 
 import java.time.LocalDateTime;
 import java.util.UUID;

src/main/java/pl/ateam/disasteralerts/disaster/DisasterController.java

@@ -12,6 +12,7 @@
 import pl.ateam.disasteralerts.disaster.dto.DisasterAddDTO;
 import pl.ateam.disasteralerts.disaster.dto.DisasterDTO;
 import pl.ateam.disasteralerts.security.AppUser;
+import pl.ateam.disasteralerts.util.enums.DisasterType;
 
 @RestController
 @RequestMapping(DisasterController.DISASTERS_BASE_URL)

src/main/java/pl/ateam/disasteralerts/disaster/DisasterFacade.java

@@ -8,6 +8,7 @@
 import org.springframework.validation.annotation.Validated;
 import pl.ateam.disasteralerts.disaster.dto.DisasterAddDTO;
 import pl.ateam.disasteralerts.disaster.dto.DisasterDTO;
+import pl.ateam.disasteralerts.util.enums.DisasterType;
 
 import java.util.List;
 import java.util.Map;

src/main/java/pl/ateam/disasteralerts/disaster/DisasterRepository.java

@@ -1,7 +1,8 @@
 package pl.ateam.disasteralerts.disaster;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import pl.ateam.disasteralerts.disaster.enums.DisasterStatus;
+import pl.ateam.disasteralerts.util.enums.DisasterStatus;
+import pl.ateam.disasteralerts.util.enums.DisasterType;
 
 import java.util.List;
 import java.util.Optional;

src/main/java/pl/ateam/disasteralerts/disaster/DisasterService.java

@@ -6,6 +6,7 @@
 import org.springframework.validation.annotation.Validated;
 import pl.ateam.disasteralerts.disaster.dto.DisasterAddDTO;
 import pl.ateam.disasteralerts.disaster.dto.DisasterDTO;
+import pl.ateam.disasteralerts.util.enums.DisasterType;
 
 import java.util.List;
 import java.util.Map;

src/main/java/pl/ateam/disasteralerts/disaster/DisasterServiceImpl.java

@@ -8,7 +8,8 @@
 import pl.ateam.disasteralerts.alert.dto.AlertAddDTO;
 import pl.ateam.disasteralerts.disaster.dto.DisasterAddDTO;
 import pl.ateam.disasteralerts.disaster.dto.DisasterDTO;
-import pl.ateam.disasteralerts.disaster.enums.DisasterStatus;
+import pl.ateam.disasteralerts.util.enums.DisasterStatus;
+import pl.ateam.disasteralerts.util.enums.DisasterType;
 
 import java.util.*;
 import java.util.stream.Collectors;

src/main/java/pl/ateam/disasteralerts/disaster/dto/DisasterAddDTO.java

@@ -2,7 +2,7 @@
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import pl.ateam.disasteralerts.disaster.DisasterType;
+import pl.ateam.disasteralerts.util.enums.DisasterType;
 
 import java.util.UUID;
 

src/main/java/pl/ateam/disasteralerts/disaster/dto/DisasterDTO.java

@@ -1,7 +1,7 @@
 package pl.ateam.disasteralerts.disaster.dto;
 
-import pl.ateam.disasteralerts.disaster.enums.DisasterStatus;
-import pl.ateam.disasteralerts.disaster.DisasterType;
+import pl.ateam.disasteralerts.util.enums.DisasterStatus;
+import pl.ateam.disasteralerts.util.enums.DisasterType;
 
 import java.time.LocalDateTime;
 import java.util.UUID;

src/main/java/pl/ateam/disasteralerts/disaster/enums/DisasterStatus.java → src/main/java/pl/ateam/disasteralerts/util/enums/DisasterStatus.java

@@ -1,4 +1,4 @@
-package pl.ateam.disasteralerts.disaster.enums;
+package pl.ateam.disasteralerts.util.enums;
 
 public enum DisasterStatus {
     ACTIVE, FINISHED, FAKE

src/main/java/pl/ateam/disasteralerts/disaster/DisasterType.java → src/main/java/pl/ateam/disasteralerts/util/enums/DisasterType.java

@@ -1,4 +1,4 @@
-package pl.ateam.disasteralerts.disaster;
+package pl.ateam.disasteralerts.util.enums;
 
 public enum DisasterType {
     STORM("Burza"),

src/main/java/pl/ateam/disasteralerts/web/DisasterViewController.java

@@ -10,8 +10,8 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import pl.ateam.disasteralerts.disaster.DisasterFacade;
-import pl.ateam.disasteralerts.disaster.enums.DisasterStatus;
-import pl.ateam.disasteralerts.disaster.DisasterType;
+import pl.ateam.disasteralerts.util.enums.DisasterStatus;
+import pl.ateam.disasteralerts.util.enums.DisasterType;
 import pl.ateam.disasteralerts.disaster.dto.DisasterAddDTO;
 import pl.ateam.disasteralerts.disaster.dto.DisasterDTO;
 import pl.ateam.disasteralerts.security.AppUser;

src/test/java/pl/ateam/disasteralerts/airiskassessment/RiskAssessmentServiceTest.java

@@ -6,7 +6,7 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
-import pl.ateam.disasteralerts.disaster.DisasterType;
+import pl.ateam.disasteralerts.util.enums.DisasterType;
 import pl.ateam.disasteralerts.disaster.dto.DisasterAddDTO;
 import pl.ateam.disasteralerts.util.CitiesInPoland;
 

src/test/java/pl/ateam/disasteralerts/disaster/DisasterControllerTest.java

@@ -14,6 +14,7 @@
 import pl.ateam.disasteralerts.disaster.dto.DisasterDTO;
 import pl.ateam.disasteralerts.security.AppUser;
 import pl.ateam.disasteralerts.user.dto.UserDTO;
+import pl.ateam.disasteralerts.util.enums.DisasterType;
 
 import java.util.UUID;
 

src/test/java/pl/ateam/disasteralerts/disaster/DisasterFacadeTest.java

@@ -11,7 +11,8 @@
 import pl.ateam.disasteralerts.alert.AlertFacade;
 import pl.ateam.disasteralerts.disaster.dto.DisasterAddDTO;
 import pl.ateam.disasteralerts.disaster.dto.DisasterDTO;
-import pl.ateam.disasteralerts.disaster.enums.DisasterStatus;
+import pl.ateam.disasteralerts.util.enums.DisasterStatus;
+import pl.ateam.disasteralerts.util.enums.DisasterType;
 
 import java.time.LocalDateTime;
 import java.util.UUID;

src/test/java/pl/ateam/disasteralerts/disaster/DisasterServiceImplTest.java

@@ -12,7 +12,8 @@
 import pl.ateam.disasteralerts.alert.AlertFacade;
 import pl.ateam.disasteralerts.disaster.dto.DisasterAddDTO;
 import pl.ateam.disasteralerts.disaster.dto.DisasterDTO;
-import pl.ateam.disasteralerts.disaster.enums.DisasterStatus;
+import pl.ateam.disasteralerts.util.enums.DisasterStatus;
+import pl.ateam.disasteralerts.util.enums.DisasterType;
 
 import java.time.LocalDateTime;
 import java.util.Optional;

src/test/java/pl/ateam/disasteralerts/disaster/DisasteralertIT.java

@@ -8,10 +8,11 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import pl.ateam.disasteralerts.API.WeatherMonitoringFacade;
-import pl.ateam.disasteralerts.disaster.enums.DisasterStatus;
+import pl.ateam.disasteralerts.util.enums.DisasterStatus;
 import pl.ateam.disasteralerts.security.AppUser;
 import pl.ateam.disasteralerts.user.UserFacade;
 import pl.ateam.disasteralerts.user.dto.UserDTO;
+import pl.ateam.disasteralerts.util.enums.DisasterType;
 
 import java.util.List;
 import java.util.UUID;