Add region relationship to ChurchOffice model: Establish associations between ChurchOffice and RegionData, allowing for better organization of church offices by region. Enhance logging in getChurchOverview method for improved debugging and error handling.

backend/models/associations.js

@@ -913,6 +913,16 @@ export default function setupAssociations() {
     as: 'supervisor'
   });
 
+  // Region relationship
+  ChurchOffice.belongsTo(RegionData, {
+    foreignKey: 'regionId',
+    as: 'region'
+  });
+  RegionData.hasMany(ChurchOffice, {
+    foreignKey: 'regionId',
+    as: 'churchOffices'
+  });
+
   // Applications for church office
   ChurchApplication.belongsTo(ChurchOfficeType, {
     foreignKey: 'officeTypeId',

backend/services/falukantService.js

@@ -4825,17 +4825,20 @@ class FalukantService extends BaseService {
     }
 
     async getChurchOverview(hashedUserId) {
+        try {
             const user = await getFalukantUserOrFail(hashedUserId);
             const character = await FalukantCharacter.findOne({
                 where: { userId: user.id },
                 attributes: ['id', 'regionId']
             });
             if (!character) {
+                console.log('[getChurchOverview] No character found for user', user.id);
                 return [];
             }
 
             // Alle relevanten Regionen (Region + Eltern) laden
             const relevantRegionIds = await this.getRegionAndParentIds(character.regionId);
+            console.log('[getChurchOverview] Relevant region IDs:', relevantRegionIds);
 
             // Aktuell besetzte Kirchenämter in diesen Regionen laden
             const offices = await ChurchOffice.findAll({
@@ -4859,21 +4862,25 @@ class FalukantService extends BaseService {
                     model: FalukantCharacter,
                     as: 'holder',
                     attributes: ['id', 'gender'],
+                    required: false,
                     include: [
                         {
                             model: FalukantPredefineFirstname,
                             as: 'definedFirstName',
-                            attributes: ['name']
+                            attributes: ['name'],
+                            required: false
                         },
                         {
                             model: FalukantPredefineLastname,
                             as: 'definedLastName',
-                            attributes: ['name']
+                            attributes: ['name'],
+                            required: false
                         },
                         {
                             model: TitleOfNobility,
                             as: 'nobleTitle',
-                            attributes: ['labelTr']
+                            attributes: ['labelTr'],
+                            required: false
                         }
                     ]
                 },
@@ -4881,20 +4888,22 @@ class FalukantService extends BaseService {
                     model: FalukantCharacter,
                     as: 'supervisor',
                     attributes: ['id', 'gender'],
+                    required: false,
                     include: [
                         {
                             model: FalukantPredefineFirstname,
                             as: 'definedFirstName',
-                            attributes: ['name']
+                            attributes: ['name'],
+                            required: false
                         },
                         {
                             model: FalukantPredefineLastname,
                             as: 'definedLastName',
-                            attributes: ['name']
+                            attributes: ['name'],
-                        }
-                    ],
                             required: false
                         }
+                    ]
+                }
             ],
             order: [
                 [{ model: ChurchOfficeType, as: 'type' }, 'hierarchyLevel', 'DESC'],
@@ -4902,6 +4911,7 @@ class FalukantService extends BaseService {
             ]
         });
 
+            console.log('[getChurchOverview] Found', offices.length, 'offices');
             return offices.map(office => {
                 const o = office.get({ plain: true });
                 return {
@@ -4928,6 +4938,11 @@ class FalukantService extends BaseService {
                         : null
                 };
             });
+        } catch (error) {
+            console.error('[getChurchOverview] Error:', error);
+            console.error('[getChurchOverview] Stack:', error.stack);
+            throw error;
+        }
     }
 
     async getAvailableChurchPositions(hashedUserId) {