Fix test and type/lint errors

Author: avdata99

ckan/lib/search/index.py

@@ -136,7 +136,7 @@ def index_package(self,
 
         if config.get_value('ckan.search.remove_deleted_packages'):
             # delete the package if there is no state, or the state is `deleted`
-            if (not pkg_dict.get('state') or 'deleted' in pkg_dict.get('state')):
+            if pkg_dict.get('state', 'deleted') == 'deleted':
                 return self.delete_package(pkg_dict)
 
         index_fields = RESERVED_FIELDS + list(pkg_dict.keys())

ckan/tests/cli/test_search_index.py

@@ -91,15 +91,23 @@ def test_deleted_only_visible_for_right_users(self):
         org1 = factories.Organization(user=user1)
         org2 = factories.Organization(user=user2)
         dataset1 = factories.Dataset(
-            user=user1, private=True, owner_org=org1["name"], state="deleted"
+            name="dataset-user-1",
+            user=user1,
+            private=True,
+            owner_org=org1["name"],
+            state="deleted"
         )
         dataset2 = factories.Dataset(
-            user=user2, private=True, owner_org=org2["name"], state="deleted"
+            name="dataset-user-2",
+            user=user2,
+            private=True,
+            owner_org=org2["name"],
+            state="deleted"
         )
 
         search_results_1 = helpers.call_action(
             "package_search",
-            {"user": user1["name"]},
+            {"user": user1["name"], "ignore_auth": False},
             include_private=True,
             include_deleted=True
         )
@@ -109,7 +117,7 @@ def test_deleted_only_visible_for_right_users(self):
 
         search_results_2 = helpers.call_action(
             "package_search",
-            {"user": user2["name"]},
+            {"user": user2["name"], "ignore_auth": False},
             include_private=True,
             include_deleted=True
         )

ckan/views/admin.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, Union, cast
+from typing import Any, Union, cast, List
 
 from flask import Blueprint
 from flask.views import MethodView
@@ -135,7 +135,6 @@ def post(self) -> Union[str, Response]:
 
 
 class TrashView(MethodView):
-    deleted_entities: dict[str, Union[Query[Any], list[Any]]]
 
     def __init__(self):
         self.deleted_packages = self._get_deleted_datasets()
@@ -169,20 +168,22 @@ def __init__(self):
             }
         }
 
-    def _get_deleted_datasets(self):
+    def _get_deleted_datasets(
+        self
+    ) -> Union["Query[model.Package]", List[Any]]:
         if config.get_value('ckan.search.remove_deleted_packages'):
             return self._get_deleted_datasets_from_db()
         else:
             return self._get_deleted_datasets_from_search_index()
 
-    def _get_deleted_datasets_from_db(self):
+    def _get_deleted_datasets_from_db(self) -> "Query[model.Package]":
         return model.Session.query(
             model.Package
         ).filter_by(
             state=model.State.DELETED
         )
 
-    def _get_deleted_datasets_from_search_index(self):
+    def _get_deleted_datasets_from_search_index(self) -> List[Any]:
         query = search.query_for(model.Package)
         search_params = {
             'fq': '+state:deleted',
@@ -231,9 +232,9 @@ def purge_all(self):
         )
 
         for action, deleted_entities in zip(actions, entities):
-            
             for entity in deleted_entities:
-                ent_id = entity.id if hasattr(entity, 'id') else entity['id']
+                ent_id = entity.id if hasattr(entity, 'id') \
+                    else entity['id']  # type: ignore
                 logic.get_action(action)(
                     {u'user': g.user}, {u'id': ent_id}
                 )