fix mypy

src/onegov/org/views/people.py

@@ -50,7 +50,7 @@ def get_items(self) -> list[Person]:
     orgs = (PersonCollection(request.session)
             .unique_organisations())
     sub_orgs = (PersonCollection(request.session)
-                .unique_sub_organisations(selected_org))
+                .unique_sub_organisations(str(selected_org)))
 
     return {
         'title': _("People"),

src/onegov/people/collections/people.py

@@ -2,10 +2,10 @@
 from onegov.core.collection import GenericCollection
 from onegov.people.models import Person
 
-
 from typing import Any
 from typing import TypeVar
 from typing import TYPE_CHECKING
+
 if TYPE_CHECKING:
     from uuid import UUID
 
@@ -19,12 +19,11 @@ def model_class(self) -> type[PersonT]:
         raise NotImplementedError()
 
     def add(  # type:ignore[override]
-        self,
-        first_name: str,
-        last_name: str,
-        **optional: Any
+            self,
+            first_name: str,
+            last_name: str,
+            **optional: Any
     ) -> PersonT:
-
         person = self.model_class(
             first_name=first_name,
             last_name=last_name,
@@ -56,17 +55,19 @@ class PersonCollection(BasePersonCollection[Person]):
     def model_class(self) -> type[Person]:
         return Person
 
-    def unique_organisations(self) -> tuple[str]:
+    def unique_organisations(self) -> tuple[str | None, ...]:
         query = self.session.query(Person.organisation)
         query = query.filter(Person.organisation.isnot(None)).distinct()
         query = query.order_by(Person.organisation)
-        return tuple(p.organisation for p in query if p.organisation != '')
+        return tuple(org[0] for org in query if org[0] != '')
 
-    def unique_sub_organisations(self, of_org=None) -> tuple[str]:
+    def unique_sub_organisations(
+            self,
+            of_org: str | None = None
+    ) -> tuple[str | None, ...]:
         query = self.session.query(Person.sub_organisation)
         if of_org:
             query = query.filter(Person.organisation == of_org)
         query = query.filter(Person.sub_organisation.isnot(None)).distinct()
         query = query.order_by(Person.sub_organisation)
-        return tuple(p.sub_organisation
-                     for p in query if p.sub_organisation != '')
+        return tuple(s_org[0] for s_org in query if s_org[0] != '')