1717use OCP \ICache ;
1818use OCP \ICacheFactory ;
1919use OCP \IDBConnection ;
20+ use OCP \IGroup ;
2021use OCP \IGroupManager ;
2122use OCP \IUser ;
2223use OCP \IUserManager ;
@@ -552,8 +553,9 @@ private function extendQueryByFilter(IQueryBuilder $qb, SearchQuery $query) {
552553 return (mb_strtolower ($ user ->getDisplayName ()) === mb_strtolower ($ assignedQueryValue ) || $ user ->getUID () === $ assignedQueryValue );
553554 });
554555 $ groups = $ this ->groupManager ->search ($ assignment ->getValue ());
556+ $ groups = array_map (fn (IGroup $ g ): string => $ g ->getGID (), $ groups );
555557 foreach ($ searchUsers as $ user ) {
556- $ groups = array_merge ($ groups , $ this ->groupManager ->getUserGroups ($ user ));
558+ $ groups = array_merge ($ groups , $ this ->groupManager ->getUserGroupIds ($ user ));
557559 }
558560
559561 $ assignmentSearches = [];
@@ -565,10 +567,10 @@ private function extendQueryByFilter(IQueryBuilder $qb, SearchQuery $query) {
565567 $ qb ->expr ()->eq ('au ' . $ index . '.type ' , $ qb ->createNamedParameter (Assignment::TYPE_USER , IQueryBuilder::PARAM_INT ))
566568 );
567569 }
568- foreach ($ groups as $ group ) {
570+ foreach ($ groups as $ groupId ) {
569571 $ hasAssignedMatches = true ;
570572 $ assignmentSearches [] = $ qb ->expr ()->andX (
571- $ qb ->expr ()->eq ('au ' . $ index . '.participant ' , $ qb ->createNamedParameter ($ group -> getGID () , IQueryBuilder::PARAM_STR )),
573+ $ qb ->expr ()->eq ('au ' . $ index . '.participant ' , $ qb ->createNamedParameter ($ groupId , IQueryBuilder::PARAM_STR )),
572574 $ qb ->expr ()->eq ('au ' . $ index . '.type ' , $ qb ->createNamedParameter (Assignment::TYPE_GROUP , IQueryBuilder::PARAM_INT ))
573575 );
574576 }
0 commit comments