Merge branch 'main' of ssh://tsschulz.de:2222/torsten/yourpart3

backend/services/falukantService.js

@@ -147,9 +147,31 @@ async function calcRegionalSellPrice(product, knowledgeFactor, regionId, worthPe
     async function getCumulativeTaxPercentWithExemptions(userId, regionId) {
         if (!regionId) return 0;
         // fetch user's political offices (active) and their region types
+        // PoliticalOffice hat keine userId Spalte, daher müssen wir über FalukantCharacter filtern
         const offices = await PoliticalOffice.findAll({
+            include: [
+                {
+                    model: FalukantCharacter,
+                    as: 'holder',
                     where: { userId },
-            include: [{ model: PoliticalOfficeType, as: 'type', attributes: ['name'] }, { model: RegionData, as: 'region', include: [{ model: RegionType, as: 'regionType', attributes: ['labelTr'] }] }]
+                    required: true,
+                    attributes: []
+                },
+                {
+                    model: PoliticalOfficeType,
+                    as: 'type',
+                    attributes: ['name']
+                },
+                {
+                    model: RegionData,
+                    as: 'region',
+                    include: [{
+                        model: RegionType,
+                        as: 'regionType',
+                        attributes: ['labelTr']
+                    }]
+                }
+            ]
         });
 
         // build set of exempt region type labels from user's offices