Ogc 508 replace elastic search by postgres v3

src/onegov/search/utils.py

@@ -8,7 +8,6 @@
 from langdetect.utils.lang_profile import LangProfile
 from onegov.core.orm import find_models
 
-
 from typing import Any, Generic, TypeVar, TYPE_CHECKING
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterator, Sequence
@@ -43,7 +42,9 @@ def searchable_sqlalchemy_models(
     )
 
 
-def filter_non_base_models(models: 'set[type[T]]') -> 'set[type[T]]':
+def filter_non_base_models(
+    models: 'set[type[T]]'
+) -> 'set[type[T]]':
     """ Remove model classes that are base classes of other models in the set.
     Args: models: set of model classes to filter
     Returns: set: Model classes that are not base classes of any other model
@@ -55,7 +56,8 @@ def filter_non_base_models(models: 'set[type[T]]') -> 'set[type[T]]':
     for model in models:
         is_base = False
         for other_model in models:
-            if model is not other_model and issubclass(other_model, model):
+            if (model is not other_model and issubclass(other_model, model)
+                    and model.__tablename__ == other_model.__tablename__):  # type:ignore[attr-defined]
                 is_base = True
                 break
 

tests/onegov/search/test_utils.py

@@ -1,6 +1,6 @@
 from onegov.search import ORMSearchable, Searchable
 from onegov.search import utils
-from sqlalchemy import Column, Integer, Text
+from sqlalchemy import Column, Integer, Text, ForeignKey
 from sqlalchemy.ext.declarative import declarative_base
 
 
@@ -29,7 +29,6 @@ class D(Bar, Searchable):
 
 
 def test_get_searchable_sqlalchemy_models_inheritance():
-
     Base = declarative_base()
 
     class Page(Base, Searchable):
@@ -42,11 +41,53 @@ class Topic(Page):
     class News(Page):
         pass
 
+    class B(Base):
+        id = Column(Integer, primary_key=True)
+        __tablename__ = 'b'
+
     assert list(utils.searchable_sqlalchemy_models(Base)) == [
         Page, Topic, News
     ]
 
 
+def test_filter_non_base_models():
+    Base = declarative_base()
+
+    class Page(Base, Searchable):
+        id = Column(Integer, primary_key=True)
+        __tablename__ = 'pages'
+
+    class Topic(Page):
+        pass
+
+    class News(Page):
+        pass
+
+    assert utils.filter_non_base_models({Page, Topic, News}) == {Topic, News}
+
+    class A(Base, Searchable):
+        id = Column(Integer, primary_key=True)
+        __tablename__ = 'a'
+
+    class AA(A):
+        pass
+
+    class B(Base, Searchable):
+        id = Column(Integer, primary_key=True)
+        __tablename__ = 'b'
+
+    class C(Base, Searchable):
+        id = Column(Integer, primary_key=True)
+        __tablename__ = 'c'
+
+    class CC(C):
+        id_2 = Column(Integer, primary_key=True)
+        c_id = Column(Integer, ForeignKey('c.id'))
+        __tablename__ = 'cc'
+
+    assert utils.filter_non_base_models({A, AA, B, C, CC}) == {AA, B, C, CC}
+
+
 def test_related_types():
 
     Base = declarative_base()