From be09282711eb7f45d99da3b1b663ff6569064df7 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Mon, 16 Sep 2024 15:35:05 -0400
Subject: [PATCH] Added filter to getPeopleWithMultivaluedAttributes caching
 (#2850)

---
 .../portal/utils/cache/PersonDirectoryCacheKeyGenerator.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/uPortal-events/src/main/java/org/apereo/portal/utils/cache/PersonDirectoryCacheKeyGenerator.java b/uPortal-events/src/main/java/org/apereo/portal/utils/cache/PersonDirectoryCacheKeyGenerator.java
index 9c80b44e9dc..6ac71bc8d51 100644
--- a/uPortal-events/src/main/java/org/apereo/portal/utils/cache/PersonDirectoryCacheKeyGenerator.java
+++ b/uPortal-events/src/main/java/org/apereo/portal/utils/cache/PersonDirectoryCacheKeyGenerator.java
@@ -78,6 +78,7 @@ public Serializable generateKey(MethodInvocation methodInvocation) {
                 // Both methods that take a Map argument can just have the first argument returned
             case PEOPLE_MAP:
             case PEOPLE_MULTIVALUED_MAP:
+            case PEOPLE_MULTIVALUED_MAP_FILTER:
             case MULTIVALUED_USER_ATTRIBUTES__MAP:
             case USER_ATTRIBUTES__MAP:
                 {
@@ -250,6 +251,10 @@ public enum CachableMethod {
         PERSON_STR("getPerson", String.class),
         PEOPLE_MAP("getPeople", Map.class),
         PEOPLE_MULTIVALUED_MAP("getPeopleWithMultivaluedAttributes", Map.class),
+        PEOPLE_MULTIVALUED_MAP_FILTER(
+                "getPeopleWithMultivaluedAttributes",
+                Map.class,
+                org.apereo.services.persondir.IPersonAttributeDaoFilter.class),
         POSSIBLE_USER_ATTRIBUTE_NAMES("getPossibleUserAttributeNames"),
         AVAILABLE_QUERY_ATTRIBUTES("getAvailableQueryAttributes");