From ae30e2962a4891f0a6c09ba2f1eabcff687e5b07 Mon Sep 17 00:00:00 2001
From: Kojo <kojo.bauer@ownsoft.de>
Date: Wed, 2 Jul 2025 15:55:09 +0200
Subject: [PATCH] =?UTF-8?q?Personen=20nicht=20entkn=C3=BCpfen=20bei=20Antr?=
 =?UTF-8?q?agsart=20Gruppenhilfe=20oder=20Projekt=20Antragsart=20=C3=BCber?=
 =?UTF-8?q?=20FoerderMittel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AidA/AidA.csproj                                   |  2 ++
 AidA/Data/Entities/Antrag.cs                       |  2 ++
 AidA/Data/Entities/FoerderMittel.cs                | 12 ++++++++++++
 AidA/Data/Mappings/Antrag.hbm.xml                  |  6 +++---
 AidA/Data/Mappings/FoerderMittel.hbm.xml           | 13 +++++++++++++
 AidA/Service/Anonymization/AnonymizationManager.cs | 11 ++++++++++-
 6 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 AidA/Data/Entities/FoerderMittel.cs
 create mode 100644 AidA/Data/Mappings/FoerderMittel.hbm.xml

diff --git a/AidA/AidA.csproj b/AidA/AidA.csproj
index 94313be..8141a95 100644
--- a/AidA/AidA.csproj
+++ b/AidA/AidA.csproj
@@ -124,6 +124,7 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="Data\Entities\Anonymisierungsausnahme.cs" />
+    <Compile Include="Data\Entities\FoerderMittel.cs" />
     <Compile Include="Data\Entities\Kommunikation.cs" />
     <Compile Include="Data\Entities\Mitarbeiter.cs" />
     <Compile Include="Data\Entities\ZahlungSEPA.cs" />
@@ -237,6 +238,7 @@
     <EmbeddedResource Include="Data\Mappings\Kommunikation.hbm.xml" />
     <EmbeddedResource Include="Data\Mappings\Anonymisierungsausnahme.hbm.xml" />
     <EmbeddedResource Include="Data\Mappings\Mitarbeiter.hbm.xml" />
+    <EmbeddedResource Include="Data\Mappings\FoerderMittel.hbm.xml" />
     <Content Include="hibernate.cfg.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/AidA/Data/Entities/Antrag.cs b/AidA/Data/Entities/Antrag.cs
index 90d73c5..ec34016 100644
--- a/AidA/Data/Entities/Antrag.cs
+++ b/AidA/Data/Entities/Antrag.cs
@@ -22,6 +22,8 @@ namespace AidA.Data.Entities
 
 		public virtual AntragsStatus AntragsStatus { get; set; }
 		public virtual Ansprechpartner Ansprechpartner { get; set; }
+		public virtual FoerderMittel FoerderMittel { get; set; }
+
 		public virtual IList<AntragsPersonenDaten> AntragsPersonenDatenListe { get; set; }
 		public virtual IList<Kommunikation> Kommunikationen { get; set; }
 
diff --git a/AidA/Data/Entities/FoerderMittel.cs b/AidA/Data/Entities/FoerderMittel.cs
new file mode 100644
index 0000000..29ef8fb
--- /dev/null
+++ b/AidA/Data/Entities/FoerderMittel.cs
@@ -0,0 +1,12 @@
+
+namespace AidA.Data.Entities
+{
+	public class FoerderMittel
+    {
+        public virtual long Id { get; set; }
+		public virtual string Name { get; set; }
+		public virtual long Version { get; set; }
+
+		public virtual long? AntragsArtId { get; set; }
+	}
+}
diff --git a/AidA/Data/Mappings/Antrag.hbm.xml b/AidA/Data/Mappings/Antrag.hbm.xml
index 3463167..12806a3 100644
--- a/AidA/Data/Mappings/Antrag.hbm.xml
+++ b/AidA/Data/Mappings/Antrag.hbm.xml
@@ -7,8 +7,8 @@
 		</id>
 		<property name="AntragsNummer" type="Int64" />
 		<property name="Prio" type="Boolean" />
-		<property name="EingangsDatum" type="DateTime2" />
-		<property name="FaelligkeitsDatum" type="DateTime2" />
+		<property name="EingangsDatum" />
+		<property name="FaelligkeitsDatum" />
 		<property name="BewilligungsJahr" type="Int32" />
 		<property name="Wiedervorlage" type="Boolean" />
 		<property name="Bemerkung" type="String" />
@@ -17,10 +17,10 @@
 		<property name="Aktualisiert" type="Boolean" />
 
 		<property name="SachbearbeiterId" type="Int64" />
-		<!-- property name="AnsprechpartnerId" type="Int64" /-->
 
 		<many-to-one name="AntragsStatus" column="AntragsStatusId" class="AidA.Data.Entities.AntragsStatus, AidA" cascade="none" />
 		<many-to-one name="Ansprechpartner" column="AnsprechpartnerId" class="AidA.Data.Entities.Ansprechpartner, AidA" cascade="none" />
+		<many-to-one name="FoerderMittel" column="FoerderMittelId" class="AidA.Data.Entities.FoerderMittel, AidA" cascade="none" />
 		<bag name="AntragsPersonenDatenListe" table="AntragsPersonenDaten" generic="true" cascade="all-delete-orphan" batch-size="250">
 			<key column="AntragsId" />
 			<one-to-many class="AidA.Data.Entities.AntragsPersonenDaten, AidA" />
diff --git a/AidA/Data/Mappings/FoerderMittel.hbm.xml b/AidA/Data/Mappings/FoerderMittel.hbm.xml
new file mode 100644
index 0000000..ef130b9
--- /dev/null
+++ b/AidA/Data/Mappings/FoerderMittel.hbm.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+	<class name="AidA.Data.Entities.FoerderMittel, AidA" table="FoerderMittel">
+		<id name="Id" column="Id" type="Int64" unsaved-value="null">
+			<generator class="identity" />
+		</id>
+		<property name="Name" type="String" />
+		<property name="Version" type="Int64" />
+
+		<property name="AntragsArtId" type="Int64" />
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/AidA/Service/Anonymization/AnonymizationManager.cs b/AidA/Service/Anonymization/AnonymizationManager.cs
index 8b29b2d..e0bc29c 100644
--- a/AidA/Service/Anonymization/AnonymizationManager.cs
+++ b/AidA/Service/Anonymization/AnonymizationManager.cs
@@ -252,10 +252,19 @@ namespace AidA.Service.Anonymization
                         antragsPersonenDaten.Bank = null;
 
                         PersonenIdentitaet personenIdentitaet = antragsPersonenDaten.PersonenIdentitaet;
+
                         bool nochBenoetigt = CheckPersonenIdentitaetNochBenoetigt(personenIdentitaet, antrag);
                         if (nochBenoetigt)
                         {
-                            antragsPersonenDaten.PersonenIdentitaet = anonymisiertePersonenIdentitaeten[antragsPersonenDaten.Id];
+                            if (antrag.FoerderMittel != null &&
+                                (antrag.FoerderMittel.AntragsArtId == 2 || antrag.FoerderMittel.AntragsArtId == 3))
+                            {
+                                // bei Antragsart Gruppenhilfe (2) oder Projekt (3) nicht entknuepfen
+                            }
+                            else
+                            {
+                                antragsPersonenDaten.PersonenIdentitaet = anonymisiertePersonenIdentitaeten[antragsPersonenDaten.Id];
+                            }
                         }
                         else
                         {