AYS-385 | IN_PROGRESS Status Has Been Removed (#365)

afet-yonetim-sistemi · Aug 13, 2024 · 62683f5 · 62683f5
1 parent 11b43f3
commit 62683f5
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 17 deletions.
diff --git a/src/main/java/org/ays/emergency_application/model/EmergencyEvacuationApplication.java b/src/main/java/org/ays/emergency_application/model/EmergencyEvacuationApplication.java
@@ -7,7 +7,7 @@
 import org.ays.common.model.AysPhoneNumber;
 import org.ays.common.model.BaseDomainModel;
 import org.ays.common.util.AysRandomUtil;
-import org.ays.emergency_application.model.entity.EmergencyEvacuationApplicationStatus;
+import org.ays.emergency_application.model.enums.EmergencyEvacuationApplicationStatus;
 import org.ays.institution.model.Institution;
 
 /**

diff --git a/...java/org/ays/emergency_application/model/entity/EmergencyEvacuationApplicationEntity.java b/...java/org/ays/emergency_application/model/entity/EmergencyEvacuationApplicationEntity.java
@@ -16,6 +16,7 @@
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 import org.ays.common.model.entity.BaseEntity;
+import org.ays.emergency_application.model.enums.EmergencyEvacuationApplicationStatus;
 import org.ays.institution.model.entity.InstitutionEntity;
 
 /**

diff --git a/...EmergencyEvacuationApplicationStatus.java → ...EmergencyEvacuationApplicationStatus.java b/...EmergencyEvacuationApplicationStatus.java → ...EmergencyEvacuationApplicationStatus.java
@@ -1,4 +1,4 @@
-package org.ays.emergency_application.model.entity;
+package org.ays.emergency_application.model.enums;
 
 /**
  * Enumeration keeping emergency evacuation status.
@@ -7,7 +7,6 @@ public enum EmergencyEvacuationApplicationStatus {
 
     PENDING,
     IN_REVIEW,
-    IN_PROGRESS,
     RECEIVED_FIRST_APPROVE,
     RECEIVED_SECOND_APPROVE,
     RECEIVED_THIRD_APPROVE,

diff --git a/...java/org/ays/emergency_application/model/filter/EmergencyEvacuationApplicationFilter.java b/...java/org/ays/emergency_application/model/filter/EmergencyEvacuationApplicationFilter.java
@@ -8,7 +8,7 @@
 import org.ays.common.model.AysFilter;
 import org.ays.common.util.validation.NoSpecialCharacters;
 import org.ays.emergency_application.model.entity.EmergencyEvacuationApplicationEntity;
-import org.ays.emergency_application.model.entity.EmergencyEvacuationApplicationStatus;
+import org.ays.emergency_application.model.enums.EmergencyEvacuationApplicationStatus;
 import org.hibernate.validator.constraints.Range;
 import org.springframework.data.jpa.domain.Specification;
 

diff --git a/.../ays/emergency_application/model/request/EmergencyEvacuationApplicationUpdateRequest.java b/.../ays/emergency_application/model/request/EmergencyEvacuationApplicationUpdateRequest.java
@@ -4,7 +4,7 @@
 import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
-import org.ays.emergency_application.model.entity.EmergencyEvacuationApplicationStatus;
+import org.ays.emergency_application.model.enums.EmergencyEvacuationApplicationStatus;
 import org.hibernate.validator.constraints.Range;
 
 /**

diff --git a/.../org/ays/emergency_application/model/response/EmergencyEvacuationApplicationResponse.java b/.../org/ays/emergency_application/model/response/EmergencyEvacuationApplicationResponse.java
@@ -3,7 +3,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.ays.common.model.AysPhoneNumber;
-import org.ays.emergency_application.model.entity.EmergencyEvacuationApplicationStatus;
+import org.ays.emergency_application.model.enums.EmergencyEvacuationApplicationStatus;
 
 import java.time.LocalDateTime;
 

diff --git a/...org/ays/emergency_application/model/response/EmergencyEvacuationApplicationsResponse.java b/...org/ays/emergency_application/model/response/EmergencyEvacuationApplicationsResponse.java
@@ -3,7 +3,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.ays.common.model.AysPhoneNumber;
-import org.ays.emergency_application.model.entity.EmergencyEvacuationApplicationStatus;
+import org.ays.emergency_application.model.enums.EmergencyEvacuationApplicationStatus;
 
 import java.time.LocalDateTime;
 

diff --git a/src/main/resources/db/changelog/changes/1-ays-ddl.xml b/src/main/resources/db/changelog/changes/1-ays-ddl.xml
@@ -161,7 +161,6 @@
                 ADD CONSTRAINT `C__AYS_EMERGENCY_EVACUATION_APPLICATION__STATUS` CHECK (`STATUS` IN
                                                                                         ('PENDING',
                                                                                          'IN_REVIEW',
-                                                                                         'IN_PROGRESS',
                                                                                          'RECEIVED_FIRST_APPROVE',
                                                                                          'RECEIVED_SECOND_APPROVE',
                                                                                          'RECEIVED_THIRD_APPROVE',

diff --git a/...rg/ays/emergency_application/controller/EmergencyEvacuationApplicationControllerTest.java b/...rg/ays/emergency_application/controller/EmergencyEvacuationApplicationControllerTest.java
@@ -13,7 +13,7 @@
 import org.ays.common.util.exception.model.AysErrorBuilder;
 import org.ays.emergency_application.model.EmergencyEvacuationApplication;
 import org.ays.emergency_application.model.EmergencyEvacuationApplicationBuilder;
-import org.ays.emergency_application.model.entity.EmergencyEvacuationApplicationStatus;
+import org.ays.emergency_application.model.enums.EmergencyEvacuationApplicationStatus;
 import org.ays.emergency_application.model.mapper.EmergencyEvacuationApplicationToApplicationResponseMapper;
 import org.ays.emergency_application.model.mapper.EmergencyEvacuationApplicationToApplicationsResponseMapper;
 import org.ays.emergency_application.model.request.EmergencyEvacuationApplicationListRequest;

diff --git a/.../org/ays/emergency_application/controller/EmergencyEvacuationApplicationEndToEndTest.java b/.../org/ays/emergency_application/controller/EmergencyEvacuationApplicationEndToEndTest.java
@@ -7,7 +7,7 @@
 import org.ays.common.model.response.AysResponseBuilder;
 import org.ays.emergency_application.model.EmergencyEvacuationApplication;
 import org.ays.emergency_application.model.EmergencyEvacuationApplicationBuilder;
-import org.ays.emergency_application.model.entity.EmergencyEvacuationApplicationStatus;
+import org.ays.emergency_application.model.enums.EmergencyEvacuationApplicationStatus;
 import org.ays.emergency_application.model.mapper.EmergencyEvacuationApplicationToApplicationResponseMapper;
 import org.ays.emergency_application.model.request.EmergencyEvacuationApplicationListRequest;
 import org.ays.emergency_application.model.request.EmergencyEvacuationApplicationListRequestBuilder;

diff --git a/src/test/java/org/ays/emergency_application/model/EmergencyEvacuationApplicationBuilder.java b/src/test/java/org/ays/emergency_application/model/EmergencyEvacuationApplicationBuilder.java
@@ -4,7 +4,7 @@
 import org.ays.common.model.AysPhoneNumberBuilder;
 import org.ays.common.model.TestDataBuilder;
 import org.ays.common.util.AysRandomUtil;
-import org.ays.emergency_application.model.entity.EmergencyEvacuationApplicationStatus;
+import org.ays.emergency_application.model.enums.EmergencyEvacuationApplicationStatus;
 import org.ays.institution.model.Institution;
 
 public class EmergencyEvacuationApplicationBuilder extends TestDataBuilder<EmergencyEvacuationApplication> {

diff --git a/...g/ays/emergency_application/model/entity/EmergencyEvacuationApplicationEntityBuilder.java b/...g/ays/emergency_application/model/entity/EmergencyEvacuationApplicationEntityBuilder.java
@@ -4,6 +4,7 @@
 import org.ays.common.model.AysPhoneNumberBuilder;
 import org.ays.common.model.TestDataBuilder;
 import org.ays.common.util.AysRandomUtil;
+import org.ays.emergency_application.model.enums.EmergencyEvacuationApplicationStatus;
 
 public class EmergencyEvacuationApplicationEntityBuilder extends TestDataBuilder<EmergencyEvacuationApplicationEntity> {
 

diff --git a/...g/ays/emergency_application/model/filter/EmergencyEvacuationApplicationFilterBuilder.java b/...g/ays/emergency_application/model/filter/EmergencyEvacuationApplicationFilterBuilder.java
@@ -1,7 +1,7 @@
 package org.ays.emergency_application.model.filter;
 
 import org.ays.common.model.TestDataBuilder;
-import org.ays.emergency_application.model.entity.EmergencyEvacuationApplicationStatus;
+import org.ays.emergency_application.model.enums.EmergencyEvacuationApplicationStatus;
 
 import java.util.Set;
 

diff --git a/...emergency_application/model/request/EmergencyEvacuationApplicationListRequestBuilder.java b/...emergency_application/model/request/EmergencyEvacuationApplicationListRequestBuilder.java
@@ -4,7 +4,7 @@
 import org.ays.common.model.AysPagingBuilder;
 import org.ays.common.model.AysSort;
 import org.ays.common.model.TestDataBuilder;
-import org.ays.emergency_application.model.entity.EmergencyEvacuationApplicationStatus;
+import org.ays.emergency_application.model.enums.EmergencyEvacuationApplicationStatus;
 import org.ays.emergency_application.model.filter.EmergencyEvacuationApplicationFilter;
 
 import java.util.List;

diff --git a/...ergency_application/model/request/EmergencyEvacuationApplicationUpdateRequestBuilder.java b/...ergency_application/model/request/EmergencyEvacuationApplicationUpdateRequestBuilder.java
@@ -1,7 +1,7 @@
 package org.ays.emergency_application.model.request;
 
 import org.ays.common.model.TestDataBuilder;
-import org.ays.emergency_application.model.entity.EmergencyEvacuationApplicationStatus;
+import org.ays.emergency_application.model.enums.EmergencyEvacuationApplicationStatus;
 
 public class EmergencyEvacuationApplicationUpdateRequestBuilder extends TestDataBuilder<EmergencyEvacuationApplicationUpdateRequest> {
 
@@ -13,7 +13,7 @@ public EmergencyEvacuationApplicationUpdateRequestBuilder withValidValues() {
         return this
                 .withSeatingCount(1)
                 .withHasObstaclePersonExist(true)
-                .withStatus(EmergencyEvacuationApplicationStatus.IN_PROGRESS)
+                .withStatus(EmergencyEvacuationApplicationStatus.IN_REVIEW)
                 .withNotes("This is a valid note for the application update.");
     }
 

diff --git a/...va/org/ays/emergency_application/port/impl/EmergencyEvacuationApplicationAdapterTest.java b/...va/org/ays/emergency_application/port/impl/EmergencyEvacuationApplicationAdapterTest.java
@@ -10,7 +10,7 @@
 import org.ays.emergency_application.model.EmergencyEvacuationApplicationBuilder;
 import org.ays.emergency_application.model.entity.EmergencyEvacuationApplicationEntity;
 import org.ays.emergency_application.model.entity.EmergencyEvacuationApplicationEntityBuilder;
-import org.ays.emergency_application.model.entity.EmergencyEvacuationApplicationStatus;
+import org.ays.emergency_application.model.enums.EmergencyEvacuationApplicationStatus;
 import org.ays.emergency_application.model.filter.EmergencyEvacuationApplicationFilter;
 import org.ays.emergency_application.model.filter.EmergencyEvacuationApplicationFilterBuilder;
 import org.ays.emergency_application.model.mapper.EmergencyEvacuationApplicationEntityToDomainMapper;

diff --git a/...ays/emergency_application/service/impl/EmergencyEvacuationApplicationServiceImplTest.java b/...ays/emergency_application/service/impl/EmergencyEvacuationApplicationServiceImplTest.java
@@ -8,7 +8,7 @@
 import org.ays.common.util.AysRandomUtil;
 import org.ays.emergency_application.model.EmergencyEvacuationApplication;
 import org.ays.emergency_application.model.EmergencyEvacuationApplicationBuilder;
-import org.ays.emergency_application.model.entity.EmergencyEvacuationApplicationStatus;
+import org.ays.emergency_application.model.enums.EmergencyEvacuationApplicationStatus;
 import org.ays.emergency_application.model.filter.EmergencyEvacuationApplicationFilter;
 import org.ays.emergency_application.model.mapper.EmergencyEvacuationApplicationRequestToDomainMapper;
 import org.ays.emergency_application.model.request.EmergencyEvacuationApplicationListRequest;