AYS-368 | Role filtering added with filtering using new user

cagla88 · cagla88 · commit 8770f64ecfc4 · 2024-08-16T21:17:36.000+03:00
diff --git a/.github/workflows/application-health-checker.yml b/.github/workflows/application-health-checker.yml
@@ -64,6 +64,12 @@ jobs:
       - name: Replace institution_one.admin_user_two.password in configuration.properties # Step to replace the placeholder institution_one.admin_user_one.password in configuration.properties
         run: sed 's|'{INSTITUTION_ONE_ADMIN_USER_TWO_PASSWORD}'|'${{ secrets.AYS_INSTITUTION_ONE_ADMIN_USER_TWO_PASSWORD }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
 
+      - name: Replace institution.test_admin.email_address in configuration.properties # Step to replace the placeholder institution.test_admin.email_address in configuration.properties
+        run: sed 's|'{INSTITUTION_TEST_ADMIN_EMAIL_ADDRESS}'|'${{ secrets.AYS_INSTITUTION_TEST_ADMIN_EMAIL_ADDRESS }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
+
+      - name: Replace institution.test_admin.password in configuration.properties # Step to replace the placeholder institution.test_admin.password in configuration.properties
+        run: sed 's|'{INSTITUTION_TEST_ADMIN_PASSWORD}'|'${{ secrets.AYS_INSTITUTION_TEST_ADMIN_PASSWORD }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
+
       - name: Replace landing.user_one.emailAddress in configuration.properties # Step to replace the placeholder institution_one.admin_user_one.username in configuration.properties
         run: sed 's|'{LANDING_USER_ONE_EMAIL_ADDRESS}'|'${{ secrets.AYS_LANDING_USER_ONE_EMAIL_ADDRESS }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
 
diff --git a/.github/workflows/pull-request-checker.yml b/.github/workflows/pull-request-checker.yml
@@ -70,6 +70,12 @@ jobs:
       - name: Replace institution_one.admin_user_two.password in configuration.properties # Step to replace the placeholder institution_one.admin_user_one.password in configuration.properties
         run: sed 's|'{INSTITUTION_ONE_ADMIN_USER_TWO_PASSWORD}'|'${{ secrets.AYS_INSTITUTION_ONE_ADMIN_USER_TWO_PASSWORD }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
 
+      - name: Replace institution.test_admin.email_address in configuration.properties # Step to replace the placeholder institution.test_admin.email_address in configuration.properties
+        run: sed 's|'{INSTITUTION_TEST_ADMIN_EMAIL_ADDRESS}'|'${{ secrets.AYS_INSTITUTION_TEST_ADMIN_EMAIL_ADDRESS }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
+
+      - name: Replace institution.test_admin.password in configuration.properties # Step to replace the placeholder institution.test_admin.password in configuration.properties
+        run: sed 's|'{INSTITUTION_TEST_ADMIN_PASSWORD}'|'${{ secrets.AYS_INSTITUTION_TEST_ADMIN_PASSWORD }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
+
       - name: Replace landing.user_one.email_address in configuration.properties # Step to replace the placeholder institution_one.admin_user_one.username in configuration.properties
         run: sed 's|'{LANDING_USER_ONE_EMAIL_ADDRESS}'|'${{ secrets.AYS_LANDING_USER_ONE_EMAIL_ADDRESS }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties
 
diff --git a/sample_configuration.properties b/sample_configuration.properties
@@ -9,6 +9,8 @@ institution_one.admin_user_one.email_address={INSTITUTION_ONE_ADMIN_USER_ONE_EMA
 institution_one.admin_user_one.password={INSTITUTION_ONE_ADMIN_USER_ONE_PASSWORD}
 institution_one.admin_user_two.email_address={INSTITUTION_ONE_ADMIN_USER_TWO_EMAIL_ADDRESS}
 institution_one.admin_user_two.password={INSTITUTION_ONE_ADMIN_USER_TWO_PASSWORD}
+institution.test_admin.email_address={INSTITUTION_TEST_ADMIN_EMAIL_ADDRESS}
+institution.test_admin.password={INSTITUTION_TEST_ADMIN_PASSWORD}
 landing.user_one.email_address={LANDING_USER_ONE_EMAIL_ADDRESS}
 landing.user_one.password={LANDING_USER_ONE_PASSWORD}
 volunteer_foundation_id={VOLUNTEER_FOUNDATION_ID}
diff --git a/src/test/java/org/ays/endpoints/Authorization.java b/src/test/java/org/ays/endpoints/Authorization.java
@@ -54,6 +54,19 @@ public static String loginAndGetAdminTwoAccessToken() {
         return response.jsonPath().getString("response.accessToken");
     }
 
+    public static String loginAndGetTestAdminAccessToken() {
+
+        AdminCredentials adminCredentials = AdminCredentials.generateForTestAdmin();
+
+        Response response = InstitutionAuthEndpoints.getAdminToken(adminCredentials);
+
+        if (!response.jsonPath().getBoolean("isSuccess")) {
+            System.out.println(response.jsonPath().prettify());
+        }
+
+        return response.jsonPath().getString("response.accessToken");
+    }
+
     public static String loginAndGetUserAccessToken(String username, String password) {
         UserCredentials userCredentials = new UserCredentials();
         userCredentials.setEmailAddress(username);
@@ -68,4 +81,5 @@ public static String loginAndGetUserAccessToken(String username, String password
         return response.jsonPath().getString("response.accessToken");
     }
 
+
 }
diff --git a/src/test/java/org/ays/endpoints/InstitutionEndpoints.java b/src/test/java/org/ays/endpoints/InstitutionEndpoints.java
@@ -13,6 +13,7 @@
 import org.ays.payload.RejectReason;
 import org.ays.payload.RequestBodyInstitution;
 import org.ays.payload.RequestBodyUsers;
+import org.ays.payload.RoleCreatePayload;
 import org.ays.payload.RolesListPayload;
 import org.ays.payload.SuperAdminCredentials;
 import org.ays.payload.User;
@@ -333,4 +334,28 @@ public static Response listRolesForSuperAdmin(RolesListPayload rolesListPayload)
         return AysRestAssured.perform(restAssuredRequest);
     }
 
+    public static Response listRolesForTestAdmin(RolesListPayload rolesListPayload) {
+
+        AysRestAssuredRequest restAssuredRequest = AysRestAssuredRequest.builder()
+                .httpMethod(HttpMethod.POST)
+                .url("/api/v1/roles")
+                .body(rolesListPayload)
+                .token(Authorization.loginAndGetTestAdminAccessToken())
+                .build();
+
+        return AysRestAssured.perform(restAssuredRequest);
+    }
+
+    public static Response createRole(RoleCreatePayload roleCreatePayload) {
+
+        AysRestAssuredRequest restAssuredRequest = AysRestAssuredRequest.builder()
+                .httpMethod(HttpMethod.POST)
+                .url("/api/v1/role")
+                .body(roleCreatePayload)
+                .token(Authorization.loginAndGetTestAdminAccessToken())
+                .build();
+
+        return AysRestAssured.perform(restAssuredRequest);
+    }
+
 }
diff --git a/src/test/java/org/ays/payload/AdminCredentials.java b/src/test/java/org/ays/payload/AdminCredentials.java
@@ -30,4 +30,13 @@ public static AdminCredentials generateForAdminTwo() {
         return adminCredentials;
     }
 
+    public static AdminCredentials generateForTestAdmin() {
+        AdminCredentials adminCredentials = new AdminCredentials();
+        adminCredentials.setEmailAddress(AysConfigurationProperty.InstitutionOne.TestAdmin.EMAIL_ADDRESS);
+        adminCredentials.setPassword(AysConfigurationProperty.InstitutionOne.TestAdmin.PASSWORD);
+        adminCredentials.setSourcePage(SourcePage.INSTITUTION);
+
+        return adminCredentials;
+    }
+
 }
diff --git a/src/test/java/org/ays/payload/RoleCreatePayload.java b/src/test/java/org/ays/payload/RoleCreatePayload.java
@@ -0,0 +1,24 @@
+package org.ays.payload;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.ays.utility.AysRandomUtil;
+import org.ays.utility.DatabaseUtility;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class RoleCreatePayload {
+
+    private String name;
+    private List<String> permissionIds;
+
+    public static RoleCreatePayload generate() {
+        RoleCreatePayload roleCreatePayload = new RoleCreatePayload();
+        roleCreatePayload.setName(AysRandomUtil.generateFirstName() + " Rol");
+        roleCreatePayload.setPermissionIds(DatabaseUtility.getPermissionsId());
+        return roleCreatePayload;
+    }
+
+}
diff --git a/src/test/java/org/ays/payload/RolesListPayload.java b/src/test/java/org/ays/payload/RolesListPayload.java
@@ -18,10 +18,10 @@ public static RolesListPayload generate() {
         return rolesListPayload;
     }
 
-    public static RolesListPayload generateWithFilter() {
+    public static RolesListPayload generateWithFilter(RoleCreatePayload roleCreatePayload) {
         RolesListPayload rolesListPayload = new RolesListPayload();
         rolesListPayload.setPageable(Pageable.generate(1, 10));
-        rolesListPayload.setFilter(RolesListFilter.generate("Kurum Yöneticisi", RolesListStatus.ACTIVE));
+        rolesListPayload.setFilter(RolesListFilter.generate(roleCreatePayload.getName(), RolesListStatus.ACTIVE));
         return rolesListPayload;
     }
 
diff --git a/src/test/java/org/ays/tests/institution/roleManagementService/PostRolesTest.java b/src/test/java/org/ays/tests/institution/roleManagementService/PostRolesTest.java
@@ -2,6 +2,7 @@
 
 import io.restassured.response.Response;
 import org.ays.endpoints.InstitutionEndpoints;
+import org.ays.payload.RoleCreatePayload;
 import org.ays.payload.RolesListPayload;
 import org.ays.tests.database.aysInstitutionName.AfetYonetimSistemi;
 import org.ays.tests.database.aysInstitutionName.DisasterFoundation;
@@ -10,6 +11,10 @@
 import org.ays.utility.AysResponseSpecs;
 import org.testng.annotations.Test;
 
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+
 public class PostRolesTest {
 
     @Test(groups = {"Smoke", "Regression", "Institution"})
@@ -31,7 +36,10 @@ public void rolesListForAdminOne() {
 
         response.then()
                 .spec(AysResponseSpecs.expectSuccessResponseSpec())
-                .spec(AysResponseSpecs.expectTotalElementCount(totalElementCount));
+                .spec(AysResponseSpecs.expectTotalElementCount(totalElementCount))
+                .spec(AysResponseSpecs.expectRolesListInContent())
+                .spec(AysResponseSpecs.expectDefaultListingDetails())
+                .body("response.filteredBy.institutionId", notNullValue());
 
     }
 
@@ -54,7 +62,10 @@ public void rolesListForAdminTwo() {
 
         response.then()
                 .spec(AysResponseSpecs.expectSuccessResponseSpec())
-                .spec(AysResponseSpecs.expectTotalElementCount(totalElementCount));
+                .spec(AysResponseSpecs.expectTotalElementCount(totalElementCount))
+                .spec(AysResponseSpecs.expectRolesListInContent())
+                .spec(AysResponseSpecs.expectDefaultListingDetails())
+                .body("response.filteredBy.institutionId", notNullValue());
 
     }
 
@@ -77,7 +88,36 @@ public void rolesListForSuperAdmin() {
 
         response.then()
                 .spec(AysResponseSpecs.expectSuccessResponseSpec())
-                .spec(AysResponseSpecs.expectTotalElementCount(totalElementCount));
+                .spec(AysResponseSpecs.expectTotalElementCount(totalElementCount))
+                .spec(AysResponseSpecs.expectRolesListInContent())
+                .spec(AysResponseSpecs.expectDefaultListingDetails())
+                .body("response.filteredBy.institutionId", notNullValue());
 
     }
+
+    @Test(groups = {"Smoke", "Regression", "Institution"})
+    public void rolesListWithFilter() {
+        RoleCreatePayload roleCreatePayload = RoleCreatePayload.generate();
+        InstitutionEndpoints.createRole(roleCreatePayload);
+
+        String name = roleCreatePayload.getName();
+
+        RolesListPayload rolesListPayload = RolesListPayload.generateWithFilter(roleCreatePayload);
+
+        Response response = InstitutionEndpoints.listRolesForTestAdmin(rolesListPayload);
+
+        if (response.jsonPath().getList("response.content").isEmpty()) {
+            AysLogUtil.info("No users under this institution.");
+            return;
+        }
+
+        response.then()
+                .spec(AysResponseSpecs.expectSuccessResponseSpec())
+                .spec(AysResponseSpecs.expectRolesListInContent())
+                .spec(AysResponseSpecs.expectDefaultListingDetails())
+                .body("response.content[0].name", is(name))
+                .body("response.filteredBy.institutionId", notNullValue());
+
+    }
+
 }
diff --git a/src/test/java/org/ays/utility/AysConfigurationProperty.java b/src/test/java/org/ays/utility/AysConfigurationProperty.java
@@ -57,6 +57,11 @@ public static class AdminUserTwo {
             public static final String PASSWORD = PROPERTIES.getProperty("institution_one.admin_user_two.password");
         }
 
+        public static class TestAdmin {
+            public static final String EMAIL_ADDRESS = PROPERTIES.getProperty("institution.test_admin.email_address");
+            public static final String PASSWORD = PROPERTIES.getProperty("institution.test_admin.password");
+        }
+
     }
 
     public static class LandingUserOne {
diff --git a/src/test/java/org/ays/utility/AysResponseSpecs.java b/src/test/java/org/ays/utility/AysResponseSpecs.java
@@ -150,4 +150,13 @@ public static ResponseSpecification expectTotalElementCount(int totalElementCoun
 
     }
 
+    public static ResponseSpecification expectRolesListInContent() {
+        return new ResponseSpecBuilder()
+                .expectBody("response.content[0].id", notNullValue())
+                .expectBody("response.content[0].name", notNullValue())
+                .expectBody("response.content[0].status", notNullValue())
+                .expectBody("response.content[0].createdAt", notNullValue())
+                .build();
+    }
+
 }
diff --git a/src/test/java/org/ays/utility/DatabaseUtility.java b/src/test/java/org/ays/utility/DatabaseUtility.java
@@ -1,10 +1,13 @@
 package org.ays.utility;
 
+import lombok.Getter;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.ays.payload.PasswordForgotPayload;
 import org.ays.payload.PhoneNumber;
 import org.ays.payload.UsersFilter;
 
+import java.security.Permission;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
@@ -14,6 +17,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Slf4j
 public class DatabaseUtility {
@@ -209,4 +213,61 @@ public static String getRoleCountQuery(String institutionName) {
                 "WHERE INSTITUTION.NAME = '" + institutionName + "'";
     }
 
+    public static List<Permission> fetchPermissionsFromDatabase() {
+        List<Permission> permissions = new ArrayList<>();
+        String query = "SELECT ID, CATEGORY FROM AYS_PERMISSION";
+
+        try {
+            if (connection == null || connection.isClosed()) {
+                DBConnection();
+            }
+
+            statement = connection.createStatement();
+            ResultSet resultSet = statement.executeQuery(query);
+
+            while (resultSet.next()) {
+                String id = resultSet.getString("ID");
+                String category = resultSet.getString("CATEGORY");
+                permissions.add(new Permission(id, category));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+            throw new RuntimeException("Failed to fetch permissions due to database error");
+        } finally {
+            DBConnectionClose();
+        }
+
+        return permissions;
+    }
+
+    public static List<String> getPermissionsId() {
+        String category = "ROLE_MANAGEMENT";
+
+        List<Permission> permissions = fetchPermissionsFromDatabase();
+
+        List<Permission> filteredPermissions = permissions.stream()
+                .filter(permission -> category.equals(permission.getCategory()))
+                .collect(Collectors.toList());
+
+        Collections.shuffle(filteredPermissions);
+        List<String> randomPermissionIds = filteredPermissions.stream()
+                .limit(2)
+                .map(Permission::getId)
+                .collect(Collectors.toList());
+
+        return randomPermissionIds;
+    }
+
+    @Getter
+    @Setter
+    static class Permission {
+        private String id;
+        private String category;
+
+        public Permission(String id, String category) {
+            this.id = id;
+            this.category = category;
+        }
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,13 @@ public static AdminCredentials generateForAdminTwo() {`
`30`	`30`	`return adminCredentials;`
`31`	`31`	`}`
`32`	`32`
	`33`	`+ public static AdminCredentials generateForTestAdmin() {`
	`34`	`+ AdminCredentials adminCredentials = new AdminCredentials();`
	`35`	`+ adminCredentials.setEmailAddress(AysConfigurationProperty.InstitutionOne.TestAdmin.EMAIL_ADDRESS);`
	`36`	`+ adminCredentials.setPassword(AysConfigurationProperty.InstitutionOne.TestAdmin.PASSWORD);`
	`37`	`+ adminCredentials.setSourcePage(SourcePage.INSTITUTION);`
	`38`	`+`
	`39`	`+ return adminCredentials;`
	`40`	`+ }`
	`41`	`+`
`33`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,10 @@ public static RolesListPayload generate() {`
`18`	`18`	`return rolesListPayload;`
`19`	`19`	`}`
`20`	`20`
`21`		`- public static RolesListPayload generateWithFilter() {`
	`21`	`+ public static RolesListPayload generateWithFilter(RoleCreatePayload roleCreatePayload) {`
`22`	`22`	`RolesListPayload rolesListPayload = new RolesListPayload();`
`23`	`23`	`rolesListPayload.setPageable(Pageable.generate(1, 10));`
`24`		`- rolesListPayload.setFilter(RolesListFilter.generate("Kurum Yöneticisi", RolesListStatus.ACTIVE));`
	`24`	`+ rolesListPayload.setFilter(RolesListFilter.generate(roleCreatePayload.getName(), RolesListStatus.ACTIVE));`
`25`	`25`	`return rolesListPayload;`
`26`	`26`	`}`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,11 @@ public static class AdminUserTwo {`
`57`	`57`	`public static final String PASSWORD = PROPERTIES.getProperty("institution_one.admin_user_two.password");`
`58`	`58`	`}`
`59`	`59`
	`60`	`+ public static class TestAdmin {`
	`61`	`+ public static final String EMAIL_ADDRESS = PROPERTIES.getProperty("institution.test_admin.email_address");`
	`62`	`+ public static final String PASSWORD = PROPERTIES.getProperty("institution.test_admin.password");`
	`63`	`+ }`
	`64`	`+`
`60`	`65`	`}`
`61`	`66`
`62`	`67`	`public static class LandingUserOne {`