feat(contract_api): add filter is_available in get_organizations_with_curated_services

contract_api/application/services/service_service.py

@@ -59,25 +59,18 @@ def get_service_filters(self, request: GetServiceFiltersRequest) -> dict[str, li
         return {"values": filters_data}
 
     def get_services(self, request: GetServicesRequest) -> dict[str, list | int]:
-        limit = request.limit
-        page = request.page
-        sort = request.sort
-        order = request.order
-        filters = request.filter
-        q = request.q
-
         services = self._service_repo.get_filtered_services(
-            limit=limit,
-            page=page,
-            sort=sort,
-            order=order,
-            filters=filters,
-            q=q
+            limit=request.limit,
+            page=request.page,
+            sort=request.sort,
+            order=request.order,
+            filters=request.filter,
+            q=request.q
         )
 
         total_count = self._service_repo.get_filtered_services_count(
-            filters=filters,
-            q=q
+            filters=request.filter,
+            q=request.q
         )
 
         return {

contract_api/infrastructure/repositories/organization_repository.py

@@ -5,7 +5,7 @@
 from contract_api.domain.factory.organization_factory import OrganizationFactory
 from contract_api.domain.models.org_group import OrgGroupDomain, NewOrgGroupDomain
 from contract_api.domain.models.organization import OrganizationDomain, NewOrganizationDomain
-from contract_api.infrastructure.models import OrgGroup, Organization, Service
+from contract_api.infrastructure.models import OrgGroup, Organization, Service, ServiceEndpoint
 from contract_api.infrastructure.repositories.base_repository import BaseRepository
 
 
@@ -26,13 +26,16 @@ def get_groups(self, org_id: str, group_id: str = None) -> list[OrgGroupDomain]:
         return OrganizationFactory.org_groups_from_db_model(groups_db)
 
     def get_organizations_with_curated_services(self) -> list[OrganizationDomain]:
-        query = select(
-            Organization
-        ).join(
-            Service, Organization.org_id == Service.org_id
-        ).where(
-            Service.is_curated == True
-        ).distinct()
+        query = (
+            select(Organization)
+            .join(Service, Organization.org_id == Service.org_id)
+            .join(ServiceEndpoint, ServiceEndpoint.service_row_id == Service.row_id)
+            .where(
+                Service.is_curated == True,
+                ServiceEndpoint.is_available == True,
+            )
+            .distinct()
+        )
 
         result = self.session.execute(query)
         organizations_db = result.scalars().all()