Merge pull request #2800 from uw-it-aca/qa

Qa

Author: devights

myuw/dao/messages.py

@@ -1,11 +1,17 @@
 # Copyright 2022 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
+import logging
+import traceback
+from restclients_core.exceptions import DataFailureException
+from myuw.dao import log_err
 from myuw.dao.affiliation import get_all_affiliations
 from myuw.models.myuw_notice import MyuwNotice
 from myuw.dao.gws import is_effective_member
 from myuw.dao.term import get_comparison_datetime_with_tz
 
+logger = logging.getLogger(__name__)
+
 
 def get_myuw_notices_for_user(request):
     date = get_comparison_datetime_with_tz(request)
@@ -20,8 +26,14 @@ def get_myuw_notices_for_user(request):
             continue
 
         if notice.has_target_group():
-            if is_effective_member(request, notice.target_group):
-                user_notices.append(notice)
+            try:
+                if is_effective_member(request, notice.target_group):
+                    user_notices.append(notice)
+            except DataFailureException:
+                log_err(
+                    logger, "is_effective_member of target group({})".format(
+                        notice.target_group), traceback, request)
+                # notice skipped
             continue
 
         if for_all_affi(notice):

myuw/dao/myuw_notice.py

@@ -4,7 +4,6 @@
 import logging
 from persistent_message.models import Message
 from myuw.dao.affiliation import get_all_affiliations
-from myuw.dao.gws import is_effective_member
 from myuw.dao.term import get_comparison_datetime_with_tz
 
 logger = logging.getLogger(__name__)

myuw/dao/persistent_messages.py

@@ -23,11 +23,10 @@ <h3>Content Management</h3>
         {% if manage_messages_url %}
             <li>
                 <a href="{{ manage_messages_url }}">
-                    {{ persistent_message_link|default:"Persistent Messages" }}
+                    {{ persistent_message_link|default:"Banner Messages" }}
                 </a>
             </li>
         {% endif %}
-        <li><a href="{% url 'myuw_manage_messages' %}">Banner Messages</a></li>
         <li><a href="{% url 'myuw_popular_links' %}">Popular Links</a></li>
         <li><a href="{% url 'myuw_manage_notices' %}">MyUW Notices</a></li>
     </ul>