AYS-441 | Filter and RequestBodyInstitution Has Been Merged and AdminRegistrationApplicationListPayload Class Has Been Created

Author: agitrubard

src/test/java/org/ays/payload/Filter.java

@@ -4,14 +4,12 @@
 import lombok.experimental.UtilityClass;
 import org.ays.auth.payload.AdminRegistrationApplicationCompletePayload;
 import org.ays.auth.payload.AdminRegistrationApplicationRejectPayload;
-import org.ays.common.model.payload.AysPageable;
 import org.ays.common.model.payload.AysRestAssuredPayload;
 import org.ays.common.util.AysRestAssured;
 import org.ays.endpoints.Authorization;
-import org.ays.payload.Filter;
-import org.ays.payload.RequestBodyInstitution;
 import org.ays.registrationapplication.model.enums.AdminRegistrationApplicationStatus;
 import org.ays.registrationapplication.model.payload.AdminRegistrationApplicationCreatePayload;
+import org.ays.registrationapplication.model.payload.AdminRegistrationApplicationListPayload;
 import org.ays.utility.AysConfigurationProperty;
 import org.ays.utility.AysRandomUtil;
 import org.openqa.selenium.remote.http.HttpMethod;
@@ -21,7 +19,7 @@
 @UtilityClass
 public class AdminRegistrationApplicationEndpoints {
 
-    public static Response postRegistrationApplications(RequestBodyInstitution requestBodyInstitution) {
+    public static Response postRegistrationApplications(AdminRegistrationApplicationListPayload requestBodyInstitution) {
 
         AysRestAssuredPayload restAssuredRequest = AysRestAssuredPayload.builder()
                 .httpMethod(HttpMethod.POST)
@@ -108,8 +106,11 @@ public static String generateApplicationID() {
     }
 
     public static String generateApplicationIDForCompletedStatus() {
-        RequestBodyInstitution requestBodyInstitution = RequestBodyInstitution.generateFilter(AysPageable.generateFirstPage(), Filter.generate(AdminRegistrationApplicationStatus.COMPLETED));
-        Response response = postRegistrationApplications(requestBodyInstitution);
+        AdminRegistrationApplicationListPayload.Filter filter = AdminRegistrationApplicationListPayload.Filter
+                .generate(AdminRegistrationApplicationStatus.COMPLETED);
+        AdminRegistrationApplicationListPayload applicationListPayload = AdminRegistrationApplicationListPayload
+                .generate(filter);
+        Response response = postRegistrationApplications(applicationListPayload);
         if (response.getStatusCode() == 200) {
             return response.then().extract().jsonPath().getString("response.content[0].id");
         } else {

src/test/java/org/ays/payload/RequestBodyInstitution.java

@@ -0,0 +1,45 @@
+package org.ays.registrationapplication.model.payload;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.ays.common.model.payload.AysPageable;
+import org.ays.registrationapplication.model.enums.AdminRegistrationApplicationStatus;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class AdminRegistrationApplicationListPayload {
+
+    private AysPageable pageable;
+    private Filter filter;
+
+    public static AdminRegistrationApplicationListPayload generate() {
+        AdminRegistrationApplicationListPayload payload = new AdminRegistrationApplicationListPayload();
+        payload.setPageable(AysPageable.generateFirstPage());
+        payload.setFilter(new Filter());
+        return payload;
+    }
+
+    public static AdminRegistrationApplicationListPayload generate(Filter filter) {
+        AdminRegistrationApplicationListPayload payload = new AdminRegistrationApplicationListPayload();
+        payload.setPageable(AysPageable.generateFirstPage());
+        payload.setFilter(filter);
+        return payload;
+    }
+
+    @Getter
+    @Setter
+    public static class Filter {
+
+        private List<AdminRegistrationApplicationStatus> statuses;
+
+        public static Filter generate(AdminRegistrationApplicationStatus status) {
+            Filter filter = new Filter();
+            filter.setStatuses(List.of(status));
+            return filter;
+        }
+
+    }
+
+}

src/test/java/org/ays/registrationapplication/endpoints/AdminRegistrationApplicationEndpoints.java

@@ -6,46 +6,27 @@
 import io.qameta.allure.Story;
 import io.restassured.response.Response;
 import org.ays.common.model.payload.AysOrder;
-import org.ays.common.model.payload.AysPageable;
-import org.ays.payload.Filter;
-import org.ays.payload.RequestBodyInstitution;
 import org.ays.registrationapplication.endpoints.AdminRegistrationApplicationEndpoints;
+import org.ays.registrationapplication.model.enums.AdminRegistrationApplicationStatus;
+import org.ays.registrationapplication.model.payload.AdminRegistrationApplicationListPayload;
 import org.ays.utility.AysResponseSpecs;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 
 public class PostAdminRegistrationApplicationsTest {
-    RequestBodyInstitution requestBodyInstitution;
-    AysPageable pageable;
-    Filter filter;
-    AysOrder orders;
-
-    @BeforeMethod(alwaysRun = true)
-    public void setup() {
-        requestBodyInstitution = new RequestBodyInstitution();
-        pageable = new AysPageable();
-        filter = new Filter();
-        orders = new AysOrder();
-    }
 
     @Test(groups = {"Smoke", "Regression", "SuperAdmin"})
     @Story("As a super admin I want to list administrator registration applications with request to pagination")
     @Severity(SeverityLevel.NORMAL)
     public void postRegistrationApplicationsWithPagination() {
-        pageable.setPage(1);
-        pageable.setPageSize(10);
-        requestBodyInstitution.setPageable(pageable);
-
-
-        Response response = AdminRegistrationApplicationEndpoints.postRegistrationApplications(requestBodyInstitution);
+        AdminRegistrationApplicationListPayload applicationListPayload = AdminRegistrationApplicationListPayload
+                .generate();
+        Response response = AdminRegistrationApplicationEndpoints.postRegistrationApplications(applicationListPayload);
         response.then()
                 .spec(AysResponseSpecs.expectSuccessResponseSpec())
                 .body("response.content", notNullValue())
@@ -56,12 +37,11 @@ public void postRegistrationApplicationsWithPagination() {
     @Story("As a super admin I want to get proper error message when I request to pagination with invalid data")
     @Severity(SeverityLevel.NORMAL)
     public void postRegistrationApplicationsWithPaginationNegative(int page, int pageSize) {
-        pageable.setPage(page);
-        pageable.setPageSize(pageSize);
-        requestBodyInstitution.setPageable(pageable);
-
-
-        Response response = AdminRegistrationApplicationEndpoints.postRegistrationApplications(requestBodyInstitution);
+        AdminRegistrationApplicationListPayload applicationListPayload = AdminRegistrationApplicationListPayload
+                .generate();
+        applicationListPayload.getPageable().setPage(page);
+        applicationListPayload.getPageable().setPageSize(pageSize);
+        Response response = AdminRegistrationApplicationEndpoints.postRegistrationApplications(applicationListPayload);
         response.then()
                 .spec(AysResponseSpecs.expectBadRequestResponseSpec())
                 .body("subErrors[0].message", containsString("must be between 1 and 99999999"));
@@ -71,16 +51,10 @@ public void postRegistrationApplicationsWithPaginationNegative(int page, int pag
     @Story("As a super admin I want to list administrator registration applications with request to pagination and filter")
     @Severity(SeverityLevel.NORMAL)
     public void postRegistrationApplicationsWithPaginationAndFilter() {
-        pageable.setPage(1);
-        pageable.setPageSize(10);
-        requestBodyInstitution.setPageable(pageable);
-
-        List<String> newStatuses = new ArrayList<>();
-        newStatuses.add("WAITING");
-        filter.setStatuses(newStatuses);
-        requestBodyInstitution.setFilter(filter);
-
-        Response response = AdminRegistrationApplicationEndpoints.postRegistrationApplications(requestBodyInstitution);
+        AdminRegistrationApplicationListPayload applicationListPayload = AdminRegistrationApplicationListPayload
+                .generate();
+        applicationListPayload.getFilter().setStatuses(List.of(AdminRegistrationApplicationStatus.WAITING));
+        Response response = AdminRegistrationApplicationEndpoints.postRegistrationApplications(applicationListPayload);
         response.then()
                 .spec(AysResponseSpecs.expectSuccessResponseSpec())
                 .body("response.content", notNullValue())
@@ -93,14 +67,10 @@ public void postRegistrationApplicationsWithPaginationAndFilter() {
     @Severity(SeverityLevel.NORMAL)
     @Description("Pagination and filter with invalid statuses value")
     public void postRegistrationApplicationsWithPaginationAndFilterNegative() {
-        pageable.setPage(1);
-        pageable.setPageSize(10);
-        requestBodyInstitution.setPageable(pageable);
-        List<String> statuses = new ArrayList<>();
-        statuses.add("WAIT");
-        filter.setStatuses(statuses);
-        requestBodyInstitution.setFilter(filter);
-        Response response = AdminRegistrationApplicationEndpoints.postRegistrationApplications(requestBodyInstitution);
+        AdminRegistrationApplicationListPayload applicationListPayload = AdminRegistrationApplicationListPayload
+                .generate();
+        applicationListPayload.getFilter().setStatuses(List.of(AdminRegistrationApplicationStatus.WAITING));
+        Response response = AdminRegistrationApplicationEndpoints.postRegistrationApplications(applicationListPayload);
         response.then()
                 .spec(AysResponseSpecs.expectBadRequestResponseSpec());
     }
@@ -110,17 +80,11 @@ public void postRegistrationApplicationsWithPaginationAndFilterNegative() {
     @Severity(SeverityLevel.NORMAL)
     @Description("Pagination and sort with Authorization")
     public void postRegistrationApplicationsWithPaginationAndSort() {
-        pageable.setPage(1);
-        pageable.setPageSize(10);
-        requestBodyInstitution.setPageable(pageable);
-
-        orders.setProperty("createdAt");
-        orders.setDirection("ASC");
-        List<AysOrder> newOrders = new ArrayList<>();
-        newOrders.add(orders);
-        requestBodyInstitution.setOrders(newOrders);
-
-        Response response = AdminRegistrationApplicationEndpoints.postRegistrationApplications(requestBodyInstitution);
+        AdminRegistrationApplicationListPayload applicationListPayload = AdminRegistrationApplicationListPayload
+                .generate();
+        List<AysOrder> orders = AysOrder.generate("createdAt", "ASC");
+        applicationListPayload.getPageable().setOrders(orders);
+        Response response = AdminRegistrationApplicationEndpoints.postRegistrationApplications(applicationListPayload);
         response.then()
                 .spec(AysResponseSpecs.expectSuccessResponseSpec())
                 .body("response.content", notNullValue())
@@ -133,17 +97,11 @@ public void postRegistrationApplicationsWithPaginationAndSort() {
     @Severity(SeverityLevel.NORMAL)
     @Description("Pagination and invalid sort value with Authorization")
     public void postRegistrationApplicationsWithPaginationAndInvalidSort() {
-        pageable.setPage(1);
-        pageable.setPageSize(10);
-        requestBodyInstitution.setPageable(pageable);
-
-        orders.setProperty("created");
-        orders.setDirection("ASC");
-        List<AysOrder> newOrders = new ArrayList<>();
-        newOrders.add(orders);
-        requestBodyInstitution.setOrders(newOrders);
-
-        Response response = AdminRegistrationApplicationEndpoints.postRegistrationApplications(requestBodyInstitution);
+        AdminRegistrationApplicationListPayload applicationListPayload = AdminRegistrationApplicationListPayload
+                .generate();
+        List<AysOrder> orders = AysOrder.generate("createdAt", "ASC");
+        applicationListPayload.getPageable().setOrders(orders);
+        Response response = AdminRegistrationApplicationEndpoints.postRegistrationApplications(applicationListPayload);
         response.then()
                 .spec(AysResponseSpecs.expectBadRequestResponseSpec());
     }
@@ -153,22 +111,12 @@ public void postRegistrationApplicationsWithPaginationAndInvalidSort() {
     @Severity(SeverityLevel.NORMAL)
     @Description("Pagination,sort and filter with Authorization")
     public void postRegistrationApplicationsWithPaginationSortFilter() {
-        pageable.setPage(1);
-        pageable.setPageSize(10);
-        requestBodyInstitution.setPageable(pageable);
-
-        List<String> statuses = new ArrayList<>();
-        statuses.add("WAITING");
-        filter.setStatuses(statuses);
-        requestBodyInstitution.setFilter(filter);
-
-        orders.setProperty("createdAt");
-        orders.setDirection("ASC");
-        List<AysOrder> newOrders = new ArrayList<>();
-        newOrders.add(orders);
-        requestBodyInstitution.setOrders(newOrders);
-
-        Response response = AdminRegistrationApplicationEndpoints.postRegistrationApplications(requestBodyInstitution);
+        AdminRegistrationApplicationListPayload applicationListPayload = AdminRegistrationApplicationListPayload
+                .generate();
+        applicationListPayload.getFilter().setStatuses(List.of(AdminRegistrationApplicationStatus.WAITING));
+        List<AysOrder> orders = AysOrder.generate("createdAt", "ASC");
+        applicationListPayload.getPageable().setOrders(orders);
+        Response response = AdminRegistrationApplicationEndpoints.postRegistrationApplications(applicationListPayload);
         response.then()
                 .spec(AysResponseSpecs.expectSuccessResponseSpec())
                 .body("response.content", notNullValue())
@@ -181,36 +129,14 @@ public void postRegistrationApplicationsWithPaginationSortFilter() {
     @Severity(SeverityLevel.NORMAL)
     @Description("Pagination,invalid sort and invalid filter with Authorization")
     public void postRegistrationApplicationsWithPaginationInvalidSortInvalidFilter() {
-        pageable.setPage(1);
-        pageable.setPageSize(10);
-        requestBodyInstitution.setPageable(pageable);
-
-        List<String> statuses = new ArrayList<>();
-        statuses.add("WAIT");
-        filter.setStatuses(statuses);
-        requestBodyInstitution.setFilter(filter);
-
-        orders.setProperty("");
-        orders.setDirection("ASC");
-        List<AysOrder> newOrders = new ArrayList<>();
-        newOrders.add(orders);
-        requestBodyInstitution.setOrders(newOrders);
-
-        Response response = AdminRegistrationApplicationEndpoints.postRegistrationApplications(requestBodyInstitution);
+        AdminRegistrationApplicationListPayload applicationListPayload = AdminRegistrationApplicationListPayload
+                .generate();
+        applicationListPayload.getFilter().setStatuses(List.of(AdminRegistrationApplicationStatus.WAITING));
+        List<AysOrder> orders = AysOrder.generate("", "ASC");
+        applicationListPayload.getPageable().setOrders(orders);
+        Response response = AdminRegistrationApplicationEndpoints.postRegistrationApplications(applicationListPayload);
         response.then()
                 .spec(AysResponseSpecs.expectBadRequestResponseSpec());
     }
 
-
-    @DataProvider(name = "paginationScenarios") //ARMS_03, ARMS_04, ARMS_05
-    public Object[][] paginationScenarios() {
-        return new Object[][]{
-                {0, 10},
-                {1, 0},
-                {-1, 10},
-                {1, -1},
-                {-1, -1}
-        };
-
-    }
 }

src/test/java/org/ays/registrationapplication/model/payload/AdminRegistrationApplicationListPayload.java

@@ -582,4 +582,16 @@ public Object[][] invalidRoleId() {
         };
     }
 
+    @org.testng.annotations.DataProvider(name = "paginationScenarios")
+    public Object[][] paginationScenarios() {
+        return new Object[][]{
+                {0, 10},
+                {1, 0},
+                {-1, 10},
+                {1, -1},
+                {-1, -1}
+        };
+
+    }
+
 }