- Update test to use correct logic

- Remove auto filtering on datafiles and zap scans

Author: elipe17

tdrs-backend/tdpservice/data_files/admin/admin.py

@@ -146,13 +146,10 @@ def get_queryset(self, request):
         if not (request.user.has_fra_access or request.user.is_an_admin):
             filtered_for_fra = qs.exclude(
                 section__in=DataFile.get_fra_section_list(),
-                user__account_approval_status=AccountApprovalStatusChoices.DEACTIVATED
             )
             return filtered_for_fra
         else:
-            return qs.exclude(
-                user__account_approval_status=AccountApprovalStatusChoices.DEACTIVATED
-            )
+            return qs
 
     def reparse(self, request, queryset):
         """Reparse the selected data files."""

tdrs-backend/tdpservice/security/admin.py

@@ -30,11 +30,6 @@ def file_size_human(self, obj):
         """Return human friendly file size, converted to appropriate unit."""
         return obj.file_size_humanized
 
-    def get_queryset(self, request):
-        """Override to exclude scans uploaded by deactivated users."""
-        qs = super().get_queryset(request)
-        return qs.exclude(uploaded_by__account_approval_status=AccountApprovalStatusChoices.DEACTIVATED)
-
 
 @admin.register(OwaspZapScan)
 class OwaspZapScanAdmin(ReadOnlyAdminMixin, admin.ModelAdmin):
@@ -54,11 +49,6 @@ class OwaspZapScanAdmin(ReadOnlyAdminMixin, admin.ModelAdmin):
         "app_target",
     ]
 
-    def get_queryset(self, request):
-        """Override to exclude scans uploaded by deactivated users."""
-        qs = super().get_queryset(request)
-        return qs.exclude(uploaded_by__account_approval_status=AccountApprovalStatusChoices.DEACTIVATED)
-
 
 @admin.register(SecurityEventToken)
 class SecurityEventTokenAdmin(ReadOnlyAdminMixin, admin.ModelAdmin):

tdrs-backend/tdpservice/users/test/test_models.py

@@ -82,11 +82,15 @@ def test_user_with_fra_access(client, ofa_system_admin):
 
     response = client.get(f"/admin/data_files/datafile/{datafile.id}/change/")
     assert response.status_code == 200
-    assert '<div class="readonly">Fra Work Outcome Tanf Exiters</div>' in response.content.decode('utf-8')
+    assert (
+        '<div class="readonly">Fra Work Outcome Tanf Exiters</div>'
+        in response.content.decode("utf-8")
+    )
+
 
 @pytest.mark.django_db
 def test_user_without_fra_access(client, data_analyst):
-    """Test that a user in data analyst role cannot access ."""
+    """Test that a user in data analyst role with FRA permission cannot access FRA datafiles."""
     data_analyst.is_staff = True
 
     data_analyst.clean()
@@ -100,4 +104,5 @@ def test_user_without_fra_access(client, data_analyst):
     datafile.save()
 
     response = client.get(f"/admin/data_files/datafile/{datafile.id}/change/")
-    assert response.status_code == 200
+    # We get redirected to a blank admin datafiles page
+    assert response.status_code == 302