[SIS-xxx] slight adaptions for new donation structure

.env

@@ -1,4 +1,4 @@
 REGISTRY_PREFIX=harbor.sheldan.dev/sissi/
 ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/
-VERSION=1.5.15
+VERSION=1.5.16
 ABSTRACTO_VERSION=1.6.17

application/executable/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>executable</artifactId>

application/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi</groupId>
         <artifactId>sissi</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-customizations/image-generation-custom/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application.module.custom</groupId>
         <artifactId>sissi-customizations</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
 
     <artifactId>image-generation-custom</artifactId>

application/sissi-customizations/moderation-custom/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application.module.custom</groupId>
         <artifactId>sissi-customizations</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-customizations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>application</artifactId>
         <groupId>dev.sheldan.sissi.application</groupId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-modules/debra/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application</groupId>
         <artifactId>sissi-modules</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/api/DebraDonationStatusController.java

@@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.RoundingMode;
 import java.util.List;
 
 @RestController
@@ -50,6 +51,11 @@ public class DebraDonationStatusController {
 
         return CampaignInfo
                 .builder()
+                .donationCount(donationResponse.getDonationCount())
+                .collected(donationResponse.getCurrentDonationAmount())
+                .target(donationResponse.getDonationAmountGoal())
+                .percent(donationResponse.getCurrentDonationAmount().divide(donationResponse.getDonationAmountGoal(), RoundingMode.CEILING))
+                .currency("€")
                 .build();
     }
 }

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/model/api/CampaignInfo.java

@@ -4,17 +4,13 @@ import lombok.Builder;
 import lombok.Getter;
 
 import java.math.BigDecimal;
-import java.math.BigInteger;
 
 @Builder
 @Getter
 public class CampaignInfo {
-    private BigInteger donationCount;
+    private Integer donationCount;
     private BigDecimal collected;
     private BigDecimal target;
     private String currency;
-    private String slug;
-    private String displayName;
-    private BigDecimal collectedNet;
     private BigDecimal percent;
 }

application/sissi-modules/meetup/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application</groupId>
         <artifactId>sissi-modules</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-modules/miepscord/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sissi-modules</artifactId>
         <groupId>dev.sheldan.sissi.application</groupId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-modules/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-modules/quotes/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application</groupId>
         <artifactId>sissi-modules</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-modules/rss-news/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sissi-modules</artifactId>
         <groupId>dev.sheldan.sissi.application</groupId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

deployment/helm/sissi/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 name: sissi
 description: A Helm chart for Kubernetes
 type: application
-version: 1.5.15
+version: 1.5.16

deployment/helm/sissi/values.yaml

@@ -3,7 +3,7 @@ bot:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
   image: sissi-bot
-  tag: 1.5.15
+  tag: 1.5.16
   livenessProbe:
     initialDelaySeconds: 60
     periodSeconds: 5
@@ -23,7 +23,7 @@ restApi:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
   image: sissi-rest-api
-  tag: 1.5.15
+  tag: 1.5.16
   podAnnotations: {}
   podSecurityContext: {}
   securityContext: {}
@@ -63,7 +63,7 @@ privateRestApi:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
   image: sissi-private-rest-api
-  tag: 1.5.15
+  tag: 1.5.16
   podAnnotations: {}
   podSecurityContext: {}
   securityContext: {}
@@ -99,7 +99,7 @@ templateDeploymentData:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
   image: sissi-template-data
-  tag: 1.5.15
+  tag: 1.5.16
 dbConfigDeployment:
   enabled: true
   repository: harbor.sheldan.dev/abstracto
@@ -110,7 +110,7 @@ dbConfigDeploymentData:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
   image: sissi-db-data
-  tag: 1.5.15
+  tag: 1.5.16
 dbCredentials:
   host: null
   port: null

deployment/image-packaging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi</groupId>
         <artifactId>deployment</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

deployment/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi</groupId>
         <artifactId>sissi</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -13,7 +13,7 @@
     <groupId>dev.sheldan.sissi</groupId>
     <artifactId>sissi</artifactId>
     <name>Sissi</name>
-    <version>1.5.16</version>
+    <version>1.5.17-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.target>17</maven.compiler.target>
@@ -73,7 +73,7 @@
         <connection>scm:git:${project.scm.url}</connection>
         <developerConnection>scm:git:${project.scm.url}</developerConnection>
         <url>https://github.com/Sheldan/Sissi.git</url>
-        <tag>sissi-1.5.16</tag>
+        <tag>HEAD</tag>
     </scm>
 
 </project>

python/modules/debra-rest-api/python/endpoints/debra.py

@@ -239,7 +239,7 @@ def rendering_donation_image(donation_stats, parameters):
     height = parameters.font_size
     it = 0
     for donation in donations_to_draw:
-        name = donation['firstName'] if not donation['anonymous'] else 'anonym'
+        name = donation['name'] if not donation['anonymous'] and 'name' in donation else 'anonym'
         d1.text((0, height * it), f"{donation['donationAmount']}€ von {name}", fill=parameters.color, font=font)
         it += 1
     return flask_utils.serve_pil_image(img)

templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi</groupId>
         <artifactId>sissi</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/customization-templates/image-generation-customization-templates/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>customization-templates</artifactId>
         <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
 
     <artifactId>image-generation-customization-templates</artifactId>

templates/sissi-templates/customization-templates/moderation-customization-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>customization-templates</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/customization-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sissi-templates</artifactId>
         <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/module-templates/debra-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>module-templates</artifactId>
         <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/module-templates/meetup-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>module-templates</artifactId>
         <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/module-templates/miepscord-templates/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>module-templates</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
 
     <artifactId>miepscord-templates</artifactId>

templates/sissi-templates/module-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>sissi-templates</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/module-templates/quotes-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>module-templates</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/module-templates/rss-news-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>module-templates</artifactId>
         <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/template-overrides/experience-template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/template-overrides/logging-template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/template-overrides/moderation-template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sissi-templates</artifactId>
         <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/template-overrides/starboard-template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/customization-translations/moderation-customization-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
         <artifactId>customization-translations</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/customization-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sissi-translations</artifactId>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/module-translations/debra-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>module-translations</artifactId>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/module-translations/meetup-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
         <artifactId>module-translations</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/module-translations/miepscord-translations/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
         <artifactId>module-translations</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
 
     <artifactId>miepscord-translations</artifactId>

templates/sissi-translations/module-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
         <artifactId>sissi-translations</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/module-translations/quote-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
         <artifactId>module-translations</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/module-translations/rss-news-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>module-translations</artifactId>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/translation-overrides/experience-translation-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
         <artifactId>translation-overrides</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/translation-overrides/giveaway-translation-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
         <artifactId>translation-overrides</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/translation-overrides/logging-translation-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
         <artifactId>translation-overrides</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/translation-overrides/moderation-translation-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
         <artifactId>translation-overrides</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/translation-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
         <artifactId>sissi-translations</artifactId>
-        <version>1.5.16</version>
+        <version>1.5.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>