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

Author: agitrubard

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;
 
 /**

src/main/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;
 
 /**

src/main/java/org/ays/emergency_application/model/entity/EmergencyEvacuationApplicationStatus.java renamed to src/main/java/org/ays/emergency_application/model/enums/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,

src/main/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;
 

src/main/java/org/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;
 
 /**

src/main/java/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;
 

src/main/java/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;
 

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',

src/test/java/org/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;

src/test/java/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;