Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Added user roles list to application fetcher (#1624)

Browse Source 
* Added user roles list to application fetcher

* Fixed blanket import
This commit is contained in:
Nidhi 2020-11-09 11:54:30 +05:30 committed by GitHub
parent f854d65592
commit 1741e61ba0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/OrganizationApplicationsDTO.java
View File

@ -2,6 +2,7 @@ package com.appsmith.server.dtos;
import com.appsmith.server.domains.Application; import com.appsmith.server.domains.Application;
import com.appsmith.server.domains.Organization; import com.appsmith.server.domains.Organization;
import com.appsmith.server.domains.UserRole;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
@ -16,4 +17,5 @@ import java.util.List;
public class OrganizationApplicationsDTO { public class OrganizationApplicationsDTO {
Organization organization; Organization organization;
List<Application> applications; List<Application> applications;
List<UserRole> userRoles;
} }

1
app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcher.java
View File

@ -101,6 +101,7 @@ public class ApplicationFetcher {
OrganizationApplicationsDTO organizationApplicationsDTO = new OrganizationApplicationsDTO(); OrganizationApplicationsDTO organizationApplicationsDTO = new OrganizationApplicationsDTO();
organizationApplicationsDTO.setOrganization(organization); organizationApplicationsDTO.setOrganization(organization);
organizationApplicationsDTO.setApplications(applicationList); organizationApplicationsDTO.setApplications(applicationList);
organizationApplicationsDTO.setUserRoles(organization.getUserRoles());
organizationApplicationsDTOS.add(organizationApplicationsDTO); organizationApplicationsDTOS.add(organizationApplicationsDTO);
} }

3
app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
View File

@ -343,6 +343,9 @@ public class ApplicationServiceTest {
Application application = organizationApplicationDTO.getApplications().get(0); Application application = organizationApplicationDTO.getApplications().get(0);
assertThat(application.getUserPermissions()).contains("read:applications"); assertThat(application.getUserPermissions()).contains("read:applications");
assertThat(application.isAppIsExample()).isFalse(); assertThat(application.isAppIsExample()).isFalse();
assertThat(organizationApplicationDTO.getUserRoles().get(0).getRole().getName()).isEqualTo("Administrator");
log.debug(organizationApplicationDTO.getUserRoles().toString());
} }
} }