From f2fb7fd739fc29a1b8f72507706609ffa4b06119 Mon Sep 17 00:00:00 2001
From: Ida Dittrich <i.dittrich@valueon.ch>
Date: Sat, 14 Feb 2026 17:50:58 +0100
Subject: [PATCH] fix:keine features wurden in app.py registriert

---
 app.py                            | 10 ++++++++++
 config.ini                        | 15 ---------------
 modules/routes/routeRealEstate.py |  8 +-------
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/app.py b/app.py
index 00b0e9f2..fe597989 100644
--- a/app.py
+++ b/app.py
@@ -297,6 +297,16 @@ async def lifespan(app: FastAPI):
     except Exception as e:
         logger.warning(f"Bootstrap check failed (may already be initialized): {str(e)}")
 
+    # Register all feature definitions in RBAC catalog (for /api/features/ endpoint)
+    try:
+        from modules.security.rbacCatalog import getCatalogService
+        from modules.system.registry import registerAllFeaturesInCatalog
+        catalogService = getCatalogService()
+        registerAllFeaturesInCatalog(catalogService)
+        logger.info("Feature catalog registration completed")
+    except Exception as e:
+        logger.error(f"Feature catalog registration failed: {e}")
+
     # Get event user for feature lifecycle (system-level user for background operations)
     rootInterface = getRootInterface()
     eventUser = rootInterface.getUserByUsername("event")
diff --git a/config.ini b/config.ini
index 701b29d0..ccd6b77e 100644
--- a/config.ini
+++ b/config.ini
@@ -36,12 +36,6 @@ Web_Crawl_RETRY_DELAY = 2
 # Web Research configuration
 Web_Research_MAX_DEPTH = 2
 Web_Research_MAX_LINKS_PER_DOMAIN = 4
-<<<<<<< HEAD
-=======
-<<<<<<< Updated upstream
-Web_Research_CRAWL_TIMEOUT_MINUTES = 10
-=======
->>>>>>> feat/chatbot-althaus-integration
 Web_Research_CRAWL_TIMEOUT_MINUTES = 10
 
 # STAC API Connector configuration (Swiss Topo)
@@ -49,13 +43,4 @@ Connector_StacSwisstopo_BASE_URL = https://data.geo.admin.ch/api/stac/v1
 Connector_StacSwisstopo_TIMEOUT = 30
 Connector_StacSwisstopo_MAX_RETRIES = 3
 Connector_StacSwisstopo_RETRY_DELAY = 1.0
-<<<<<<< HEAD
 Connector_StacSwisstopo_ENABLE_CACHE = True
-=======
-Connector_StacSwisstopo_ENABLE_CACHE = True
-
-# Tavily AI Connector configuration (Web Search & Research)
-# Get your API key from https://tavily.com
-# Connector_AiTavily_API_SECRET = your_tavily_api_key_here
->>>>>>> Stashed changes
->>>>>>> feat/chatbot-althaus-integration
diff --git a/modules/routes/routeRealEstate.py b/modules/routes/routeRealEstate.py
index cb1506c1..881a77dc 100644
--- a/modules/routes/routeRealEstate.py
+++ b/modules/routes/routeRealEstate.py
@@ -18,11 +18,6 @@ from fastapi import APIRouter, HTTPException, Depends, Body, Request, Query, Pat
 from modules.auth import limiter, getCurrentUser
 
 # Import models
-<<<<<<< Updated upstream:modules/routes/routeRealEstate.py
-from modules.datamodels.datamodelUam import User
-from modules.datamodels.datamodelPagination import PaginationParams, PaginatedResponse, PaginationMetadata
-from modules.datamodels.datamodelRealEstate import (
-=======
 from modules.datamodels.datamodelPagination import (
     PaginationParams,
     PaginatedResponse,
@@ -31,8 +26,7 @@ from modules.datamodels.datamodelPagination import (
 )
 from modules.interfaces.interfaceDbApp import getRootInterface
 from modules.interfaces.interfaceFeatures import getFeatureInterface
-from .datamodelFeatureRealEstate import (
->>>>>>> Stashed changes:modules/features/realEstate/routeFeatureRealEstate.py
+from modules.features.realEstate.datamodelFeatureRealEstate import (
     Projekt,
     Parzelle,
     Dokument,