MGR-142

fix filtering by group
appNG · Aug 29, 2022 · b927ea3 · b927ea3
1 parent 0bd27a2
commit b927ea3
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 15 deletions.
diff --git a/application-home/conf/datasources/ds-subjects.xml b/application-home/conf/datasources/ds-subjects.xml
@@ -10,7 +10,6 @@
 			</permissions>
 			<params>
 				<param name="userId" />
-				<param name="groupId" />
 			</params>
 			<meta-data bindClass="org.appng.api.model.Subject" result-selector="${current.id eq userId}">
 				<field name="name" type="text">
@@ -68,9 +67,7 @@
 				</link>
 			</linkpanel>
 		</config>
-		<bean id="subjects">
-			<option name="subject" groupId="${groupId}" />
-		</bean>
+		<bean id="subjects" />
 	</datasource>
 
 	<datasource id="user">

diff --git a/application-home/conf/pages/pg-subjects.xml b/application-home/conf/pages/pg-subjects.xml
@@ -58,7 +58,6 @@
 					<datasource id="users">
 						<params>
 							<param name="userId">${id}</param>
-							<param name="groupId">${f_gid}</param>
 						</params>
 					</datasource>
 				</element>

diff --git a/src/main/java/org/appng/application/manager/business/Subjects.java b/src/main/java/org/appng/application/manager/business/Subjects.java
@@ -102,8 +102,7 @@ public DataContainer getData(Site site, Application application, Environment env
 			data = service.getNewSubject(request, fp, defaultTimezone, languages);
 		} else {
 			try {
-				Integer groupId = options.getInteger(SUBJECT, "groupId");
-				data = service.searchSubjects(request, fp, subjectId, defaultTimezone, languages, groupId);
+				data = service.searchSubjects(request, fp, subjectId, defaultTimezone, languages);
 			} catch (BusinessException ex) {
 				String message = request.getMessage(ex.getMessageKey(), ex.getMessageArgs());
 				log.error(message, ex);

diff --git a/src/main/java/org/appng/application/manager/service/ManagerService.java b/src/main/java/org/appng/application/manager/service/ManagerService.java
@@ -1124,7 +1124,7 @@ private void checkSite(Request request, Site site, FieldProcessor fp, Site curre
 	}
 
 	public DataContainer searchSubjects(Request request, FieldProcessor fp, Integer subjectId, String defaultTimezone,
-			List<String> languages, Integer groupId) throws BusinessException {
+			List<String> languages) throws BusinessException {
 		DataContainer data = new DataContainer(fp);
 		if (subjectId != null) {
 			SubjectImpl subject = subjectRepository.findOne(subjectId);
@@ -1137,19 +1137,20 @@ public DataContainer searchSubjects(Request request, FieldProcessor fp, Integer
 			String timeZone = subject.getTimeZone();
 			addSelectionsForSubject(request, data, subject, timeZone == null ? defaultTimezone : timeZone, languages);
 		} else {
-			Page<SubjectImpl> subjects = searchSubjects(request, data, fp, groupId);
+			Page<SubjectImpl> subjects = searchSubjects(request, data, fp);
 			data.setPage(subjects);
 		}
 		return data;
 	}
 
-	private Page<SubjectImpl> searchSubjects(Request request, DataContainer data, FieldProcessor fp, Integer groupId) {
+	private Page<SubjectImpl> searchSubjects(Request request, DataContainer data, FieldProcessor fp) {
 		String filterParamType = "f_type";
 		String filterParamName = "f_name";
 		String filterParamRealName = "f_rlnme";
 		String filterParamGroup = "f_gid";
 		String filterParamLocked = "f_lckd";
 		String filterParamEmail = "f_eml";
+		String filterParamGroupId = "f_gid";
 		String typeFromRequest = request.getParameter(filterParamType);
 		String locked = request.getParameter(filterParamLocked);
 		UserType userType = null != typeFromRequest && UserType.names().contains(typeFromRequest)
@@ -1186,9 +1187,10 @@ private Page<SubjectImpl> searchSubjects(Request request, DataContainer data, Fi
 		} else if ("false".equalsIgnoreCase(locked)) {
 			searchQuery.equals("e.locked", false);
 		}
+		String groupId = request.getParameter(filterParamGroupId);
 		if (null != groupId) {
 			searchQuery.join("join e.groups g");
-			searchQuery.equals("g.id", groupId);
+			searchQuery.equals("g.id", request.convert(groupId, Integer.class));
 			List<Order> orders = StreamSupport.stream(pageable.getSort().spliterator(), false)
 					.map(o -> new Order(o.getDirection(), "e." + o.getProperty())).collect(Collectors.toList());
 			pageable = new PageRequest(pageable.getPageNumber(), pageable.getPageSize(), new Sort(orders));

diff --git a/src/main/java/org/appng/application/manager/service/Service.java b/src/main/java/org/appng/application/manager/service/Service.java
@@ -115,7 +115,7 @@ DataContainer searchSites(Environment environment, FieldProcessor fp, Integer si
 			String active) throws BusinessException;
 
 	DataContainer searchSubjects(Request request, FieldProcessor fp, Integer subjectId, String defaultTimezone,
-			List<String> languages, Integer groupId) throws BusinessException;
+			List<String> languages) throws BusinessException;
 
 	DataContainer searchPermissions(FieldProcessor fp, Integer permissionId, Integer appId) throws BusinessException;
 

diff --git a/src/test/java/org/appng/application/manager/business/SubjectsTest.java b/src/test/java/org/appng/application/manager/business/SubjectsTest.java
@@ -160,7 +160,9 @@ public void testShowAll() throws Exception {
 
 	@Test
 	public void testShowAllFilterGroup() throws Exception {
-		CallableDataSource siteDatasource = getDataSource("users").withParam("groupId", "1").getCallableDataSource();
+		addParameter("f_gid", "1");
+		initParameters();
+		CallableDataSource siteDatasource = getDataSource("users").getCallableDataSource();
 		siteDatasource.perform("test");
 		validate(siteDatasource.getDatasource());
 	}

diff --git a/src/test/resources/xml/SubjectsTest-testShowAll.xml b/src/test/resources/xml/SubjectsTest-testShowAll.xml
@@ -7,7 +7,6 @@
 		</permissions>
 		<params>
 			<param name="userId" />
-			<param name="groupId" />
 		</params>
 		<meta-data bindClass="org.appng.api.model.Subject" result-selector="${current.id eq userId}">
 			<field name="name" type="text" binding="name">

diff --git a/src/test/resources/xml/SubjectsTest-testShowAllFilterGroup.xml b/src/test/resources/xml/SubjectsTest-testShowAllFilterGroup.xml
@@ -7,7 +7,6 @@
 		</permissions>
 		<params>
 			<param name="userId" />
-			<param name="groupId">1</param>
 		</params>
 		<meta-data bindClass="org.appng.api.model.Subject" result-selector="${current.id eq userId}">
 			<field name="name" type="text" binding="name">