From 4ebd6bc4071fe214df720493806bc7d1c782586f Mon Sep 17 00:00:00 2001
From: Elias Fierke <elias.fierke@outlook.com>
Date: Sun, 14 Dec 2025 14:30:53 +0100
Subject: [PATCH] [fix:] fixed some logical errors in address creation

---
 Tasks/AddressCreation.cs | 41 ++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/Tasks/AddressCreation.cs b/Tasks/AddressCreation.cs
index fce98b1..84e6846 100644
--- a/Tasks/AddressCreation.cs
+++ b/Tasks/AddressCreation.cs
@@ -118,21 +118,21 @@ public static class AddressCreator
             address.land.ToLower().Trim() != "" && address.land.ToLower().Trim() != "de" &&
             address.land.ToLower().Trim() != "deutschland")
         {
-            string_address = "**" + address.land.Trim() + "**"; // Needs to be bold
+            string_address = "\n**" + address.land.Trim() + "**"; // Needs to be bold
             address_line_count++;
         }
 
         // Alternative A: pplz valid and city existing
         if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.pplz, address.land))
         {
-            string_address = address.pplz + " " + address.ort + "\n" + string_address;
+            string_address = address.pplz + " " + address.ort + string_address;
             address_line_count++;
             if (!string.IsNullOrWhiteSpace(address.postfach))
             {
                 string_address = address.postfach.Trim() + "\n" + string_address;
                 address_line_count++;
             }
-            else
+            else if (!string.IsNullOrWhiteSpace(address.strasse.Trim()))
             {
                 string_address = address.strasse.Trim() + "\n" + string_address;
                 address_line_count++;
@@ -141,28 +141,33 @@ public static class AddressCreator
             var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname,
                 address.adel, address.name, address.namezus);
 
-            if (string.IsNullOrWhiteSpace(nameline))
+            if (!string.IsNullOrWhiteSpace(nameline))
             {
                 string_address = nameline + string_address;
                 address_line_count++;
             }
 
+            // REIHENFOLGE
             var nameattribs = new[]
                 { address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
 
-            for (var i = 0; i < nameattribs.Length - 1; i++)
-                if (address_line_count < 7)
+            var names = "";
+            for (var i = 0; i < nameattribs.Length; i++)
+                try
                 {
+                    if (address_line_count >= 7) break;
                     if (!string.IsNullOrWhiteSpace(nameattribs[i]))
                     {
-                        string_address += nameattribs[i] + "\n" + string_address;
+                        names += "\n" + nameattribs[i];
                         address_line_count++;
                     }
                 }
-                else
+                catch
                 {
-                    break;
+                    Console.WriteLine("ERROR 15821");
                 }
+
+            string_address = names + "\n" + string_address;
         } // Alternative B: plz valid and city existing 
         else if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.plz, address.land))
         {
@@ -173,7 +178,7 @@ public static class AddressCreator
                 string_address = address.strasse.Trim() + "\n" + string_address;
                 address_line_count++;
             }
-            else
+            else if (!string.IsNullOrWhiteSpace(address.postfach.Trim()))
             {
                 string_address = address.postfach.Trim() + "\n" + string_address;
                 address_line_count++;
@@ -182,7 +187,7 @@ public static class AddressCreator
             var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname,
                 address.adel, address.name, address.namezus);
 
-            if (string.IsNullOrWhiteSpace(nameline))
+            if (!string.IsNullOrWhiteSpace(nameline))
             {
                 string_address = nameline + string_address;
                 address_line_count++;
@@ -191,19 +196,23 @@ public static class AddressCreator
             var nameattribs = new[]
                 { address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
 
-            for (var i = 0; i < nameattribs.Length - 1; i++)
-                if (address_line_count < 7)
+            var names = "";
+            for (var i = 0; i < nameattribs.Length; i++)
+                try
                 {
+                    if (address_line_count >= 7) break;
                     if (!string.IsNullOrWhiteSpace(nameattribs[i]))
                     {
-                        string_address += nameattribs[i] + "\n" + string_address;
+                        names += "\n" + nameattribs[i];
                         address_line_count++;
                     }
                 }
-                else
+                catch
                 {
-                    break;
+                    Console.WriteLine("ERROR 15821");
                 }
+
+            string_address = names + "\n" + string_address;
         } // Error-Handling?
 
         return string_address;