From 48fd80e3d9c92e3e478b74bd1d1183edab2409f2 Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Tue, 24 Dec 2024 22:04:24 +0100
Subject: [PATCH 01/27] Add run configurations for services and update JRE
 version

Added IDE run configurations for various services including Admin-Service, Authentication-Service, Chess-Service, and others with development profiles. Updated JRE version from OpenJDK 21 to OpenJDK 23 for test configurations. This setup ensures consistent and efficient local development.
---
 .run/All Project Tests.run.xml          |  2 +-
 .run/All UT.run.xml                     |  2 +-
 .run/Dev Admin-Service.run.xml          | 21 +++++++++++++++++++++
 .run/Dev Authentication-Service.run.xml | 21 +++++++++++++++++++++
 .run/Dev Chess-Service.run.xml          | 21 +++++++++++++++++++++
 .run/Dev Fitness-Service.run.xml        | 21 +++++++++++++++++++++
 .run/Dev Gateway-Service.run.xml        | 21 +++++++++++++++++++++
 .run/Dev Music-Service.run.xml          | 21 +++++++++++++++++++++
 .run/Dev Registry-Service.run.xml       | 21 +++++++++++++++++++++
 .run/Dev Usermanagement-Service.run.xml | 21 +++++++++++++++++++++
 .run/Dev Website-Service.run.xml        | 21 +++++++++++++++++++++
 .run/Website start.run.xml              | 12 ++++++++++++
 12 files changed, 203 insertions(+), 2 deletions(-)
 create mode 100644 .run/Dev Admin-Service.run.xml
 create mode 100644 .run/Dev Authentication-Service.run.xml
 create mode 100644 .run/Dev Chess-Service.run.xml
 create mode 100644 .run/Dev Fitness-Service.run.xml
 create mode 100644 .run/Dev Gateway-Service.run.xml
 create mode 100644 .run/Dev Music-Service.run.xml
 create mode 100644 .run/Dev Registry-Service.run.xml
 create mode 100644 .run/Dev Usermanagement-Service.run.xml
 create mode 100644 .run/Dev Website-Service.run.xml
 create mode 100644 .run/Website start.run.xml

diff --git a/.run/All Project Tests.run.xml b/.run/All Project Tests.run.xml
index b71ac559..68c1998c 100644
--- a/.run/All Project Tests.run.xml	
+++ b/.run/All Project Tests.run.xml	
@@ -11,7 +11,7 @@
       </ENTRIES>
     </extension>
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="openjdk-21" />
+    <option name="ALTERNATIVE_JRE_PATH" value="openjdk-23" />
     <option name="PACKAGE_NAME" value="com.michibaum" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
diff --git a/.run/All UT.run.xml b/.run/All UT.run.xml
index bb4574c4..53a92cd2 100644
--- a/.run/All UT.run.xml	
+++ b/.run/All UT.run.xml	
@@ -11,7 +11,7 @@
       </ENTRIES>
     </extension>
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="openjdk-21" />
+    <option name="ALTERNATIVE_JRE_PATH" value="openjdk-23" />
     <option name="PACKAGE_NAME" value="com.michibaum" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
diff --git a/.run/Dev Admin-Service.run.xml b/.run/Dev Admin-Service.run.xml
new file mode 100644
index 00000000..f740e302
--- /dev/null
+++ b/.run/Dev Admin-Service.run.xml	
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Dev Admin-Service" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="dev" />
+    <module name="admin-service" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.michibaum.admin_service.AdminServiceApplication" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="true" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+        <ENTRY IS_ENABLED="true" PARSER="env" IS_EXECUTABLE="false" PATH=".local-env" />
+      </ENTRIES>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Dev Authentication-Service.run.xml b/.run/Dev Authentication-Service.run.xml
new file mode 100644
index 00000000..473b6f7e
--- /dev/null
+++ b/.run/Dev Authentication-Service.run.xml	
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Dev Authentication-Service" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="dev" />
+    <module name="authentication-service" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.michibaum.authentication_service.AuthenticationServiceApplication" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="true" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+        <ENTRY IS_ENABLED="true" PARSER="env" IS_EXECUTABLE="false" PATH=".local-env" />
+      </ENTRIES>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Dev Chess-Service.run.xml b/.run/Dev Chess-Service.run.xml
new file mode 100644
index 00000000..d31857b8
--- /dev/null
+++ b/.run/Dev Chess-Service.run.xml	
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Dev Chess-Service" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="dev" />
+    <module name="chess-service" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.michibaum.chess_service.ChessServiceApplication" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="true" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+        <ENTRY IS_ENABLED="true" PARSER="env" IS_EXECUTABLE="false" PATH=".local-env" />
+      </ENTRIES>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Dev Fitness-Service.run.xml b/.run/Dev Fitness-Service.run.xml
new file mode 100644
index 00000000..04a36585
--- /dev/null
+++ b/.run/Dev Fitness-Service.run.xml	
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Dev Fitness-Service" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="dev" />
+    <module name="fitness-service" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.michibaum.fitness_service.FitnessServiceApplication" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="true" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+        <ENTRY IS_ENABLED="true" PARSER="env" IS_EXECUTABLE="false" PATH=".local-env" />
+      </ENTRIES>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Dev Gateway-Service.run.xml b/.run/Dev Gateway-Service.run.xml
new file mode 100644
index 00000000..8f509878
--- /dev/null
+++ b/.run/Dev Gateway-Service.run.xml	
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Dev Gateway-Service" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="dev" />
+    <module name="gateway-service" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.michibaum.gatewayservice.GatewayServiceApplication" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="true" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+        <ENTRY IS_ENABLED="true" PARSER="env" IS_EXECUTABLE="false" PATH=".local-env" />
+      </ENTRIES>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Dev Music-Service.run.xml b/.run/Dev Music-Service.run.xml
new file mode 100644
index 00000000..7f4d271a
--- /dev/null
+++ b/.run/Dev Music-Service.run.xml	
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Dev Music-Service" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="dev" />
+    <module name="music-service" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.michibaum.music_service.MusicServiceApplication" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="true" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+        <ENTRY IS_ENABLED="true" PARSER="env" IS_EXECUTABLE="false" PATH=".local-env" />
+      </ENTRIES>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Dev Registry-Service.run.xml b/.run/Dev Registry-Service.run.xml
new file mode 100644
index 00000000..b951666b
--- /dev/null
+++ b/.run/Dev Registry-Service.run.xml	
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Dev Registry-Service" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="dev" />
+    <module name="registry-service" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.michibaum.registry_service.RegistryServiceApplication" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="true" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+        <ENTRY IS_ENABLED="true" PARSER="env" IS_EXECUTABLE="false" PATH=".local-env" />
+      </ENTRIES>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Dev Usermanagement-Service.run.xml b/.run/Dev Usermanagement-Service.run.xml
new file mode 100644
index 00000000..8ebcce47
--- /dev/null
+++ b/.run/Dev Usermanagement-Service.run.xml	
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Dev Usermanagement-Service" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="dev" />
+    <module name="usermanagement-service" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.michibaum.usermanagement_service.UsermanagementServiceApplication" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="true" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+        <ENTRY IS_ENABLED="true" PARSER="env" IS_EXECUTABLE="false" PATH=".local-env" />
+      </ENTRIES>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Dev Website-Service.run.xml b/.run/Dev Website-Service.run.xml
new file mode 100644
index 00000000..6f6999a4
--- /dev/null
+++ b/.run/Dev Website-Service.run.xml	
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Dev Website-Service" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="dev" />
+    <module name="website-service" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.michibaum.websiteservice.WebsiteServiceApplication" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="true" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+        <ENTRY IS_ENABLED="true" PARSER="env" IS_EXECUTABLE="false" PATH=".local-env" />
+      </ENTRIES>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Website start.run.xml b/.run/Website start.run.xml
new file mode 100644
index 00000000..d830a8bb
--- /dev/null
+++ b/.run/Website start.run.xml	
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Website start" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/website/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="start" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file

From 40098e5f3ef9691473f9addeb76ac1e3827e5150 Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Tue, 24 Dec 2024 22:52:37 +0100
Subject: [PATCH 02/27] Add Writerside documentation and update diagram
 structure

This commit introduces new Writerside documentation files for various services, deployment, and system overview. It also updates the `Diagram.drawio` file to reflect recent service changes and connections for better clarity.
---
 .github/workflows/labeler.yml                 |  2 +-
 docs/Diagram.drawio                           | 66 +++++++++----------
 docs/Writerside/c.list                        |  6 ++
 docs/Writerside/cfg/buildprofiles.xml         | 16 +++++
 docs/Writerside/redirection-rules.xml         | 13 ++++
 docs/Writerside/s.tree                        | 31 +++++++++
 .../topics/2024-12-24_Documentation.md        |  2 +
 docs/Writerside/topics/Actions.md             | 19 ++++++
 docs/Writerside/topics/Admin-Service.md       |  3 +
 .../topics/Authentication-Service.md          |  3 +
 docs/Writerside/topics/Chess-Service.md       |  3 +
 docs/Writerside/topics/Database.md            |  5 ++
 docs/Writerside/topics/Decisions.md           |  3 +
 docs/Writerside/topics/Fitness-Service.md     |  3 +
 docs/Writerside/topics/Gateway-Service.md     |  3 +
 docs/Writerside/topics/Github.md              |  2 +
 docs/Writerside/topics/Music-Service.md       |  3 +
 docs/Writerside/topics/New-Deployment.md      |  3 +
 docs/Writerside/topics/Overview.md            |  4 ++
 docs/Writerside/topics/Registry-Service.md    |  3 +
 docs/Writerside/topics/Server.md              | 23 +++++++
 docs/Writerside/topics/Services.md            |  3 +
 .../topics/Usermanagement-Service.md          |  3 +
 docs/Writerside/topics/Website-Service.md     |  3 +
 docs/Writerside/v.list                        |  5 ++
 docs/Writerside/writerside.cfg                |  8 +++
 26 files changed, 204 insertions(+), 34 deletions(-)
 create mode 100644 docs/Writerside/c.list
 create mode 100644 docs/Writerside/cfg/buildprofiles.xml
 create mode 100644 docs/Writerside/redirection-rules.xml
 create mode 100644 docs/Writerside/s.tree
 create mode 100644 docs/Writerside/topics/2024-12-24_Documentation.md
 create mode 100644 docs/Writerside/topics/Actions.md
 create mode 100644 docs/Writerside/topics/Admin-Service.md
 create mode 100644 docs/Writerside/topics/Authentication-Service.md
 create mode 100644 docs/Writerside/topics/Chess-Service.md
 create mode 100644 docs/Writerside/topics/Database.md
 create mode 100644 docs/Writerside/topics/Decisions.md
 create mode 100644 docs/Writerside/topics/Fitness-Service.md
 create mode 100644 docs/Writerside/topics/Gateway-Service.md
 create mode 100644 docs/Writerside/topics/Github.md
 create mode 100644 docs/Writerside/topics/Music-Service.md
 create mode 100644 docs/Writerside/topics/New-Deployment.md
 create mode 100644 docs/Writerside/topics/Overview.md
 create mode 100644 docs/Writerside/topics/Registry-Service.md
 create mode 100644 docs/Writerside/topics/Server.md
 create mode 100644 docs/Writerside/topics/Services.md
 create mode 100644 docs/Writerside/topics/Usermanagement-Service.md
 create mode 100644 docs/Writerside/topics/Website-Service.md
 create mode 100644 docs/Writerside/v.list
 create mode 100644 docs/Writerside/writerside.cfg

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index efc6447a..9d1d5c9f 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -1,4 +1,4 @@
-name: "Pull Request Labeler"
+name: Pull Request Labeler
 on:
   pull_request:
 
diff --git a/docs/Diagram.drawio b/docs/Diagram.drawio
index 6daea306..b72041eb 100644
--- a/docs/Diagram.drawio
+++ b/docs/Diagram.drawio
@@ -1,28 +1,28 @@
-<mxfile host="Electron" modified="2024-10-14T09:20:34.865Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/22.1.2 Chrome/114.0.5735.289 Electron/25.9.4 Safari/537.36" etag="IVMVU3Wp12MX_ISiy7tN" version="22.1.2" type="device">
+<mxfile host="Electron" modified="2024-12-24T21:08:07.551Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/22.1.2 Chrome/114.0.5735.289 Electron/25.9.4 Safari/537.36" etag="zCYo2XbaiGChGJtvKHYp" version="22.1.2" type="device">
   <diagram id="OQ9CddM-hfgQPHA02e66" name="Page-1">
-    <mxGraphModel dx="2593" dy="1555" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="1430" dy="858" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
         <mxCell id="i-3n_3hnF3vpz_gC9HeC-10" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="480" y="1000" width="760" height="800" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="i-3n_3hnF3vpz_gC9HeC-12" target="i-3n_3hnF3vpz_gC9HeC-15">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="i-3n_3hnF3vpz_gC9HeC-12" target="i-3n_3hnF3vpz_gC9HeC-15" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="i-3n_3hnF3vpz_gC9HeC-12" target="ggzMXdQBt39MKLWsmpQi-1">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="i-3n_3hnF3vpz_gC9HeC-12" target="ggzMXdQBt39MKLWsmpQi-1" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="i-3n_3hnF3vpz_gC9HeC-12" target="i-3n_3hnF3vpz_gC9HeC-16">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="i-3n_3hnF3vpz_gC9HeC-12" target="i-3n_3hnF3vpz_gC9HeC-16" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="i-3n_3hnF3vpz_gC9HeC-12" target="i-3n_3hnF3vpz_gC9HeC-14">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="i-3n_3hnF3vpz_gC9HeC-12" target="i-3n_3hnF3vpz_gC9HeC-14" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-36" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="i-3n_3hnF3vpz_gC9HeC-12" target="ggzMXdQBt39MKLWsmpQi-30">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-36" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="i-3n_3hnF3vpz_gC9HeC-12" target="ggzMXdQBt39MKLWsmpQi-30" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-37" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="i-3n_3hnF3vpz_gC9HeC-12" target="ggzMXdQBt39MKLWsmpQi-33">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-37" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="i-3n_3hnF3vpz_gC9HeC-12" target="ggzMXdQBt39MKLWsmpQi-33" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="790" y="1375" />
@@ -33,7 +33,7 @@
         <mxCell id="i-3n_3hnF3vpz_gC9HeC-12" value="gateway-service" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="600" y="1200" width="120" height="350" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="i-3n_3hnF3vpz_gC9HeC-14" target="ggzMXdQBt39MKLWsmpQi-23">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="i-3n_3hnF3vpz_gC9HeC-14" target="ggzMXdQBt39MKLWsmpQi-23" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="i-3n_3hnF3vpz_gC9HeC-14" value="usermanagement-service" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
@@ -42,7 +42,7 @@
         <mxCell id="i-3n_3hnF3vpz_gC9HeC-15" value="javadoc-service" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="860" y="1190" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-24" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="i-3n_3hnF3vpz_gC9HeC-16" target="ggzMXdQBt39MKLWsmpQi-22">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-24" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="i-3n_3hnF3vpz_gC9HeC-16" target="ggzMXdQBt39MKLWsmpQi-22" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="i-3n_3hnF3vpz_gC9HeC-16" value="chess-service" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
@@ -54,22 +54,22 @@
         <mxCell id="i-3n_3hnF3vpz_gC9HeC-17" value="User" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
           <mxGeometry x="384" y="1345" width="30" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-1" value="website-service" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-1" value="website-service" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="860" y="1265" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-3" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-3" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="480" y="100" width="760" height="830" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-4" value="registry-service" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-4" value="registry-service" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="600" y="180" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="ggzMXdQBt39MKLWsmpQi-6" target="ggzMXdQBt39MKLWsmpQi-7">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ggzMXdQBt39MKLWsmpQi-6" target="ggzMXdQBt39MKLWsmpQi-7" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="ggzMXdQBt39MKLWsmpQi-6" target="ggzMXdQBt39MKLWsmpQi-4">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ggzMXdQBt39MKLWsmpQi-6" target="ggzMXdQBt39MKLWsmpQi-4" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-16" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="ggzMXdQBt39MKLWsmpQi-6" target="ggzMXdQBt39MKLWsmpQi-13">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-16" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ggzMXdQBt39MKLWsmpQi-6" target="ggzMXdQBt39MKLWsmpQi-13" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="660" y="270" />
@@ -77,55 +77,55 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-6" value="gateway-service" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-6" value="gateway-service" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="600" y="300" width="120" height="350" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-14" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="ggzMXdQBt39MKLWsmpQi-7" target="ggzMXdQBt39MKLWsmpQi-8">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-14" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ggzMXdQBt39MKLWsmpQi-7" target="ggzMXdQBt39MKLWsmpQi-8" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-7" value="authentication-service" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-7" value="authentication-service" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="600" y="750" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-28" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="ggzMXdQBt39MKLWsmpQi-8" target="ggzMXdQBt39MKLWsmpQi-26">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-28" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ggzMXdQBt39MKLWsmpQi-8" target="ggzMXdQBt39MKLWsmpQi-26" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-8" value="usermanagement-service" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-8" value="usermanagement-service" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="760" y="750" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="ggzMXdQBt39MKLWsmpQi-13" target="ggzMXdQBt39MKLWsmpQi-4">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ggzMXdQBt39MKLWsmpQi-13" target="ggzMXdQBt39MKLWsmpQi-4" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-13" value="admin-service" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-13" value="admin-service" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="770" y="180" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-22" value="chess-db" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" vertex="1" parent="1">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-22" value="chess-db" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
           <mxGeometry x="1030" y="1342.5" width="120" height="65" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-23" value="usermanagement-db" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" vertex="1" parent="1">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-23" value="usermanagement-db" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
           <mxGeometry x="1030" y="1420" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-26" value="usermanagement-db" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" vertex="1" parent="1">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-26" value="usermanagement-db" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
           <mxGeometry x="920" y="750" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-29" value="authentication-db" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" vertex="1" parent="1">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-29" value="authentication-db" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
           <mxGeometry x="600" y="840" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-32" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="ggzMXdQBt39MKLWsmpQi-30" target="ggzMXdQBt39MKLWsmpQi-31">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-32" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ggzMXdQBt39MKLWsmpQi-30" target="ggzMXdQBt39MKLWsmpQi-31" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-30" value="self-profile-service" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-30" value="self-profile-service" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="860" y="1500" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-31" value="self-profile-db" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" vertex="1" parent="1">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-31" value="self-profile-db" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
           <mxGeometry x="1030" y="1500" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-35" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="ggzMXdQBt39MKLWsmpQi-33" target="ggzMXdQBt39MKLWsmpQi-34">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-35" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ggzMXdQBt39MKLWsmpQi-33" target="ggzMXdQBt39MKLWsmpQi-34" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-33" value="library-service" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-33" value="library-service" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="860" y="1580" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="ggzMXdQBt39MKLWsmpQi-34" value="library-db" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" vertex="1" parent="1">
+        <mxCell id="ggzMXdQBt39MKLWsmpQi-34" value="library-db" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
           <mxGeometry x="1030" y="1580" width="120" height="60" as="geometry" />
         </mxCell>
       </root>
diff --git a/docs/Writerside/c.list b/docs/Writerside/c.list
new file mode 100644
index 00000000..c4c77a29
--- /dev/null
+++ b/docs/Writerside/c.list
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE categories
+        SYSTEM "https://resources.jetbrains.com/writerside/1.0/categories.dtd">
+<categories>
+    <category id="wrs" name="Writerside documentation" order="1"/>
+</categories>
\ No newline at end of file
diff --git a/docs/Writerside/cfg/buildprofiles.xml b/docs/Writerside/cfg/buildprofiles.xml
new file mode 100644
index 00000000..d720bd1c
--- /dev/null
+++ b/docs/Writerside/cfg/buildprofiles.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE buildprofiles SYSTEM "https://resources.jetbrains.com/writerside/1.0/build-profiles.dtd">
+<buildprofiles xsi:noNamespaceSchemaLocation="https://resources.jetbrains.com/writerside/1.0/build-profiles.xsd"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <variables>
+
+    </variables>
+
+    <build-profile instance="s">
+        <variables>
+            <noindex-content>true</noindex-content>
+        </variables>
+    </build-profile>
+
+</buildprofiles>
diff --git a/docs/Writerside/redirection-rules.xml b/docs/Writerside/redirection-rules.xml
new file mode 100644
index 00000000..68271534
--- /dev/null
+++ b/docs/Writerside/redirection-rules.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE rules SYSTEM "https://resources.jetbrains.com/writerside/1.0/redirection-rules.dtd">
+<rules>
+    <!-- format is as follows
+    <rule id="<unique id>">
+        <accepts>page.html</accepts>
+    </rule>
+    -->
+    <rule id="6e5c2ff8">
+        <description>Created after removal of "About Services" from Microservices Docs</description>
+        <accepts>starter-topic.html</accepts>
+    </rule>
+</rules>
\ No newline at end of file
diff --git a/docs/Writerside/s.tree b/docs/Writerside/s.tree
new file mode 100644
index 00000000..970452d2
--- /dev/null
+++ b/docs/Writerside/s.tree
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE instance-profile
+        SYSTEM "https://resources.jetbrains.com/writerside/1.0/product-profile.dtd">
+
+<instance-profile id="s"
+                 name="Microservices Docs"
+                 start-page="Overview.md">
+
+    <toc-element topic="Overview.md"/>
+    <toc-element topic="Github.md">
+        <toc-element topic="Actions.md"/>
+    </toc-element>
+    <toc-element topic="Server.md">
+        <toc-element topic="New-Deployment.md"/>
+    </toc-element>
+    <toc-element topic="Database.md"/>
+    <toc-element topic="Services.md">
+        <toc-element topic="Website-Service.md"/>
+        <toc-element topic="Usermanagement-Service.md"/>
+        <toc-element topic="Registry-Service.md"/>
+        <toc-element topic="Music-Service.md"/>
+        <toc-element topic="Gateway-Service.md"/>
+        <toc-element topic="Fitness-Service.md"/>
+        <toc-element topic="Chess-Service.md"/>
+        <toc-element topic="Authentication-Service.md"/>
+        <toc-element topic="Admin-Service.md"/>
+    </toc-element>
+    <toc-element topic="Decisions.md">
+        <toc-element topic="2024-12-24_Documentation.md"/>
+    </toc-element>
+</instance-profile>
\ No newline at end of file
diff --git a/docs/Writerside/topics/2024-12-24_Documentation.md b/docs/Writerside/topics/2024-12-24_Documentation.md
new file mode 100644
index 00000000..febfd7b9
--- /dev/null
+++ b/docs/Writerside/topics/2024-12-24_Documentation.md
@@ -0,0 +1,2 @@
+# 2024-12-24 Documentation
+
diff --git a/docs/Writerside/topics/Actions.md b/docs/Writerside/topics/Actions.md
new file mode 100644
index 00000000..8ab82c04
--- /dev/null
+++ b/docs/Writerside/topics/Actions.md
@@ -0,0 +1,19 @@
+# Actions
+
+There are multiple Github actions under ``/.github/workflows``.
+
+
+## contributors.yml (Update contributors in README.md)
+Responsible to update contributors in Readme.md.
+
+## deploy.yml (Build and Publish)
+Responsible to build and publish new docker images.
+
+## labeler.yml (Pull Request Labeler)
+Responsible to label pull requests with what has changed.
+
+## osv-scanner.yml (OSV-Scanner PR Scan)
+Google OSV scanner is responsible to find dependencies that are vulnerable.
+
+## sonarqube.yml (SonarQube Analysis)
+Responsible to do a static code analysis.
\ No newline at end of file
diff --git a/docs/Writerside/topics/Admin-Service.md b/docs/Writerside/topics/Admin-Service.md
new file mode 100644
index 00000000..14e7e8f2
--- /dev/null
+++ b/docs/Writerside/topics/Admin-Service.md
@@ -0,0 +1,3 @@
+# Admin Service
+
+Start typing here...
\ No newline at end of file
diff --git a/docs/Writerside/topics/Authentication-Service.md b/docs/Writerside/topics/Authentication-Service.md
new file mode 100644
index 00000000..3f6c87a0
--- /dev/null
+++ b/docs/Writerside/topics/Authentication-Service.md
@@ -0,0 +1,3 @@
+# Authentication Service
+
+Start typing here...
\ No newline at end of file
diff --git a/docs/Writerside/topics/Chess-Service.md b/docs/Writerside/topics/Chess-Service.md
new file mode 100644
index 00000000..9e7eeecb
--- /dev/null
+++ b/docs/Writerside/topics/Chess-Service.md
@@ -0,0 +1,3 @@
+# Chess Service
+
+Start typing here...
\ No newline at end of file
diff --git a/docs/Writerside/topics/Database.md b/docs/Writerside/topics/Database.md
new file mode 100644
index 00000000..2f42ce7b
--- /dev/null
+++ b/docs/Writerside/topics/Database.md
@@ -0,0 +1,5 @@
+# Database
+
+
+
+## Backup
\ No newline at end of file
diff --git a/docs/Writerside/topics/Decisions.md b/docs/Writerside/topics/Decisions.md
new file mode 100644
index 00000000..c31cedad
--- /dev/null
+++ b/docs/Writerside/topics/Decisions.md
@@ -0,0 +1,3 @@
+# Decisions
+
+Start typing here...
\ No newline at end of file
diff --git a/docs/Writerside/topics/Fitness-Service.md b/docs/Writerside/topics/Fitness-Service.md
new file mode 100644
index 00000000..aa2bc38c
--- /dev/null
+++ b/docs/Writerside/topics/Fitness-Service.md
@@ -0,0 +1,3 @@
+# Fitness Service
+
+Start typing here...
\ No newline at end of file
diff --git a/docs/Writerside/topics/Gateway-Service.md b/docs/Writerside/topics/Gateway-Service.md
new file mode 100644
index 00000000..0ec72ce2
--- /dev/null
+++ b/docs/Writerside/topics/Gateway-Service.md
@@ -0,0 +1,3 @@
+# Gateway Service
+
+Start typing here...
\ No newline at end of file
diff --git a/docs/Writerside/topics/Github.md b/docs/Writerside/topics/Github.md
new file mode 100644
index 00000000..618a75a6
--- /dev/null
+++ b/docs/Writerside/topics/Github.md
@@ -0,0 +1,2 @@
+# Github
+
diff --git a/docs/Writerside/topics/Music-Service.md b/docs/Writerside/topics/Music-Service.md
new file mode 100644
index 00000000..d2dfbd1d
--- /dev/null
+++ b/docs/Writerside/topics/Music-Service.md
@@ -0,0 +1,3 @@
+# Music Service
+
+Start typing here...
\ No newline at end of file
diff --git a/docs/Writerside/topics/New-Deployment.md b/docs/Writerside/topics/New-Deployment.md
new file mode 100644
index 00000000..916c1398
--- /dev/null
+++ b/docs/Writerside/topics/New-Deployment.md
@@ -0,0 +1,3 @@
+# New Deployment
+
+Every new Deployment is first startet with a pull request and merge into the master branch. This triggers multiple Github actions. One ot these is Build and Publish.
\ No newline at end of file
diff --git a/docs/Writerside/topics/Overview.md b/docs/Writerside/topics/Overview.md
new file mode 100644
index 00000000..0681a933
--- /dev/null
+++ b/docs/Writerside/topics/Overview.md
@@ -0,0 +1,4 @@
+# Overview
+
+This project is my [website](https://michibaum.ch) build with Spring and Angular. 
+
diff --git a/docs/Writerside/topics/Registry-Service.md b/docs/Writerside/topics/Registry-Service.md
new file mode 100644
index 00000000..fdda8e8a
--- /dev/null
+++ b/docs/Writerside/topics/Registry-Service.md
@@ -0,0 +1,3 @@
+# Registry Service
+
+Start typing here...
\ No newline at end of file
diff --git a/docs/Writerside/topics/Server.md b/docs/Writerside/topics/Server.md
new file mode 100644
index 00000000..1854dc45
--- /dev/null
+++ b/docs/Writerside/topics/Server.md
@@ -0,0 +1,23 @@
+# Server
+
+Server is running Ubuntu and structured the following way:
+
+- [Paths](#paths)
+- [Running](#running)
+- [Backup](#backup)
+
+
+## Paths
+The [git Project](https://github.com/MichiBaum/Microservices) is checked out under ``/git/Microservices``.  
+Data is saved under ``/data``. For example every database volume has a folder like ``/data/chess-db``. [Sql backups](#backup) are saved in ``/data/db-backup``.  
+Ssl certificates are saved in ``/data/ssl``
+
+
+## Running
+Every service is running in docker. You can find them in docker-compose.yml.
+
+
+# Backup
+The Server is backed up by the host provider.
+The Database container have a volume bound so every restart contains the data.
+Every Day at 02:00 the databases are backed up like described [here](Database.md#backup).
\ No newline at end of file
diff --git a/docs/Writerside/topics/Services.md b/docs/Writerside/topics/Services.md
new file mode 100644
index 00000000..1becdc1b
--- /dev/null
+++ b/docs/Writerside/topics/Services.md
@@ -0,0 +1,3 @@
+# Services
+
+Start typing here...
\ No newline at end of file
diff --git a/docs/Writerside/topics/Usermanagement-Service.md b/docs/Writerside/topics/Usermanagement-Service.md
new file mode 100644
index 00000000..8c45d356
--- /dev/null
+++ b/docs/Writerside/topics/Usermanagement-Service.md
@@ -0,0 +1,3 @@
+# Usermanagement Service
+
+Start typing here...
\ No newline at end of file
diff --git a/docs/Writerside/topics/Website-Service.md b/docs/Writerside/topics/Website-Service.md
new file mode 100644
index 00000000..5d0d8be0
--- /dev/null
+++ b/docs/Writerside/topics/Website-Service.md
@@ -0,0 +1,3 @@
+# Website Service
+
+Start typing here...
\ No newline at end of file
diff --git a/docs/Writerside/v.list b/docs/Writerside/v.list
new file mode 100644
index 00000000..2d12cb39
--- /dev/null
+++ b/docs/Writerside/v.list
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE vars SYSTEM "https://resources.jetbrains.com/writerside/1.0/vars.dtd">
+<vars>
+    <var name="product" value="Writerside"/>
+</vars>
diff --git a/docs/Writerside/writerside.cfg b/docs/Writerside/writerside.cfg
new file mode 100644
index 00000000..d390a5e2
--- /dev/null
+++ b/docs/Writerside/writerside.cfg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE ihp SYSTEM "https://resources.jetbrains.com/writerside/1.0/ihp.dtd">
+
+<ihp version="2.0">
+    <topics dir="topics" web-path="topics"/>
+    <images dir="images" web-path="images"/>
+    <instance src="s.tree"/>
+</ihp>
\ No newline at end of file

From 6bac9d8a307b46d2e2465a7c1371eac2dbbe9e5f Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Tue, 24 Dec 2024 23:13:09 +0100
Subject: [PATCH 03/27] Add new documentation topics and improve structure

Introduced new topics: Development and Liquibase, with details on setup and usage. Enhanced existing content in New Deployment and Database with links for better navigation. Updated the table of contents to reflect these changes and added a placeholder for publishing documentation instructions.
---
 docs/Writerside/s.tree                    |  5 +++-
 docs/Writerside/topics/Actions.md         |  5 +++-
 docs/Writerside/topics/Database.md        |  3 +++
 docs/Writerside/topics/Development.md     | 32 +++++++++++++++++++++++
 docs/Writerside/topics/Liquibase.md       |  3 +++
 docs/Writerside/topics/New-Deployment.md  |  2 +-
 docs/Writerside/topics/Website-Service.md |  1 -
 7 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 docs/Writerside/topics/Development.md
 create mode 100644 docs/Writerside/topics/Liquibase.md

diff --git a/docs/Writerside/s.tree b/docs/Writerside/s.tree
index 970452d2..17c12ef5 100644
--- a/docs/Writerside/s.tree
+++ b/docs/Writerside/s.tree
@@ -7,13 +7,16 @@
                  start-page="Overview.md">
 
     <toc-element topic="Overview.md"/>
+    <toc-element topic="Development.md"/>
     <toc-element topic="Github.md">
         <toc-element topic="Actions.md"/>
     </toc-element>
     <toc-element topic="Server.md">
         <toc-element topic="New-Deployment.md"/>
     </toc-element>
-    <toc-element topic="Database.md"/>
+    <toc-element topic="Database.md">
+        <toc-element topic="Liquibase.md"/>
+    </toc-element>
     <toc-element topic="Services.md">
         <toc-element topic="Website-Service.md"/>
         <toc-element topic="Usermanagement-Service.md"/>
diff --git a/docs/Writerside/topics/Actions.md b/docs/Writerside/topics/Actions.md
index 8ab82c04..4d95ac2b 100644
--- a/docs/Writerside/topics/Actions.md
+++ b/docs/Writerside/topics/Actions.md
@@ -16,4 +16,7 @@ Responsible to label pull requests with what has changed.
 Google OSV scanner is responsible to find dependencies that are vulnerable.
 
 ## sonarqube.yml (SonarQube Analysis)
-Responsible to do a static code analysis.
\ No newline at end of file
+Responsible to do a static code analysis.
+
+## publish-documentation.yml
+TODO https://www.jetbrains.com/help/writerside/deploy-docs-to-github-pages.html
\ No newline at end of file
diff --git a/docs/Writerside/topics/Database.md b/docs/Writerside/topics/Database.md
index 2f42ce7b..fa3a9bd3 100644
--- a/docs/Writerside/topics/Database.md
+++ b/docs/Writerside/topics/Database.md
@@ -1,5 +1,8 @@
 # Database
 
 
+## Updates
+To update database's table, columns or anything [liquibase](Liquibase.md) is used.
+
 
 ## Backup
\ No newline at end of file
diff --git a/docs/Writerside/topics/Development.md b/docs/Writerside/topics/Development.md
new file mode 100644
index 00000000..9a0970e7
--- /dev/null
+++ b/docs/Writerside/topics/Development.md
@@ -0,0 +1,32 @@
+# Development
+
+Requirements:
+- Java 23 installed
+- Npm installed (lts is best)
+- [Update hosts file]()
+
+
+
+## Update hosts file
+*Remember to take Backup before editing your `hosts` file, mistakes there can block your internet access or cause other network-related issues.*
+
+
+### Windows
+You need Administrator access to update hosts.  
+In ``C:\Windows\System32\drivers\etc`` find file *hosts* and add those lines:
+
+```
+# Microservices
+127.0.0.1 chess.michibaum.ch
+127.0.0.1 gateway.michibaum.ch
+127.0.0.1 registry.michibaum.ch
+127.0.0.1 admin.michibaum.ch
+127.0.0.1 usermanagement.michibaum.ch
+127.0.0.1 authentication.michibaum.ch
+127.0.0.1 fitness.michibaum.ch
+127.0.0.1 music.michibaum.ch
+127.0.0.1 michibaum.ch
+```
+
+### Linux
+In Linux the file is located under ``/etc/hosts``.
diff --git a/docs/Writerside/topics/Liquibase.md b/docs/Writerside/topics/Liquibase.md
new file mode 100644
index 00000000..d0192a34
--- /dev/null
+++ b/docs/Writerside/topics/Liquibase.md
@@ -0,0 +1,3 @@
+# Liquibase
+
+Every Service that uses a Database has [liquibase](https://www.liquibase.com/).
\ No newline at end of file
diff --git a/docs/Writerside/topics/New-Deployment.md b/docs/Writerside/topics/New-Deployment.md
index 916c1398..29fd6e6a 100644
--- a/docs/Writerside/topics/New-Deployment.md
+++ b/docs/Writerside/topics/New-Deployment.md
@@ -1,3 +1,3 @@
 # New Deployment
 
-Every new Deployment is first startet with a pull request and merge into the master branch. This triggers multiple Github actions. One ot these is Build and Publish.
\ No newline at end of file
+Every new Deployment is first startet with a pull request and merge into the master branch. This triggers multiple Github actions. One ot these is [Build and Publish](Actions.md#deploy-yml-build-and-publish).
\ No newline at end of file
diff --git a/docs/Writerside/topics/Website-Service.md b/docs/Writerside/topics/Website-Service.md
index 5d0d8be0..ae4e96ae 100644
--- a/docs/Writerside/topics/Website-Service.md
+++ b/docs/Writerside/topics/Website-Service.md
@@ -1,3 +1,2 @@
 # Website Service
 
-Start typing here...
\ No newline at end of file

From 80fa264b642b8a76e8c4ca801947746aabdc9d65 Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Wed, 25 Dec 2024 20:35:15 +0100
Subject: [PATCH 04/27] Update Writerside docs with deployment steps and
 libraries

Expanded the documentation to include detailed deployment steps, SSL management, and automated database backups. Added sections for new libraries and reorganized the structure for better clarity. Updated build profiles and linked relevant topics to improve usability.
---
 docs/Writerside/cfg/buildprofiles.xml         |  2 +-
 docs/Writerside/s.tree                        |  9 ++--
 .../topics/2024-12-24_Documentation.md        | 22 +++++++++
 docs/Writerside/topics/Database.md            | 28 ++++++++++-
 docs/Writerside/topics/Development.md         |  2 +-
 docs/Writerside/topics/Libraries.md           |  3 ++
 docs/Writerside/topics/New-Deployment.md      | 49 ++++++++++++++++++-
 .../topics/spring-boot-starter-discord.md     |  3 ++
 docs/Writerside/topics/ssl.md                 | 21 ++++++++
 9 files changed, 131 insertions(+), 8 deletions(-)
 create mode 100644 docs/Writerside/topics/Libraries.md
 create mode 100644 docs/Writerside/topics/spring-boot-starter-discord.md
 create mode 100644 docs/Writerside/topics/ssl.md

diff --git a/docs/Writerside/cfg/buildprofiles.xml b/docs/Writerside/cfg/buildprofiles.xml
index d720bd1c..881f4b6a 100644
--- a/docs/Writerside/cfg/buildprofiles.xml
+++ b/docs/Writerside/cfg/buildprofiles.xml
@@ -9,7 +9,7 @@
 
     <build-profile instance="s">
         <variables>
-            <noindex-content>true</noindex-content>
+            <noindex-content>false</noindex-content>
         </variables>
     </build-profile>
 
diff --git a/docs/Writerside/s.tree b/docs/Writerside/s.tree
index 17c12ef5..b11e28d1 100644
--- a/docs/Writerside/s.tree
+++ b/docs/Writerside/s.tree
@@ -2,10 +2,7 @@
 <!DOCTYPE instance-profile
         SYSTEM "https://resources.jetbrains.com/writerside/1.0/product-profile.dtd">
 
-<instance-profile id="s"
-                 name="Microservices Docs"
-                 start-page="Overview.md">
-
+<instance-profile id="s" name="Microservices Docs" start-page="Overview.md">
     <toc-element topic="Overview.md"/>
     <toc-element topic="Development.md"/>
     <toc-element topic="Github.md">
@@ -13,6 +10,7 @@
     </toc-element>
     <toc-element topic="Server.md">
         <toc-element topic="New-Deployment.md"/>
+        <toc-element topic="ssl.md"/>
     </toc-element>
     <toc-element topic="Database.md">
         <toc-element topic="Liquibase.md"/>
@@ -28,6 +26,9 @@
         <toc-element topic="Authentication-Service.md"/>
         <toc-element topic="Admin-Service.md"/>
     </toc-element>
+    <toc-element topic="Libraries.md">
+        <toc-element topic="spring-boot-starter-discord.md"/>
+    </toc-element>
     <toc-element topic="Decisions.md">
         <toc-element topic="2024-12-24_Documentation.md"/>
     </toc-element>
diff --git a/docs/Writerside/topics/2024-12-24_Documentation.md b/docs/Writerside/topics/2024-12-24_Documentation.md
index febfd7b9..78284fe5 100644
--- a/docs/Writerside/topics/2024-12-24_Documentation.md
+++ b/docs/Writerside/topics/2024-12-24_Documentation.md
@@ -1,2 +1,24 @@
 # 2024-12-24 Documentation
 
+Should documentation be written in a JetBrains Writerside project or in loosely Markdowns spread through the whole project?
+
+## Pros Writerside
+- Structural and visual help from Writerside
+- Can be exported to html to github page
+- All documentation in one place
+
+
+## Cons Writerside
+- Needs Writerside Idea or IntelliJ with Writerside plugin
+
+
+## Pros loose Markdowns
+- No need for a Idea or IntelliJ plugin
+
+
+## Cons loose Markdowns
+- There are all over the place (root Readme, Readme in services, Readme under docs)
+
+
+## Decision
+The decision is made to move all documentation (markdowns, local files on Computer etc.) into a Writerside project under docs.
\ No newline at end of file
diff --git a/docs/Writerside/topics/Database.md b/docs/Writerside/topics/Database.md
index fa3a9bd3..af98601b 100644
--- a/docs/Writerside/topics/Database.md
+++ b/docs/Writerside/topics/Database.md
@@ -5,4 +5,30 @@
 To update database's table, columns or anything [liquibase](Liquibase.md) is used.
 
 
-## Backup
\ No newline at end of file
+## Backup
+A backup of a database can be done with this command:
+
+```Bash
+# Replace service, database and root password. Root password can be found in .env
+docker exec microservices-chess-db-1 mysqldump -u root -pROOTPASSWORD chess | gzip -c > /data/db-backup/chess_$(date -d "today" +"%Y-%m-%d_%H-%M").sql.gz
+```
+
+## Automatic backup
+The backup described [above](#backup) is executed every day at 02:00 for all databases with a cronjob.  
+The date variable ``$(date ...)`` needs a change when run as cronjob. YOu need to escape ``%`` like ``\%``
+
+```Bash
+# Show all jobs (crontab -l)
+root@35591:/ crontab -l
+...
+# Everyday at 02:00 do a sqldump of Microservices docker databases
+0 2 * * * docker exec microservices-chess-db-1 mysqldump -u root -pROOTPASSWORD chess | gzip -c > /data/db-backup/chess_$(date -d "today" +"\%Y-\%m-\%d_\%H-\%M").sql.gz
+0 2 * * * docker exec microservices-music-db-1 mysqldump -u root -pROOTPASSWORD music | gzip -c > /data/db-backup/music_$(date -d "today" +"\%Y-\%m-\%d_\%H-\%M").sql.gz
+0 2 * * * docker exec microservices-fitness-db-1 mysqldump -u root -pROOTPASSWORD fitness | gzip -c > /data/db-backup/fitness_$(date -d "today" +"\%Y-\%m-\%d_\%H-\%M").sql.gz
+0 2 * * * docker exec microservices-usermanagement-db-1 mysqldump -u root -pROOTPASSWORD usermanagement | gzip -c > /data/db-backup/usermanagement_$(date -d "today" +"\%Y-\%m-\%d_\%H-\%M").sql.gz
+0 2 * * * docker exec microservices-authentication-db-1 mysqldump -u root -pROOTPASSWORD authentication | gzip -c > /data/db-backup/authentication_$(date -d "today" +"\%Y-\%m-\%d_\%H-\%M").sql.gz
+
+# edit jobs
+crontab -e
+
+```
\ No newline at end of file
diff --git a/docs/Writerside/topics/Development.md b/docs/Writerside/topics/Development.md
index 9a0970e7..cbd3a25b 100644
--- a/docs/Writerside/topics/Development.md
+++ b/docs/Writerside/topics/Development.md
@@ -3,7 +3,7 @@
 Requirements:
 - Java 23 installed
 - Npm installed (lts is best)
-- [Update hosts file]()
+- [Update hosts file](#update-hosts-file)
 
 
 
diff --git a/docs/Writerside/topics/Libraries.md b/docs/Writerside/topics/Libraries.md
new file mode 100644
index 00000000..959a1bb2
--- /dev/null
+++ b/docs/Writerside/topics/Libraries.md
@@ -0,0 +1,3 @@
+# Libraries
+
+Start typing here...
\ No newline at end of file
diff --git a/docs/Writerside/topics/New-Deployment.md b/docs/Writerside/topics/New-Deployment.md
index 29fd6e6a..f3527aeb 100644
--- a/docs/Writerside/topics/New-Deployment.md
+++ b/docs/Writerside/topics/New-Deployment.md
@@ -1,3 +1,50 @@
 # New Deployment
 
-Every new Deployment is first startet with a pull request and merge into the master branch. This triggers multiple Github actions. One ot these is [Build and Publish](Actions.md#deploy-yml-build-and-publish).
\ No newline at end of file
+Every new Deployment is first starts with a pull request and merge into the master branch. This triggers multiple Github actions. 
+One of these is [Build and Publish](Actions.md#deploy-yml-build-and-publish).
+This action creates new docker images and uploads them to [Docker Hub](https://hub.docker.com/u/70131370).
+
+## Step 1
+Make a database backup. This is described [here](Database.md#backup).
+
+## Step 2
+Shut down docker containers. Either the ones affected by the changes or you can shut down all:
+
+```bash
+# Shut down two specific
+docker compose down website-service chess-service
+
+# Shut down all
+docker compose down
+```
+
+## Step 3
+Pull master changes
+
+```bash
+# Fetch changes
+git fetch
+
+# Pull changes
+git pull
+```
+
+## Step 4
+Remove unused Images. These Images are the ones from the containers which we shut down.  
+This step is only needed if the versions of the docker images have not changed.
+
+```bash
+docker image prune -a
+```
+
+## Step 5
+Start new Containers with new Images
+
+```bash
+# Start specific containers
+docker compose up -d website-service chess-service
+
+# Start all containers
+docker compose up -d
+
+```
\ No newline at end of file
diff --git a/docs/Writerside/topics/spring-boot-starter-discord.md b/docs/Writerside/topics/spring-boot-starter-discord.md
new file mode 100644
index 00000000..3aedba1d
--- /dev/null
+++ b/docs/Writerside/topics/spring-boot-starter-discord.md
@@ -0,0 +1,3 @@
+# spring-boot-starter-discord
+
+Start typing here...
\ No newline at end of file
diff --git a/docs/Writerside/topics/ssl.md b/docs/Writerside/topics/ssl.md
new file mode 100644
index 00000000..bb6afce1
--- /dev/null
+++ b/docs/Writerside/topics/ssl.md
@@ -0,0 +1,21 @@
+# SSL
+
+An SSL certificate is needed for https. Currently only for the Domain https://michibaum.ch  
+This SSL certificate is created with letsencrypt and certbot.
+
+## Create certificates
+Because of wildcard certificate you need to verify ownership of the Domain. This is done with adding a TXT record to the DNS entry.
+
+```Bash
+certbot certonly --manual --preferred-challenges=dns --email michael_baumberger@gmx.ch --server https://acme-v02.api.letsencrypt.org/directory --agree-tos -d michibaum.ch -d *.michibaum.ch
+```
+
+## Locations of certificates
+The certificates are exported to ``/etc/letsencrypt``
+
+
+## Create pkcs12
+
+```Bash
+openssl pkcs12 -export -in fullchain.pem -inkey privkey.pem -out keystore.p12 -name michibaum -CAfile chain.pem -caname root
+```

From a91109c27d19d5300d4d5f2f5e03170c35d4ce2d Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Wed, 25 Dec 2024 22:56:29 +0100
Subject: [PATCH 05/27] Update documentation structure

Replaced Liquibase with Flyway in the docs and updated related references. Added new structured documentation for various topics, including Docker, Maven, and libraries. Streamlined outdated content in README and reorganized table of contents for better navigation.
---
 README.md                                     | 124 +-----------------
 docs/Writerside/redirection-rules.xml         |   5 +-
 docs/Writerside/s.tree                        |  14 +-
 docs/Writerside/topics/Database.md            |   2 +-
 docs/Writerside/topics/Development.md         |  19 +++
 docs/Writerside/topics/Docker.md              |  23 ++++
 docs/Writerside/topics/Flyway.md              |   3 +
 docs/Writerside/topics/Liquibase.md           |   3 -
 docs/Writerside/topics/Maven.md               |   8 ++
 docs/Writerside/topics/Overview.md            |   3 +-
 docs/Writerside/topics/Project-structure.md   |   8 ++
 .../topics/Usermanagement-library.md          |   2 +
 docs/Writerside/topics/Website.md             |   3 +
 .../topics/authentication-library.md          |   2 +
 docs/Writerside/topics/env.md                 |   5 +
 docs/Writerside/topics/permission-library.md  |   3 +
 .../topics/spring-boot-starter-discord.md     |   1 -
 17 files changed, 92 insertions(+), 136 deletions(-)
 create mode 100644 docs/Writerside/topics/Docker.md
 create mode 100644 docs/Writerside/topics/Flyway.md
 delete mode 100644 docs/Writerside/topics/Liquibase.md
 create mode 100644 docs/Writerside/topics/Maven.md
 create mode 100644 docs/Writerside/topics/Project-structure.md
 create mode 100644 docs/Writerside/topics/Usermanagement-library.md
 create mode 100644 docs/Writerside/topics/Website.md
 create mode 100644 docs/Writerside/topics/authentication-library.md
 create mode 100644 docs/Writerside/topics/env.md
 create mode 100644 docs/Writerside/topics/permission-library.md

diff --git a/README.md b/README.md
index 380308c9..2cb86883 100644
--- a/README.md
+++ b/README.md
@@ -47,130 +47,8 @@ And these databases:
 - Chess DB
 - Fitness DB
 
-## Actions
 
-### Labeler
-
-There is a github action, witch sets automatic labels on Pull requests.
-
-### OSV Scanner
-
-This scanner scans the dependencies and creates a vulnerability report.
-
-## Maven
-
-### Release plugin
-
-The Maven Release Plugin automates the process of releasing project versions by updating version numbers and creating
-tags in the version control system. Use the command `mvn release:update-versions` to update the version information in
-your project's `pom.xml` files.
-
-## Docker
-
-### Container
-
-#### Up
-
-```
-docker compose up -d
-```
-
-#### Down
-
-```
-docker compose down
-```
-
-#### Logs
-
-```
-# Follow
-docker compose logs -f
-
-# Single container 
-docker compose logs ´name´
-```
-
-#### Stats
-
-```
-docker stats
-```
-
-### Docker database backup
-
-Replace 'PASSWORD' with password defined in .env.  
-Replace path '/data/db-backup' if different location is needed.
-```
-# Save sql file
-docker exec microservices-chess-db-1 mysqldump -u root -pPASSWORD chess > someFilename.sql
-
-# Save gzip
-docker exec microservices-chess-db-1 mysqldump -u root -pPASSWORD chess | gzip -c > /data/db-backup/chess_$(date -d "today" +"%Y-%m-%d_%H-%M").sql.gz
-
-# All databases, replace password and save path
-docker exec microservices-chess-db-1 mysqldump -u root -pPASSWORD chess | gzip -c > /data/db-backup/chess_$(date -d "today" +"%Y-%m-%d_%H-%M").sql.gz
-docker exec microservices-music-db-1 mysqldump -u root -pPASSWORD music | gzip -c > /data/db-backup/music_$(date -d "today" +"%Y-%m-%d_%H-%M").sql.gz
-docker exec microservices-fitness-db-1 mysqldump -u root -pPASSWORD fitness | gzip -c > /data/db-backup/fitness_$(date -d "today" +"%Y-%m-%d_%H-%M").sql.gz
-docker exec microservices-usermanagement-db-1 mysqldump -u root -pPASSWORD usermanagement | gzip -c > /data/db-backup/usermanagement_$(date -d "today" +"%Y-%m-%d_%H-%M").sql.gz
-docker exec microservices-authentication-db-1 mysqldump -u root -pPASSWORD authentication | gzip -c > /data/db-backup/authentication_$(date -d "today" +"%Y-%m-%d_%H-%M").sql.gz
-
-# Add to crontab (escape % with \%)
-crontab -e
-
-# List cronjobs
-crontab -l
-```
-
-### Change HOSTS file (for dev on local machine)
-*Remember to take Backup before editing your `hosts` file, mistakes there can block your internet access or cause other network-related issues.*
-
-
-#### Windows
-
-In *C:\Windows\System32\drivers\etc* find file *hosts* and add those lines:
-
-```
-# Microservices
-127.0.0.1 chess.michibaum.ch
-127.0.0.1 gateway.michibaum.ch
-127.0.0.1 registry.michibaum.ch
-127.0.0.1 admin.michibaum.ch
-127.0.0.1 usermanagement.michibaum.ch
-127.0.0.1 authentication.michibaum.ch
-127.0.0.1 fitness.michibaum.ch
-127.0.0.1 music.michibaum.ch
-127.0.0.1 michibaum.ch
-```
-
-#### Linux
-
-File: */etc/hosts*
-
-
-### Scan docker files
-
-```
-docker scan YourDockerHubUsername/DockerHubRepository:TagName --dependency-tree
-```
-
-## Local dev db
-
-```
-docker run --name microservices -e MARIADB_ROOT_PASSWORD=someRootPass -p 3306:3306 -d mariadb:10.11
-```
-
-After that create the databases in the container.
-
-```
-create schema `authentication-db`;
-create schema `chess-db`;
-create schema `fitness-db`;
-create schema `music-db`;
-create schema `usermanagement-db`;
-```
-
-The tables are created trough [flyway](https://documentation.red-gate.com/fd/migrations-184127470.html).
+All docs can be found [/docs/Writerside/topics](/docs/Writerside/topics/Overview.md)
 
 
 ## License
diff --git a/docs/Writerside/redirection-rules.xml b/docs/Writerside/redirection-rules.xml
index 68271534..5f22575a 100644
--- a/docs/Writerside/redirection-rules.xml
+++ b/docs/Writerside/redirection-rules.xml
@@ -6,8 +6,5 @@
         <accepts>page.html</accepts>
     </rule>
     -->
-    <rule id="6e5c2ff8">
-        <description>Created after removal of "About Services" from Microservices Docs</description>
-        <accepts>starter-topic.html</accepts>
-    </rule>
+
 </rules>
\ No newline at end of file
diff --git a/docs/Writerside/s.tree b/docs/Writerside/s.tree
index b11e28d1..39e9838a 100644
--- a/docs/Writerside/s.tree
+++ b/docs/Writerside/s.tree
@@ -4,7 +4,9 @@
 
 <instance-profile id="s" name="Microservices Docs" start-page="Overview.md">
     <toc-element topic="Overview.md"/>
-    <toc-element topic="Development.md"/>
+    <toc-element topic="Development.md">
+        <toc-element topic="Project-structure.md"/>
+    </toc-element>
     <toc-element topic="Github.md">
         <toc-element topic="Actions.md"/>
     </toc-element>
@@ -13,7 +15,7 @@
         <toc-element topic="ssl.md"/>
     </toc-element>
     <toc-element topic="Database.md">
-        <toc-element topic="Liquibase.md"/>
+        <toc-element topic="Flyway.md"/>
     </toc-element>
     <toc-element topic="Services.md">
         <toc-element topic="Website-Service.md"/>
@@ -27,8 +29,16 @@
         <toc-element topic="Admin-Service.md"/>
     </toc-element>
     <toc-element topic="Libraries.md">
+        <toc-element topic="Usermanagement-library.md"/>
+        <toc-element topic="permission-library.md"/>
+        <toc-element topic="authentication-library.md"/>
         <toc-element topic="spring-boot-starter-discord.md"/>
     </toc-element>
+    <toc-element topic="Website.md"/>
+    <toc-element topic="Docker.md">
+        <toc-element topic="env.md"/>
+    </toc-element>
+    <toc-element topic="Maven.md"/>
     <toc-element topic="Decisions.md">
         <toc-element topic="2024-12-24_Documentation.md"/>
     </toc-element>
diff --git a/docs/Writerside/topics/Database.md b/docs/Writerside/topics/Database.md
index af98601b..16be3c1e 100644
--- a/docs/Writerside/topics/Database.md
+++ b/docs/Writerside/topics/Database.md
@@ -2,7 +2,7 @@
 
 
 ## Updates
-To update database's table, columns or anything [liquibase](Liquibase.md) is used.
+To update database's table, columns or anything [Flyway](Flyway.md) is used.
 
 
 ## Backup
diff --git a/docs/Writerside/topics/Development.md b/docs/Writerside/topics/Development.md
index cbd3a25b..2aa4c379 100644
--- a/docs/Writerside/topics/Development.md
+++ b/docs/Writerside/topics/Development.md
@@ -4,6 +4,7 @@ Requirements:
 - Java 23 installed
 - Npm installed (lts is best)
 - [Update hosts file](#update-hosts-file)
+- Local dev database
 
 
 
@@ -30,3 +31,21 @@ In ``C:\Windows\System32\drivers\etc`` find file *hosts* and add those lines:
 
 ### Linux
 In Linux the file is located under ``/etc/hosts``.
+
+## Local dev db
+Create a local dev db with:
+```Bash
+docker run --name microservices -e MARIADB_ROOT_PASSWORD=someRootPass -p 3306:3306 -d mariadb:10.11
+```
+
+After that create the databases in the container.
+
+```Bash
+create schema `authentication-db`;
+create schema `chess-db`;
+create schema `fitness-db`;
+create schema `music-db`;
+create schema `usermanagement-db`;
+```
+
+The tables are created trough [flyway](Flyway.md).
\ No newline at end of file
diff --git a/docs/Writerside/topics/Docker.md b/docs/Writerside/topics/Docker.md
new file mode 100644
index 00000000..8a651cb4
--- /dev/null
+++ b/docs/Writerside/topics/Docker.md
@@ -0,0 +1,23 @@
+# Docker
+
+Many things about docker and deployment are already written in [New Deployment](New-Deployment.md).
+
+## Logs
+To see the logs of the deployment you can use following:
+
+```Bash
+# Follow all logs from all services
+docker compose logs -f
+
+# Follow logs from one service
+docker compose logs -f chess-service
+```
+If you dont want to follow the logs just remove ``-f``.
+
+
+## Stats
+To see the resource stats of the containers execute following:
+
+```Bash
+docker stats
+```
\ No newline at end of file
diff --git a/docs/Writerside/topics/Flyway.md b/docs/Writerside/topics/Flyway.md
new file mode 100644
index 00000000..95339fe2
--- /dev/null
+++ b/docs/Writerside/topics/Flyway.md
@@ -0,0 +1,3 @@
+# Flyway
+
+https://documentation.red-gate.com/fd/migrations-184127470.html
\ No newline at end of file
diff --git a/docs/Writerside/topics/Liquibase.md b/docs/Writerside/topics/Liquibase.md
deleted file mode 100644
index d0192a34..00000000
--- a/docs/Writerside/topics/Liquibase.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Liquibase
-
-Every Service that uses a Database has [liquibase](https://www.liquibase.com/).
\ No newline at end of file
diff --git a/docs/Writerside/topics/Maven.md b/docs/Writerside/topics/Maven.md
new file mode 100644
index 00000000..28c66de1
--- /dev/null
+++ b/docs/Writerside/topics/Maven.md
@@ -0,0 +1,8 @@
+# Maven
+
+Maven is used in this project. Every service should have a .mvn and a ``mvnw``/``mvnw.cmd``.  
+
+## Update version
+The Maven Release Plugin automates the process of releasing project versions by updating version numbers and creating
+tags in the version control system. Use the command `mvn release:update-versions` to update the version information in
+your project's `pom.xml` files.
\ No newline at end of file
diff --git a/docs/Writerside/topics/Overview.md b/docs/Writerside/topics/Overview.md
index 0681a933..d9f45e8e 100644
--- a/docs/Writerside/topics/Overview.md
+++ b/docs/Writerside/topics/Overview.md
@@ -1,4 +1,3 @@
 # Overview
 
-This project is my [website](https://michibaum.ch) build with Spring and Angular. 
-
+This project is my [website](https://michibaum.ch) build with Kotlin, Spring, Docker and Angular. 
diff --git a/docs/Writerside/topics/Project-structure.md b/docs/Writerside/topics/Project-structure.md
new file mode 100644
index 00000000..1b9d7efe
--- /dev/null
+++ b/docs/Writerside/topics/Project-structure.md
@@ -0,0 +1,8 @@
+# Project structure
+
+The Project is structured in the following way:
+- Every Service that runs is a Maven module named ``*-service``
+- Every Library without spring boot starter is named ``*-library``
+- Every Library that is a spring boot starter is named ``spring-boot-starter-*``
+- Run configs for IntelliJ are located under ``.run``. Everyone that opens this project in IntelliJ should get them imported automatically.
+- Docs are located under ``docs``
\ No newline at end of file
diff --git a/docs/Writerside/topics/Usermanagement-library.md b/docs/Writerside/topics/Usermanagement-library.md
new file mode 100644
index 00000000..481fbdcc
--- /dev/null
+++ b/docs/Writerside/topics/Usermanagement-library.md
@@ -0,0 +1,2 @@
+# Usermanagement library
+
diff --git a/docs/Writerside/topics/Website.md b/docs/Writerside/topics/Website.md
new file mode 100644
index 00000000..ce036a2a
--- /dev/null
+++ b/docs/Writerside/topics/Website.md
@@ -0,0 +1,3 @@
+# Website
+
+Website is the frontend for the services. It is written in Angular and when build the files are in a static directory in the [website-service](Website-Service.md) who serves them.
\ No newline at end of file
diff --git a/docs/Writerside/topics/authentication-library.md b/docs/Writerside/topics/authentication-library.md
new file mode 100644
index 00000000..daedc7a5
--- /dev/null
+++ b/docs/Writerside/topics/authentication-library.md
@@ -0,0 +1,2 @@
+# Authentication library
+
diff --git a/docs/Writerside/topics/env.md b/docs/Writerside/topics/env.md
new file mode 100644
index 00000000..4c293fc2
--- /dev/null
+++ b/docs/Writerside/topics/env.md
@@ -0,0 +1,5 @@
+# env
+
+The Services running in docker need environment variables. These variables are mostly secrets.
+The variables are in in the .env files and are given to the containers. To know what variables have to be set there is a env-template file with all variables and placeholder values.
+For local development you sometimes also need secrets. Create a .local-env file in the root directory (it is git ignored) and add it to the run config as env file.
diff --git a/docs/Writerside/topics/permission-library.md b/docs/Writerside/topics/permission-library.md
new file mode 100644
index 00000000..3db68985
--- /dev/null
+++ b/docs/Writerside/topics/permission-library.md
@@ -0,0 +1,3 @@
+# Permission library
+
+This library only contains the Permissions enum. In a next refactoring this should be moved to the authentication library.
\ No newline at end of file
diff --git a/docs/Writerside/topics/spring-boot-starter-discord.md b/docs/Writerside/topics/spring-boot-starter-discord.md
index 3aedba1d..1ac91747 100644
--- a/docs/Writerside/topics/spring-boot-starter-discord.md
+++ b/docs/Writerside/topics/spring-boot-starter-discord.md
@@ -1,3 +1,2 @@
 # spring-boot-starter-discord
 
-Start typing here...
\ No newline at end of file

From 46593f40dca546ab9db3d82c537a32ffab5fd87a Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Thu, 26 Dec 2024 14:27:20 +0100
Subject: [PATCH 06/27] Upgrade PrimeNG and cleanup unused chess settings code.

Updated PrimeNG and related dependencies to version 19.0.2 for improved compatibility and features. Removed redundant code and temporary search functionality from the chess settings component, simplifying the implementation. This also updates related templates for better maintainability.
---
 website/package-lock.json                     | 16 ++---
 website/package.json                          |  4 +-
 .../chess-update-event.component.html         | 11 +---
 .../chess-update-event.component.ts           | 61 -------------------
 4 files changed, 11 insertions(+), 81 deletions(-)

diff --git a/website/package-lock.json b/website/package-lock.json
index 201580d0..1f234ca8 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -25,12 +25,12 @@
         "@fortawesome/free-solid-svg-icons": "^6.7.2",
         "@ngx-translate/core": "^16.0.4",
         "@ngx-translate/http-loader": "^16.0.1",
-        "@primeng/themes": "^19.0.1",
+        "@primeng/themes": "^19.0.2",
         "@types/d3": "^7.4.3",
         "chart.js": "^4.4.7",
         "d3": "^7.9.0",
         "jwt-decode": "^4.0.0",
-        "primeng": "^19.0.1",
+        "primeng": "^19.0.2",
         "rxjs": "~7.8.1",
         "tailwindcss-primeui": "^0.3.4",
         "tslib": "^2.8.1",
@@ -5764,9 +5764,9 @@
       }
     },
     "node_modules/@primeng/themes": {
-      "version": "19.0.1",
-      "resolved": "https://registry.npmjs.org/@primeng/themes/-/themes-19.0.1.tgz",
-      "integrity": "sha512-vssxWAqnIGU5kweP07M+rk8TNKYlRjTm2XBGBFCo54OI+0+DL6GkTzbkwQ80nUzJMj8tl+KEgc+Qt/7CRbfnbg==",
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/@primeng/themes/-/themes-19.0.2.tgz",
+      "integrity": "sha512-rPLSUkoW6M36Jjd27XD0biiT6C0VdRx024he6ZRgGpFH5WrnKDJPbbzCdLNFF7JCvEgmBHWEDwnmpHgywjrn2g==",
       "license": "SEE LICENSE IN LICENSE.md",
       "dependencies": {
         "@primeuix/styled": "^0.3.2"
@@ -15337,9 +15337,9 @@
       }
     },
     "node_modules/primeng": {
-      "version": "19.0.1",
-      "resolved": "https://registry.npmjs.org/primeng/-/primeng-19.0.1.tgz",
-      "integrity": "sha512-YMShhmnIZUArZpg2BeBGkocjsFship2c8LIX6oDICMRSBjX3VJ2T+RDEVwEZgCsv7UK8BVBTOjPoeETv76XTKg==",
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/primeng/-/primeng-19.0.2.tgz",
+      "integrity": "sha512-7vizB1ynvvADjZBE9/Ks/YFwbY/d2tKYo+8Uq3OsBq9+rf9pIwKQIhd9GKkpe1gXx5Ig2SOFVeTp1Ru4H/vlVA==",
       "license": "SEE LICENSE IN LICENSE.md",
       "dependencies": {
         "@primeuix/styled": "^0.3.2",
diff --git a/website/package.json b/website/package.json
index e53f8668..1f16e636 100644
--- a/website/package.json
+++ b/website/package.json
@@ -33,12 +33,12 @@
     "@fortawesome/free-solid-svg-icons": "^6.7.2",
     "@ngx-translate/core": "^16.0.4",
     "@ngx-translate/http-loader": "^16.0.1",
-    "@primeng/themes": "^19.0.1",
     "@types/d3": "^7.4.3",
     "chart.js": "^4.4.7",
     "d3": "^7.9.0",
     "jwt-decode": "^4.0.0",
-    "primeng": "^19.0.1",
+    "primeng": "^19.0.2",
+    "@primeng/themes": "^19.0.2",
     "rxjs": "~7.8.1",
     "tailwindcss-primeui": "^0.3.4",
     "tslib": "^2.8.1",
diff --git a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html
index c928ecaa..5fb1eca8 100644
--- a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html
+++ b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html
@@ -58,9 +58,7 @@
           [target]="participants"
           [dragdrop]="true"
           [responsive]="true"
-          sourceHeader="People"
-          targetHeader="Participants"
-          filterBy="firstname,lastname,fideId,birthday"
+          filterBy="firstname,lastname,fideId"
           [filterMatchMode]="'contains'"
           [sourceStyle]="{ height: '30rem' }"
           [targetStyle]="{ height: '30rem' }"
@@ -68,13 +66,6 @@
           showSourceControls="false"
           showTargetControls="false"
         >
-          <!-- TODO sourceHeader and targetHeader are temporary because f PrimeNGs Filters are f broken -->
-          <ng-template #sourceHeader>
-            <input type="text" pInputText class="w-full" [(ngModel)]="sourceSearchText" (input)="onSourceSearch()" />
-          </ng-template>
-          <ng-template #targetHeader>
-            <input type="text" pInputText class="w-full" [(ngModel)]="targetSearchText" (input)="onTargetSearch()" />
-          </ng-template>
           <ng-template let-person #item>
             <div class="flex flex-wrap p-1 items-center gap-4 w-full">
               <div class="flex-1 flex flex-col">
diff --git a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts
index 7399c050..66bb0cfe 100644
--- a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts
+++ b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts
@@ -113,7 +113,6 @@ export class ChessUpdateEventComponent implements OnInit{
   private resetParticipantsSelect(){
     this.personsToSelect = [...[]]
     this.participants = [...[]]
-    this.resetSourceTargetFilter()
     let selectedEvent = this.selectedEvent();
     if(selectedEvent){
       const eventParticipants = selectedEvent.participants as Person[];
@@ -217,64 +216,4 @@ export class ChessUpdateEventComponent implements OnInit{
     })
   }
 
-
-
-
-
-
-
-
-  // TODO sourceHeader and targetHeader are temporary because f PrimeNGs Filters are f broken
-  sourceSearchText: string = "";
-  targetSearchText: string = "";
-  beforeSourceSearchPersons: Person[] = [];
-  beforeTargetSearchPersons: Person[] = [];
-
-  onSourceSearch() {
-    if(this.sourceSearchText === ""){
-      if(this.beforeSourceSearchPersons.length == 0){
-        return;
-      }
-      this.personsToSelect = [...this.beforeSourceSearchPersons]
-      return;
-    }
-
-    if(this.beforeSourceSearchPersons.length == 0){
-      this.beforeSourceSearchPersons = [...this.personsToSelect]
-    }
-
-    const filtered = this.personsToSelect.filter(person =>
-      person.firstname.toLowerCase().includes(this.sourceSearchText.toLowerCase()) ||
-      person.lastname.toLowerCase().includes(this.sourceSearchText.toLowerCase())
-    )
-    this.personsToSelect = [...filtered]
-  }
-
-  onTargetSearch() {
-    if(this.targetSearchText === ""){
-      if(this.beforeTargetSearchPersons.length == 0){
-        return;
-      }
-      this.participants = [...this.beforeTargetSearchPersons]
-      return;
-    }
-
-    if(this.beforeTargetSearchPersons.length == 0){
-      this.beforeTargetSearchPersons = [...this.participants]
-    }
-
-    const filtered = this.participants.filter(person =>
-      person.firstname.toLowerCase().includes(this.targetSearchText.toLowerCase()) ||
-      person.lastname.toLowerCase().includes(this.targetSearchText.toLowerCase())
-    )
-    this.participants = [...filtered]
-  }
-
-  resetSourceTargetFilter(){
-    this.sourceSearchText = "";
-    this.targetSearchText = "";
-    this.beforeSourceSearchPersons = [...[]];
-    this.beforeTargetSearchPersons = [...[]];
-  }
-
 }

From 20c6c34e74538a1727f67e6c20ffb38d7bd3cc54 Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Thu, 26 Dec 2024 00:42:22 +0100
Subject: [PATCH 07/27] TEMP!!  Remove fideId from Person and migrate to
 Account entity

The fideId has been removed from the Person model and migrated to the Account model under the FIDE platform. This change ensures better separation of concerns by associating platform-specific information with accounts. Additionally, the OVER_THE_BOARD platform was replaced with FIDE across the application.
---
 .../chess_service/apis/ApiService.kt          |   4 +-
 .../chess_service/apis/dtos/FidePersonDto.kt  |   1 -
 .../chess_service/apis/fide/FideConverter.kt  |   2 +-
 .../app/person/PersonConverter.kt             |   2 -
 .../chess_service/app/person/PersonDto.kt     |   2 -
 .../chess_service/app/person/PersonService.kt |   4 -
 .../michibaum/chess_service/domain/Account.kt |   4 +-
 .../chess_service/domain/ChessPlatform.kt     |   2 +-
 .../michibaum/chess_service/domain/Person.kt  |   3 -
 .../src/main/resources/data/1_person.sql      | 225 ------------------
 .../src/main/resources/data/2_account.sql     |   7 -
 .../src/main/resources/data/3_event.sql       |  69 ------
 .../V3__move_fide_infos_to_account.sql        |  29 +++
 .../src/app/core/models/chess/chess.models.ts |   4 +-
 14 files changed, 35 insertions(+), 323 deletions(-)
 delete mode 100644 chess-service/src/main/resources/data/1_person.sql
 delete mode 100644 chess-service/src/main/resources/data/2_account.sql
 delete mode 100644 chess-service/src/main/resources/data/3_event.sql
 create mode 100644 chess-service/src/main/resources/db/migration/V3__move_fide_infos_to_account.sql

diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/ApiService.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/ApiService.kt
index b09e7ccb..9458d77a 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/ApiService.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/ApiService.kt
@@ -26,7 +26,7 @@ class ApiService(
         return when (account.platform) {
             ChessPlatform.CHESSCOM -> chesscomApiService.getStats(account)
             ChessPlatform.LICHESS -> lichessApiService.getStats(account)
-            ChessPlatform.OVER_THE_BOARD -> TODO()
+            ChessPlatform.FIDE -> TODO()
         }
 
     }
@@ -35,7 +35,7 @@ class ApiService(
         val result = when(account.platform) {
             ChessPlatform.CHESSCOM -> chesscomApiService.getGames(account)
             ChessPlatform.LICHESS -> lichessApiService.getGames(account)
-            ChessPlatform.OVER_THE_BOARD -> TODO()
+            ChessPlatform.FIDE -> TODO()
         }
 
         if(result is Success){
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/dtos/FidePersonDto.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/dtos/FidePersonDto.kt
index 9f2a24d1..4334c0dc 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/dtos/FidePersonDto.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/dtos/FidePersonDto.kt
@@ -17,7 +17,6 @@ class FidePersonDto(
         return Person(
             firstname = firstname,
             lastname = lastname,
-            fideId = fideId,
             federation = federation,
             birthday = birthDay,
             gender = gender,
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/fide/FideConverter.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/fide/FideConverter.kt
index 20de5af0..5dda4678 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/fide/FideConverter.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/fide/FideConverter.kt
@@ -15,7 +15,7 @@ class FideConverter {
             url = "https://ratings.fide.com/profile/" + fidePlayer.fideid,
             username = fidePlayer.name,
             name = fidePlayer.name,
-            platform = ChessPlatform.OVER_THE_BOARD
+            platform = ChessPlatform.FIDE
         )
     }
 
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonConverter.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonConverter.kt
index f6816e4d..2b9f9747 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonConverter.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonConverter.kt
@@ -13,7 +13,6 @@ class PersonConverter(
         return Person(
             firstname = person.firstname,
             lastname = person.lastname,
-            fideId = person.fideId,
             accounts = emptySet(),
             federation = person.federation,
             birthday = person.birthday?.let { LocalDate.parse(it) },
@@ -26,7 +25,6 @@ class PersonConverter(
             id = person.idOrThrow(),
             firstname = person.firstname,
             lastname = person.lastname,
-            fideId = person.fideId,
             federation = person.federation,
             birthday = person.birthday?.toString(),
             gender = person.gender,
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonDto.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonDto.kt
index bed04465..d7b3b7ba 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonDto.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonDto.kt
@@ -13,7 +13,6 @@ data class WritePersonDto(
     @NotBlank
     @Pattern(regexp = "^[a-zA-Z]+$", message = "Lastname must contain only alphabetic characters")
     val lastname: String,
-    val fideId: String? = null,
     val federation: String? = null,
     @Pattern(regexp = "^\\d{4}\\-(0[1-9]|1[012])\\-(0[1-9]|[12][0-9]|3[01])\$")
     val birthday: String? = null,
@@ -24,7 +23,6 @@ data class PersonDto(
     val id: UUID,
     val firstname: String,
     val lastname: String,
-    val fideId: String?,
     val federation: String? = null,
     val birthday: String? = null,
     val gender: Gender,
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonService.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonService.kt
index 9bbd013e..946ebf4a 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonService.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonService.kt
@@ -17,7 +17,6 @@ class PersonService(
         val newPerson = Person(
             firstname = person.firstname,
             lastname = person.lastname,
-            fideId = person.fideId,
             accounts = person.accounts + account,
             id = person.id,
             federation = person.federation,
@@ -31,7 +30,6 @@ class PersonService(
         val newPerson = Person(
             firstname = person.firstname,
             lastname = person.lastname,
-            fideId = person.fideId,
             accounts = person.accounts + accounts,
             id = person.id,
             federation = person.federation,
@@ -76,7 +74,6 @@ class PersonService(
         val newPerson = Person(
             firstname = personDto.firstname,
             lastname = personDto.lastname,
-            fideId = personDto.fideId,
             federation = personDto.federation,
             birthday = personDto.birthday?.let { LocalDate.parse(it) },
             gender = personDto.gender,
@@ -90,7 +87,6 @@ class PersonService(
         val newPerson = Person(
             firstname = personDto.firstname,
             lastname = personDto.lastname,
-            fideId = personDto.fideId,
             federation = personDto.federation,
             birthday = personDto.birthday?.let { LocalDate.parse(it) },
             gender = personDto.gender,
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/Account.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/Account.kt
index 2eb4de54..6a778740 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/Account.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/Account.kt
@@ -15,10 +15,8 @@ class Account(
     @Column(nullable = false)
     val username: String,
 
-    @Column(nullable = false)
-    val url: String,
-
     @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
     val platform: ChessPlatform,
 
     @Column(nullable = true)
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/ChessPlatform.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/ChessPlatform.kt
index c3edf2e2..de9b03f1 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/ChessPlatform.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/ChessPlatform.kt
@@ -3,5 +3,5 @@ package com.michibaum.chess_service.domain
 enum class ChessPlatform{
     CHESSCOM,
     LICHESS,
-    OVER_THE_BOARD
+    FIDE
 }
\ No newline at end of file
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/Person.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/Person.kt
index 044fa361..d54045a4 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/Person.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/Person.kt
@@ -13,9 +13,6 @@ class Person(
     @Column(nullable = false)
     val lastname: String,
 
-    @Column(nullable = true)
-    val fideId: String?,
-
     @Column(nullable = true)
     val federation: String?,
 
diff --git a/chess-service/src/main/resources/data/1_person.sql b/chess-service/src/main/resources/data/1_person.sql
deleted file mode 100644
index d9174c0b..00000000
--- a/chess-service/src/main/resources/data/1_person.sql
+++ /dev/null
@@ -1,225 +0,0 @@
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('00785d18-516b-68e3-0537-cb8285df9c8d', null, 'Sabina-Francesca', 'Foisor', null, 'USA', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('00a6ad0c-636f-352d-0f4a-cd00159c432b', null, 'Anda', 'Safranska', null, 'FRA', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('021d92e3-3876-8184-9d9c-2ccb859b16b2', '2016192', 'Hikaru', 'Nakamura', null, 'USA', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('02e9a75c-a6d1-189e-749a-e36be00d1c3f', null, 'Yaniela', 'Forgas Moreno', null, 'CUB', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('02efec29-90b7-685e-0e41-10bcd52e4d8b', null, 'Melanie', 'Lubbe', null, 'GER', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('031d7196-8555-4a88-75c2-6bf3754641e1', null, 'Rustam', 'Kasimdzhanov', null, 'UZB', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('03445e1a-3393-63bd-7f40-1287764047e1', null, 'Ayah', 'Moaataz', null, 'EGY', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('034c642d-2363-8c86-964b-41a1d1ff78cc', null, 'Ana', 'Benderac', null, 'SRB', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('05c998c1-059c-4334-5a18-017eada54f80', null, 'Alexander', 'Morozevich', null, 'RUS', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('0687b6e5-2aa9-74fe-1088-322c563f667a', null, 'Maili-Jade', 'Ouellet', null, 'CAN', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('b9b175e7-58e2-110e-9a48-0891a907a28b', null, 'Inga', 'Khurtsilava', null, 'GEO', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('08c59eed-48ac-4c85-4e73-e35e96043f0f', null, 'Oleiny', 'Linares Napoles', null, 'CUB', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('09e52bd9-5b8f-58fe-35b4-28f0433d8ca3', null, 'Elena', 'Partac', null, 'MDA', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('0c4083bf-6356-4a5b-60ec-e46dada90af2', null, 'Viktoria', 'Radeva', null, 'BUL', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('0cc81304-579b-689a-32e3-0a1df2ce0011', null, 'Gabriel', 'Sargissian', null, 'ARM', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('0d5275ae-6b41-a2c5-9044-2838d88d0204', null, 'Salomeja', 'Zaksaite', null, 'LTU', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('0de5a824-7e36-6552-3d22-d0df24f44c3d', null, 'Erika', 'Sziva', null, 'NED', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('c9221ef2-5a0e-5258-a34c-0f487a054b84', null, 'Jolanta', 'Zawadzka', null, 'POL', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('0fbf8c8e-840c-1927-5724-5eaf4439a180', null, 'Marina', 'Gajcin', null, 'SRB', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('1093fbdf-2ae3-2b38-40f6-fb1e320b20f9', null, 'Xueyi', 'Li', null, 'CHN', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('fd635ae6-0213-13c1-8e4b-10f21bcd5d73', null, 'Anastasiya', 'Rakhmangulova', null, 'UKR', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('116110e2-3608-60ce-3e2b-e2d6bfb0065b', null, 'Elif', 'Mehmed', null, 'SRB', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('1183284f-6754-7e5c-2651-31eb05fd9c5d', null, 'Hanna Marie', 'Klek', null, 'GER', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('129edb47-47b6-2f56-6a16-a4e1513f7aa8', null, 'Viktoria', 'Chernyak', null, null, 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('12b57d9c-39db-7795-22f6-9e804dd2594f', null, 'Maria', 'Fominykh', null, 'RUS', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('3c874638-889a-4ae6-90d4-1360db104c21', null, 'Vera', 'Nebolsina', null, 'FRA', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('154928d8-7cc0-188e-169c-76c689bd7cb2', null, 'Javokhir', 'Sindarov', null, 'UZB', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('15d5ed07-351b-0ce7-344f-f4f173180af8', null, 'Marta', 'Bartel', null, 'POL', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('1689c31e-674b-1c05-2643-6def1d564034', null, 'Ilze', 'Berzina', null, 'LAT', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('16a15cc7-9a16-600e-77e3-b45bae956425', null, 'Anna', 'Wagener', null, 'LUX', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('186a1ed8-a5e7-2571-789c-b039c22a83db', null, 'Haik M.', 'Martirosyan', null, 'ARM', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('194dfb30-39bc-1a07-5dcd-c987f61c652e', null, 'Julia', 'Ryjanova', null, 'AUS', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('19ddca2c-0091-2788-2163-9c9a85248b08', null, 'Xiaowen', 'Zhang', null, 'CHN', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('1a3bcae6-3103-60c8-345b-4561465c5eef', null, 'Emilia', 'Djingarova', null, 'SRB', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('1a7c2238-0392-0d32-6246-526c66fa97fe', '8603405', 'Yi', 'Wei', null, 'CHN', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('76f9d54a-678a-3d63-8f07-1bad9cec5c6e', null, 'Lan', 'Yao', null, 'ENG', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('1d5c0cc8-5e3a-7fc4-5637-5cdf1ede2b6b', null, 'Ava', 'Suleimanova', null, 'UKR', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('20cab455-4576-1ae2-5852-2ca9cd2e7e3a', null, 'Petra', 'Papp', null, 'HUN', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('2264c8d2-3741-6754-90c1-7074de1e79c7', null, 'Sarin', 'Nihal', null, 'IND', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('22879ab5-3108-755e-1ab2-fd1ee748947a', '12521213', 'M. Amin', 'Tabatabaei', null, 'IRI', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('23ea7136-088c-350f-7b53-775a2c419df6', null, 'Qianyun', 'Gong', null, 'SGP', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('24853113-8030-789b-4259-afdb72dc63ba', null, 'Uurtsaikh', 'Uuriintuya', null, 'MGL', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('26ac9398-82c1-9558-9f62-0895b21099ad', null, 'Yiyi', 'Xiao', null, 'CHN', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('2875b0d3-64de-8b09-9d56-2b7c21ff5178', null, 'Altan-Ulzii', 'Enkhtuul', null, 'MGL', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('289c37f5-a2d4-159e-27a7-864627f113cd', null, 'Jessica', 'Schmidt', null, 'GER', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('29ace154-a4c9-4b39-3140-e76bad2478da', null, 'Narmin', 'Mammadova', null, 'AZE', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('ae202a71-2ec5-2b04-a171-2a67f7089ce6', null, 'Margarita', 'Voyska', null, 'BUL', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('2aff05ce-7468-7e77-36bb-481ba6bb8f0a', null, 'Maria', 'Gevorgyan', null, 'ARM', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('4611b8ce-027a-486d-8f5d-2bc124f91a81', null, 'David', 'Navara', null, 'CZE', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('2c841938-38c4-420e-300e-871a7d949dbf', null, 'Kirill', 'Alekseenko', null, 'AUT', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('2d6c0ecf-a5ed-7e96-8192-150090099bae', null, 'Bassem', 'Amin', null, 'EGY', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('308a3cd1-46b8-2cb9-2a1a-1e930dc73a1e', null, 'Natalija', 'Pogonina', null, 'RUS', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('30f211fb-0ec2-34fd-0477-7708f3e357e4', null, 'Hao', 'Wang', null, 'CHN', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('6f15ae90-27a3-5001-9dbd-331d0ecc3261', null, 'Josefine', 'Heinemann', null, 'GER', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('346aa4b9-8bbb-6f05-72e2-08a0db6651e1', null, 'Turmunkh', 'Munkhzul', null, 'MGL', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('34ef9b1b-816f-4908-43d5-036fcaab3914', null, 'Yerisbel', 'Miranda Llanes', null, 'CUB', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('34fa6fb7-35dc-086f-7d47-de5232ba4555', null, 'Alexey', 'Sarana', null, 'SRB', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('356dbd1f-91ab-1c90-1e9f-88960a813ce6', null, 'Baira', 'Kovanova', null, 'RUS', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('35d4fe50-3507-6625-5e4a-b09aa5ef7a86', null, 'Irina', 'Zakurdjaeva', null, 'RUS', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('81562167-a2d4-3f38-865a-37802b1a3fbe', null, 'Andrei', 'Volokitin', null, 'UKR', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('a755c4fe-4a65-1f3a-9782-3857b85b8c27', null, 'Lenka', 'Ptacnikova', null, 'ISL', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('38762465-9863-78f3-993e-4991f0db866f', null, 'Nino', 'Maisuradze', null, 'FRA', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('387f925d-0fac-68d1-8a96-f28d893d8804', null, 'Vladimir', 'Fedoseev', null, 'SLO', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('fc0a4b23-6c21-5678-80b7-38e8c77c85ba', null, 'Khayala', 'Abdulla', null, 'AZE', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('394f5b41-94c6-2215-7bbc-e0bc3c86a5e7', null, 'Fiona', 'Sieber', null, 'GER', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('399c427a-a008-585b-3c7c-7d03ddd722a4', null, 'Frederik', 'Svane', null, 'GER', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('39f466e2-35cf-4eee-1cb6-84c01f2b78e0', null, 'Thai Dai Van', 'Nguyen', null, 'CZE', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('3a87e966-1081-489f-4b7b-4a21d6801f80', null, 'Miranda', 'Mikadze', null, 'GEO', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('3bde68f4-a517-1212-207c-50761f744a32', null, 'Nikita', 'Vitiugov', null, 'ENG', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('3c28c732-50ed-18ac-10b7-d703e02e5b28', null, 'Dmitrij', 'Kollars', null, 'GER', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('41629049-6944-60d2-3c68-cc1f0b4e4e18', null, 'Anjelina', 'Belakovskaia', null, 'USA', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('41bc3c5f-9382-9439-95f2-68a2d43f0103', null, 'Yue', 'Wang', null, 'CHN', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('bf57e2f5-91df-4960-abce-44516fe2d955', '35009192', 'Arjun', 'Erigaisi', null, 'IND', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('4599a28f-256d-70ec-95cc-fc78b7bc5d86', null, 'Elena', 'Fatalibekova', null, 'RUS', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('47a6e6eb-52b5-009c-4482-45b724da806f', '5029465', 'Santosh Gujrathi', 'Vidit', null, 'IND', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('47b713b5-84cf-71b4-245a-4059e2d2a716', null, 'Tian', 'Tian', null, 'CHN', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('48daa7cd-3346-04e0-0e02-bdef99a69166', null, 'Grigoriy', 'Oparin', null, 'USA', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('497a4fde-61d6-7966-2bec-fc3be8954a51', null, 'Zuzana', 'Borosova', null, 'SVK', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('4a3cb0e1-46b4-2520-7eb7-8e330bd09d6b', null, 'Daria', 'Voit', null, 'RUS', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('4acd9819-6bee-25e7-3f40-a1e6c215658a', null, 'Jovana', 'Eric', null, 'SRB', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('4b73efa1-9dbc-72cc-016b-5947989d0c3f', null, 'Gawain C B', 'Jones', null, 'ENG', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('4b90d4a6-6941-754f-76a3-10e06e11303f', null, 'Kubra', 'Ozturk Orenli', null, 'TUR', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('7a2deb98-229f-5e87-99a1-4bdb40326a32', null, 'Jilin', 'Zhang', null, 'AUS', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('4eb873b3-7a5e-4387-6105-7422135048d3', null, 'Xeniya', 'Balabayeva', null, 'KAZ', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('5982ad59-6c80-416e-885c-4fe8cd436c01', null, 'Kamile', 'Baginskaite', null, 'LTU', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('5051129f-9e03-0241-190a-ea14a45e64af', null, 'Veselin', 'Topalov', null, 'BUL', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('50aa701b-5ea0-6293-83e1-c87c0e412e2c', null, 'Maria', 'Manakova', null, 'SRB', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('518f6788-41b5-6ad7-840d-6b9bba2a1c91', null, 'Svetlana', 'Prudnikova', null, 'SRB', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('f746728e-076e-5f55-a767-520b806b1042', null, 'Narmin', 'Kazimova', null, 'AZE', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('00115e9d-03f4-1c51-9009-523c6ee54237', null, 'Zirka', 'Frometa Castillo', null, 'CUB', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('c3ec80d2-56d6-3012-858e-530a30607047', null, 'Dina', 'Belenkaya', null, 'ISR', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('554dfedc-8fe2-89b4-a06d-da2f7cb6158b', null, 'Anastasya', 'Paramzina', null, null, 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('55a5b0bd-5978-7d2f-194b-bcddc0591bd4', null, 'Tunde', 'Csonkics', null, 'HUN', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('5a89f235-5571-a0d3-a41b-e0e22c5f1607', null, 'Mitra', 'Hejazipour', null, 'FRA', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('5b25e7df-0d4e-5441-19d3-ddac94540ef0', null, 'Eva', 'Kulovana', null, 'CZE', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('5cebf2a2-7628-33e3-3197-682e5dd0a037', null, 'Irina', 'Mikhailova', null, 'RUS', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('f8561402-8046-31e8-9721-5de2482d8b78', null, 'Ngoc Truong Son', 'Nguyen', null, 'VIE', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('5ef70e4c-468c-00a3-43f6-674ab38b089e', null, 'Yelena', 'Ankudinova', null, 'KAZ', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('6131866c-9bd4-3773-1932-bb2d2bc933b1', null, 'Vladimir', 'Malakhov', null, null, 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('616707da-852c-783d-7c7d-a7a524fd9606', null, 'Tijana', 'Mandura', null, 'SRB', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('61ea30d7-6f88-2f09-4941-98980c596ab3', null, 'Niina', 'Koskela', null, 'NOR', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('6247a4be-121a-2e0b-2705-f618c2124d0a', null, 'Teimour', 'Radjabov', null, 'AZE', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('633688a5-0373-4cd4-4eea-fde66ca8845d', null, 'Candela Be', 'Francisco Guecamburu', null, 'ARG', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('634b3550-3b9a-7c1a-14c6-65822a4743cf', null, 'Jonas Buhl', 'Bjerre', null, 'DEN', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('402ed7ef-3359-13c9-87e2-64250fc69c73', null, 'Raunak', 'Sadhwani', null, 'IND', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('6a63664d-0ad3-481d-058c-3471745f69a7', null, 'Mo', 'Zhai', null, 'CHN', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('ab11a170-2994-27a3-88f3-6a7fcd2e4b4b', null, 'Bogdan-Daniel', 'Deac', null, 'ROU', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('6be3af2f-3f2c-a31a-8f57-e1c6d7b82857', null, 'Nilufar', 'Yakubbaeva', null, 'UZB', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('70f242e5-393b-0be6-150c-c2fb0d707c77', null, 'Francisco', 'Vallejo Pons', null, 'ESP', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('77a6ecef-7725-3a22-5255-6cedb72635ce', null, 'Alua', 'Nurman', null, 'KAZ', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('7894a362-9767-356d-7d42-e8d58b901f79', null, 'Vladislav', 'Artemiev', null, 'RUS', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('7b3e1a54-9d9e-05b2-496f-7cf4d0408e2d', null, 'Xiangzhi', 'Bu', null, 'CHN', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('7c026886-5e26-3a95-4a48-13cb1f082bb1', null, 'Julia', 'Movsesian', null, 'CZE', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('7c96fbd6-7b97-9374-94be-448b48970c7d', null, 'Tamara', 'Vilerte', null, 'LAT', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('7eefa0e8-2c70-66e7-7550-51133e795043', null, 'Thi Bao Tram', 'Hoang', null, 'VIE', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('7f8acd1f-459e-7071-2e7d-c2ce7ba561b4', null, 'Elvira', 'Berend', null, 'LUX', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('8011955e-a632-63dd-9fb2-50c654c9435b', null, 'Vita', 'Kryvoruchko', null, 'UKR', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('801cb49d-2628-737e-25e0-c7abb3eb535e', null, 'Shrook', 'Wafa', null, 'EGY', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('93563420-186e-3439-9d13-837a9e604392', '4168119', 'Ian', 'Nepomniachtchi', null, 'RUS', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('86861193-a451-308a-6a5e-38b646912452', null, 'Shant', 'Sargsyan', null, 'ARM', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('878b14c6-1252-4795-51c9-e429a8690fa4', null, 'Mobina', 'Alinasab', null, 'IRI', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('38ebd4b9-9f9a-389c-88f0-87dc157e7a8e', null, 'Manisha Mohanty', 'Kiran', null, 'IND', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('880fc178-3f03-8762-984c-0ae1eff283a8', null, 'Dana', 'Reizniece-Ozola', null, 'LAT', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('8da1d1b2-5cee-3e5d-976c-88571b441edb', null, 'Elena', 'Koepke', null, 'GER', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('47d5e00b-09c6-0383-a699-8c848f300072', null, 'Michalina', 'Rudzinska', null, 'POL', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('8f02429a-8343-66fa-8576-536850378ff9', null, 'Svetlana', 'Mednikova', null, 'RUS', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('8fdd4ced-0319-7dd7-2044-d7091a488a53', null, 'Monica', 'Calzetta Ruiz', null, 'ESP', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('9060d28f-26f8-2808-37fd-ee5415878ee7', null, 'Claudia', 'Amura', null, 'ARG', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('9083ed18-3b4d-776b-1f9d-9a454b6aa5d0', null, 'Vivian', 'Ramon Pita', null, 'CUB', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('6c44c42d-96a6-25c7-a774-90a8945b17da', null, 'Mary Ann', 'Gomes', null, 'IND', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('1000d0b9-362a-1dbe-9652-916c6e0e1d34', null, 'Shamsiddin', 'Vokhidov', null, 'UZB', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('92a0c5bd-2642-65e7-4a03-585e2a149b17', null, 'Max', 'Warmerdam', null, 'NED', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('92fea77b-752f-4e43-0042-461f647c9bfd', null, 'Tatyana', 'Fomina', null, 'EST', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('94b855bc-2b15-4401-29e9-d63335267d26', null, 'Mirjana', 'Medic', null, 'CRO', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('96656a52-66a3-0b95-2b41-146511c53b2a', null, 'Alicja', 'Sliwicka', null, 'POL', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('6d3d1867-2a73-21e1-860f-96af14fc6ac7', null, 'Matthias', 'Bluebaum', null, 'GER', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('975a574d-8abc-1470-5bac-5dd130af8014', null, 'Volodar', 'Murzin', null, null, 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('977c6440-9f0e-3ad1-1849-6f6ab81c9a9e', null, 'Benjamin', 'Gledura', null, 'HUN', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('9792327f-60d9-7d89-5294-8f4e0cd54fe7', null, 'Vasyl', 'Ivanchuk', null, 'UKR', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('9bb3895b-389d-7f49-26ef-ef2cfd432901', null, 'Andreea', 'Navrotescu', null, 'FRA', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('9c8dc5f2-9b35-01dc-2863-2480ee1ea3d3', null, 'Nargiz', 'Umudova', null, 'AZE', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('5760a403-7863-5392-87f1-9df128a242f2', null, 'Shiqun', 'Ni', null, 'CHN', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('a04e19f5-5a3d-49e1-00ba-245d78616252', null, 'Laura', 'Rogule', null, 'LAT', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('a1ba8c34-2e53-7322-436a-f49481f354b5', null, 'Tatjana', 'Melamed', null, 'GER', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('a1ef7338-70d7-0f52-24b0-f873dc612503', null, 'Rauf', 'Mamedov', null, 'AZE', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('eed8b0a2-d669-4dcf-beda-a2c51a76539d', '46616543', 'Gukesh', 'D', null, 'IND', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('a4d279be-12ac-4390-16ad-75a2e2b56b87', null, 'Adina-Maria', 'Hamdouchi', null, 'FRA', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('a50c01a3-a5ce-6897-1905-b8c272144a37', null, 'David', 'Anton Guijarro', null, 'ESP', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('a5f25209-5662-51a2-09c2-c3a3c1d592ba', '12401137', 'Quang Liem', 'Le', null, 'VIE', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('a6564aa9-4973-4b4a-52c7-c0e1cd074254', null, 'Peter', 'Svidler', null, null, 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('a703d11f-617c-7fa6-4a30-d2118b817e3f', '13300474', 'Levon', 'Aronian', null, 'USA', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('a8057877-89bc-7942-2216-810830735426', null, 'Pentala', 'Harikrishna', null, 'IND', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('0bcfc9ae-41f6-3260-965d-b1c295a94370', '12940690', 'Vincent', 'Keymer', null, 'GER', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('b1c37f66-4457-1cf3-30ae-8ebcd8046b76', null, 'David W L', 'Howell', null, 'ENG', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('b270d94c-96f0-3f2f-275e-20be19825087', null, 'Sanan', 'Sjugirov', null, 'HUN', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('b309c780-80e6-66ef-3b05-f198b46941cb', null, 'Jovana', 'Rapport', null, 'HUN', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('b6f83628-635b-6046-11d3-26ba02928d2b', null, 'Elena-Luminita', 'Cosma', null, 'ROU', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('b7e8ec37-923a-0a81-41ef-dc1a3ba21d03', null, 'Keti', 'Tsatsalashvili', null, 'GEO', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('ebef89a8-6c0c-4211-8bb4-b8c3391c3f81', '1319620', 'Noel', 'Studer', null, 'SUI', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('b8ca7040-0c96-5a9e-3ed4-1e3ea5e29e29', null, 'Tatiana', 'Grabuzova', null, 'ESP', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('b8dca0ef-811d-028a-562a-fc806a5278d0', null, 'Judith', 'Fuchs', null, 'GER', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('b9868006-9ac8-6926-6eda-956c99fca5b0', null, 'Jorden', 'Van Foreest', null, 'NED', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('bb34a98c-9421-2f5e-4e89-4a6e2b611c30', null, 'Ernesto', 'Inarkiev', null, 'RUS', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('bd2dad21-68b2-18f3-3178-31ceb87e581d', '623539', 'Maxime', 'Vachier-Lagrave', null, 'FRA', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('be726530-7bb5-096e-5e2d-53ec897256e0', null, 'Dmitry', 'Andreikin', null, null, 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('be9555b4-3864-378f-6331-a8279b316af3', null, 'Parham', 'Maghsoodloo', null, 'IRI', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('bece1380-73b2-3772-5a18-bcaba090213a', null, 'Irina', 'Ionescu', null, 'ROU', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('bfbba496-32c8-12dc-0460-7138b60a1e63', null, 'Olga', 'Iljushina', null, 'RUS', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('bff84265-7142-3821-2bd3-e670094e54fc', '8602972', 'Yixin', 'Ding', null, 'CHN', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('c068e089-3e7e-54e0-64ab-3e0b21ac045f', '8603820', 'Yangyi', 'Yu', null, 'CHN', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('c07e7ec0-3c31-700f-1bff-11c99dfe6bd4', null, 'Radoslaw', 'Wojtaszek', null, 'POL', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('74dad1b1-2f90-45b4-8b1a-c1d47f2296ee', '2020009', 'Fabiano', 'Caruana', null, 'USA', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('c2064b53-72fe-7aa1-6161-47ca686c2a90', null, 'Abhimanyu', 'Puranik', null, 'IND', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('c23f4b2e-046d-23e4-4eda-d0a2f0b52cff', '5202213', 'Wesley', 'So', null, 'USA', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('c5e9c3e3-9c89-1a86-3766-f945530e5d45', null, 'Anne', 'Haast', null, 'NED', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('c620c385-862a-66d0-9bf6-69cbb7c35b33', null, 'Dewi Ardhiani Anastasia', 'Citra', null, 'INA', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('c6f35f53-094a-60b1-3f9f-03b5dab980a2', null, 'Qun', 'Ma', null, 'CHN', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('c783af11-a1a0-756a-53dc-c75efa824f78', null, 'Alan', 'Pichot', null, 'ESP', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('cc4f9edf-0441-3d00-04c6-7561af2960b8', null, 'Andrey', 'Esipenko', null, null, 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('cdb32a9b-7ac9-56d9-09d6-b4d9cf6739aa', null, 'Regina', 'Theissl Pokorna', null, 'AUT', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('ceba3585-3242-17e7-55c3-cec614701c45', null, 'Alexandr', 'Predke', null, 'SRB', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('cfb31c1b-6ac4-5f7c-5308-7556eb0e8a45', null, 'Janelle Mae', 'Frayna', null, 'PHI', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('6467f768-3c15-18a7-a06c-d13cbdb42ad7', null, 'Etienne', 'Bacrot', null, 'FRA', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('d4f92ac0-8a68-1f03-4210-5e3ef50b219a', null, 'Olga', 'Babiy', null, 'UKR', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('70509464-f3b9-4849-a010-d5207b284cc2', '8603677', 'Liren', 'Ding', null, 'CHN', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('d616409a-7b5f-5f95-6191-004b6db364f1', null, 'Tuduetso', 'Sabure', null, 'BOT', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('d616409a-7b5f-5f95-6191-004c6db364f1', '4128125', 'Alexandra', 'Kosteniuk', null, 'SUI', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('d6f48bdf-51dd-5634-2bf6-82160aab80a1', null, 'Shahenda', 'Wafa', null, 'EGY', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('d7f0d59a-8303-46e0-204b-512de8967a3d', '24116068', 'Anish', 'Giri', null, 'NED', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('d98bcc35-430b-6757-7a81-00dd264104a1', null, 'Irina', 'Chelushkina', null, 'SRB', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('d9a53ca0-03fb-787e-855f-8b110c9939d2', null, 'Elmira', 'Mirzoeva', null, 'ENG', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('d9fdcddc-0734-1274-6976-4b77e96587ca', null, 'Marta', 'Michna', null, 'GER', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('da5f7c12-2e29-57f5-5134-96dbbd1940cc', '14204118', 'Nodirbek', 'Abdusattorov', null, 'UZB', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('dab3cacf-60d6-1851-2f47-351b2f327cab', null, 'Ghazal', 'Hakimifard', null, 'SUI', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('dbcc7b3a-4027-1d9d-5b49-9e41e5bb2602', null, 'Joanna', 'Worek', null, 'CZE', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('dc9b376a-4d45-0036-50d2-33d0ef64a288', null, 'Irina', 'Sudakova', null, 'RUS', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('dde76db4-7c8a-482f-4b6a-adae1c107f66', null, 'Nils', 'Grandelius', null, 'SWE', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('4008d5b0-1540-4e0c-82bf-de37b4f759c3', '1503014', 'Magnus', 'Carlsen', null, 'NOR', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('de470353-55d0-08cb-1175-0672b80f49db', null, 'Suzana', 'Maksimovic', null, 'SRB', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('48e36962-883d-5d7d-9919-de51a72546fd', null, 'Elena', 'Tomilova', null, 'RUS', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('df90ddbf-8f42-1b6b-0975-49f263a8168d', null, 'Yuanyuan', 'Xu', null, 'CHN', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('e03610cc-7b71-563b-1f11-946701426009', null, 'Rakhil', 'Eidelson', null, 'BLR', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('e08c3606-6f72-17c2-5ce5-5c759e842393', null, 'Atousa', 'Pourkashiyan', null, 'USA', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('e29877c6-0533-3a5a-586d-a9389f4b196d', '13413015', 'Govhar', 'Beydullayeva', null, 'AZE', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('e38ccbbd-771e-643f-7107-4b7f58b12f48', null, 'Natacha', 'Benmesbah', null, 'FRA', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('e487a430-10a6-485c-55f0-c0323d8714d5', null, 'Sheila', 'Jackson', null, 'ENG', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('e551b834-5a6a-5491-526e-a9371b53a1e6', '4126025', 'Alexander', 'Grischuk', null, 'RUS', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('e634d44b-2f4f-7680-6675-2236a74d2dfc', null, 'Mihaela', 'Sandu', null, 'ROU', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('e70eb729-3e15-2dda-5dc3-6b5a9e010dc6', '738590', 'Richard', 'Rapport', null, 'HUN', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('e76eef1e-19ee-788f-5d65-18a2e4c38bb6', null, 'Diana', 'Tarleva', null, 'UKR', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('e7b73e44-566b-6087-7f4e-2faf38575524', null, 'Awonder', 'Liang', null, 'USA', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('e8e56f38-2f16-38fe-6dfb-7eff926b2a24', null, 'Tereza', 'Rodshtein', null, 'CZE', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('ea35cf0f-8909-07a0-0d5e-139bda3581e0', null, 'Turkan', 'Mamedjarova', null, 'AZE', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('ea3ddb6e-1b22-4a6e-00fc-239863365f90', null, 'Ruslan', 'Ponomariov', null, 'UKR', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('ea7a2f6d-7b18-6d0e-3159-808cefda0d33', '2093596', 'Hans Moke', 'Niemann', null, 'USA', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('eaa84eb3-2c47-7d81-18ec-40fe879d9d81', null, 'Zeinab', 'Mamedjarova', null, 'AZE', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('eaa0c026-633d-2f01-9403-f36491170df6', '703303', 'Peter', 'Leko', null, 'HUN', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('f498cd61-63b4-1387-5331-fbce84da6575', '12573981', 'Alireza', 'Firouzja', null, 'FRA', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('f641def8-1443-5068-3484-6d1194f83131', null, 'Galina', 'Strutinskaia', null, 'RUS', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('67c81470-3602-1262-9a5e-f9c2dd6f8259', null, 'Karolina', 'Pilsova', null, 'CZE', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('fbb3f04d-6107-250a-45a8-4914c2160c78', null, 'Carla', 'Heredia Serrano', null, 'ECU', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('fd4b21f7-7789-7b96-66b7-04f15e2e34b5', null, 'Annamaria', 'Marjanovic', null, 'HUN', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('7dc6a7c0-06bf-08d6-a792-fe42caba5a62', null, 'Qian', 'Huang', null, 'CHN', 'FEMALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('ad9e370f-503c-55d8-8d90-fea5d8f3962c', null, 'Pavel', 'Eljanov', null, 'UKR', 'MALE');
-INSERT IGNORE INTO person (id, fide_id, firstname, lastname, birth_date, federation, gender) VALUES ('77c0742f-3b79-4d2b-bd51-0cc4de6f1466', '1304364', 'Vadim', 'Milov', '1972-08-01', 'SUI', 'MALE');
diff --git a/chess-service/src/main/resources/data/2_account.sql b/chess-service/src/main/resources/data/2_account.sql
deleted file mode 100644
index 1d585ae1..00000000
--- a/chess-service/src/main/resources/data/2_account.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-INSERT IGNORE INTO account (id, created_at, name, platform, platform_id, url, username, person_id) VALUES ('476d3036-9474-47a4-b8d4-08450da4b216', null, 'Caruana, Fabiano', 'OVER_THE_BOARD', '2020009', 'https://ratings.fide.com/profile/2020009', 'Caruana, Fabiano', '74dad1b1-2f90-45b4-8b1a-c1d47f2296ee');
-INSERT IGNORE INTO account (id, created_at, name, platform, platform_id, url, username, person_id) VALUES ('ebfdf6d4-80f0-4c9a-9189-3348dd34faf7', null, 'Carlsen, Magnus', 'OVER_THE_BOARD', '1503014', 'https://ratings.fide.com/profile/1503014', 'Carlsen, Magnus', '4008d5b0-1540-4e0c-82bf-de37b4f759c3');
-INSERT IGNORE INTO account (id, created_at, name, platform, platform_id, url, username, person_id) VALUES ('f72a68f9-5591-496d-b185-45837191e44a', null, 'Ding, Liren', 'OVER_THE_BOARD', '8603677', 'https://ratings.fide.com/profile/8603677', 'Ding, Liren', '70509464-f3b9-4849-a010-d5207b284cc2');
-INSERT IGNORE INTO account (id, created_at, name, platform, platform_id, url, username, person_id) VALUES ('d094f953-bfb8-4bdb-9098-c2eccc8dfebc', null, 'Nakamura, Hikaru', 'OVER_THE_BOARD', '2016192', 'https://ratings.fide.com/profile/2016192', 'Nakamura, Hikaru', '021d92e3-3876-8184-9d9c-2ccb859b16b2');
-INSERT IGNORE INTO account (id, created_at, name, platform, platform_id, url, username, person_id) VALUES ('662d1708-89a4-40cd-9fc1-db89e8b8d185', null, 'Gukesh D', 'OVER_THE_BOARD', '46616543', 'https://ratings.fide.com/profile/46616543', 'Gukesh D', 'eed8b0a2-d669-4dcf-beda-a2c51a76539d');
-INSERT IGNORE INTO account (id, created_at, name, platform, platform_id, url, username, person_id) VALUES ('1824b44c-bdb8-4bea-82ce-e1d727fa651b', null, 'Erigaisi Arjun', 'OVER_THE_BOARD', '35009192', 'https://ratings.fide.com/profile/35009192', 'Erigaisi Arjun', 'bf57e2f5-91df-4960-abce-44516fe2d955');
-INSERT IGNORE INTO account (id, created_at, name, platform, platform_id, url, username, person_id) VALUES ('e726b2fc-63fe-4d1a-a587-ffcd764601b7', null, 'Firouzja, Alireza', 'OVER_THE_BOARD', '12573981', 'https://ratings.fide.com/profile/12573981', 'Firouzja, Alireza', 'f498cd61-63b4-1387-5331-fbce84da6575');
diff --git a/chess-service/src/main/resources/data/3_event.sql b/chess-service/src/main/resources/data/3_event.sql
deleted file mode 100644
index dc1c1f29..00000000
--- a/chess-service/src/main/resources/data/3_event.sql
+++ /dev/null
@@ -1,69 +0,0 @@
--- FIDE World Championship
-INSERT IGNORE INTO event_category (id, description, name) VALUES ('860742ff-6cc4-415f-be27-67373962781d', 'FIDE World Championship', 'FIDE World Championship');
-
--- FIDE World Championship 2006
--- FIDE World Championship 2007
--- FIDE World Championship 2008
--- FIDE World Championship 2010
--- FIDE World Championship 2012
--- FIDE World Championship 2013
--- FIDE World Championship 2014
--- FIDE World Championship 2016
-
--- FIDE World Championship 2018
-INSERT IGNORE INTO event (id, date_from, date_to, embed_url, title, location, url) VALUES ('2689e819-6e1f-4aaa-8692-6bb9ed9a31d4', '2018-11-09', '2018-11-30', 'https://www.chess.com/events/embed/2018-wcc', '2018 FIDE World Championship', 'London', 'https://www.chess.com/events/2018-wcc');
-INSERT IGNORE INTO event_category_mapping (event_id, category_id) VALUES ('2689e819-6e1f-4aaa-8692-6bb9ed9a31d4', '860742ff-6cc4-415f-be27-67373962781d');
-INSERT IGNORE INTO event_participants_mapping (event_id, person_id) VALUES ('2689e819-6e1f-4aaa-8692-6bb9ed9a31d4', '74dad1b1-2f90-45b4-8b1a-c1d47f2296ee');
-INSERT IGNORE INTO event_participants_mapping (event_id, person_id) VALUES ('2689e819-6e1f-4aaa-8692-6bb9ed9a31d4', '4008d5b0-1540-4e0c-82bf-de37b4f759c3');
-
--- FIDE World Championship 2021
-INSERT IGNORE INTO event (id, date_from, date_to, embed_url, title, location, url) VALUES ('e4c203c8-f064-4a5f-a9af-8e4af0796921', '2021-11-24', '2021-12-14', 'https://www.chess.com/events/embed/2021-fide-world-chess-championship', '2021 FIDE World Championship', 'Dubai', 'https://www.chess.com/events/2021-fide-world-chess-championship');
-INSERT IGNORE INTO event_category_mapping (event_id, category_id) VALUES ('e4c203c8-f064-4a5f-a9af-8e4af0796921', '860742ff-6cc4-415f-be27-67373962781d');
-INSERT IGNORE INTO event_participants_mapping (event_id, person_id) VALUES ('e4c203c8-f064-4a5f-a9af-8e4af0796921', '4008d5b0-1540-4e0c-82bf-de37b4f759c3');
-INSERT IGNORE INTO event_participants_mapping (event_id, person_id) VALUES ('e4c203c8-f064-4a5f-a9af-8e4af0796921', '93563420-186e-3439-9d13-837a9e604392');
-
--- FIDE World Championship 2023
-INSERT IGNORE INTO event (id, date_from, date_to, embed_url, title, location, url) VALUES ('7f7fe0c3-c529-4315-8507-8068173fbb1f', '2023-04-09', '2023-05-01', 'https://www.chess.com/events/embed/2023-fide-world-chess-championship', '2023 FIDE World Championship ', 'Astana', 'https://www.chess.com/events/2023-fide-world-chess-championship');
-INSERT IGNORE INTO event_category_mapping (event_id, category_id) VALUES ('7f7fe0c3-c529-4315-8507-8068173fbb1f', '860742ff-6cc4-415f-be27-67373962781d');
-INSERT IGNORE INTO event_participants_mapping (event_id, person_id) VALUES ('7f7fe0c3-c529-4315-8507-8068173fbb1f', '93563420-186e-3439-9d13-837a9e604392');
-INSERT IGNORE INTO event_participants_mapping (event_id, person_id) VALUES ('7f7fe0c3-c529-4315-8507-8068173fbb1f', '70509464-f3b9-4849-a010-d5207b284cc2');
-
--- FIDE World Championship 2024
-INSERT IGNORE INTO event (id, date_from, date_to, embed_url, title, location, url) VALUES ('557803ef-8079-4c57-81e0-d12492ab883f', '2024-11-25', '2024-12-13', 'https://www.chess.com/events/embed/2024-fide-chess-world-championship', '2024 FIDE World Championship', 'Singapore', 'https://www.chess.com/events/2024-fide-chess-world-championship');
-INSERT IGNORE INTO event_category_mapping (event_id, category_id) VALUES ('557803ef-8079-4c57-81e0-d12492ab883f', '860742ff-6cc4-415f-be27-67373962781d');
-INSERT IGNORE INTO event_participants_mapping (event_id, person_id) VALUES ('557803ef-8079-4c57-81e0-d12492ab883f', 'eed8b0a2-d669-4dcf-beda-a2c51a76539d');
-INSERT IGNORE INTO event_participants_mapping (event_id, person_id) VALUES ('557803ef-8079-4c57-81e0-d12492ab883f', '70509464-f3b9-4849-a010-d5207b284cc2');
-
-
--- Freestyle Chess Tour
-INSERT IGNORE INTO event_category (id, description, name) VALUES ('860742ff-6cc4-415f-be27-67373972781d', 'Freestyle Chess Tour', 'Freestyle Chess Tour');
-
-INSERT IGNORE INTO event (id, date_from, date_to, embed_url, title, url) VALUES ('557803ef-8079-4c57-81e0-d12492ab883d', '2024-11-21', '2024-11-22', 'https://www.chess.com/events/embed/2024-freestyle-chess-match-main-event', 'Carlsen vs. Caruana', 'https://www.chess.com/events/info/2024-freestyle-chess-match-carlsen-caruana');
-INSERT IGNORE INTO event_category_mapping (event_id, category_id) VALUES ('557803ef-8079-4c57-81e0-d12492ab883d', '860742ff-6cc4-415f-be27-67373972781d');
-
-INSERT IGNORE INTO event (id, date_from, date_to, embed_url, title, url) VALUES ('557803ef-8079-4c57-81e0-d12492ac883d', '2025-02-07', '2025-02-14', '', 'Freestyle Chess', '');
-INSERT IGNORE INTO event_category_mapping (event_id, category_id) VALUES ('557803ef-8079-4c57-81e0-d12492ac883d', '860742ff-6cc4-415f-be27-67373972781d');
-
--- Freestyle Chess Tour
-INSERT IGNORE INTO event_category (id, description, name) VALUES ('a9c6b26d-eda2-40d7-b6e5-c8a3beb4f935', 'Champions Chess Tour', 'Champions Chess Tour');
-
--- Champions Chess Tour Chessable Masters 2024
-INSERT IGNORE INTO event (id, date_from, date_to, embed_url, title, url) VALUES ('ab91d518-b423-450b-be08-6ab21bffe172', '2024-01-31', '2024-02-07', 'https://www.chess.com/events/embed/2024-champions-chess-tour-chessable-masters-division-1', 'Chessable Masters 2024', 'https://www.chess.com/events/info/2024-champions-chess-tour-chessable-masters');
-INSERT IGNORE INTO event_category_mapping (event_id, category_id) VALUES ('ab91d518-b423-450b-be08-6ab21bffe172', 'a9c6b26d-eda2-40d7-b6e5-c8a3beb4f935');
-
--- Champions Chess Tour Chess.com Classic 2024
-INSERT IGNORE INTO event (id, date_from, date_to, embed_url, title, url) VALUES ('1cdad317-b444-47ca-8d2a-6df837ff2b56', '2024-05-08', '2024-05-15', 'https://www.chess.com/events/embed/2024-champions-chess-tour-chesscom-classic-division-1', 'Chess.com Classic 2024', 'https://www.chess.com/events/info/2024-champions-chess-tour-chesscom-classic');
-INSERT IGNORE INTO event_category_mapping (event_id, category_id) VALUES ('1cdad317-b444-47ca-8d2a-6df837ff2b56', 'a9c6b26d-eda2-40d7-b6e5-c8a3beb4f935');
-
--- Champions Chess Tour CrunchLabs Masters 2024
-INSERT IGNORE INTO event (id, date_from, date_to, embed_url, title, url) VALUES ('059fbe8d-4b19-4988-8c8d-460b2b1ad37b', '2024-07-17', '2024-07-24', 'https://www.chess.com/events/embed/2024-champions-chess-tour-crunchlabs-masters-division-1', 'CrunchLabs Masters 2024', 'https://www.chess.com/events/info/2024-champions-chess-tour-crunchlabs-masters');
-INSERT IGNORE INTO event_category_mapping (event_id, category_id) VALUES ('059fbe8d-4b19-4988-8c8d-460b2b1ad37b', 'a9c6b26d-eda2-40d7-b6e5-c8a3beb4f935');
-
--- Champions Chess Tour Julius Baer Generation Cup 2024
-INSERT IGNORE INTO event (id, date_from, date_to, embed_url, title, url) VALUES ('b5432d3f-ca5e-4703-8aa8-895878292dbd', '2024-09-25', '2024-10-01', 'https://www.chess.com/events/embed/2024-champions-chess-tour-julius-baer-generation-cup-division-1', 'Julius Baer Generation Cup 2024', 'https://www.chess.com/events/info/2024-champions-chess-tour-julius-baer-generation-cup');
-INSERT IGNORE INTO event_category_mapping (event_id, category_id) VALUES ('b5432d3f-ca5e-4703-8aa8-895878292dbd', 'a9c6b26d-eda2-40d7-b6e5-c8a3beb4f935');
-
--- Champions Chess Tour Finals 2024
-INSERT IGNORE INTO event (id, date_from, date_to, embed_url, title, url) VALUES ('583fa28e-22e0-42a4-84cf-b00eab1a3642', '2024-12-17', '2024-12-21', 'https://www.chess.com/events/embed/2024-champions-chess-tour-finals-knockout-stage', 'Finals 2024', 'https://www.chess.com/events/2024-champions-chess-tour-finals-knockout-stage');
-INSERT IGNORE INTO event_category_mapping (event_id, category_id) VALUES ('583fa28e-22e0-42a4-84cf-b00eab1a3642', 'a9c6b26d-eda2-40d7-b6e5-c8a3beb4f935');
-
diff --git a/chess-service/src/main/resources/db/migration/V3__move_fide_infos_to_account.sql b/chess-service/src/main/resources/db/migration/V3__move_fide_infos_to_account.sql
new file mode 100644
index 00000000..2d8c1c14
--- /dev/null
+++ b/chess-service/src/main/resources/db/migration/V3__move_fide_infos_to_account.sql
@@ -0,0 +1,29 @@
+-- Modify User and account table that user infos drop into separate account
+alter table account modify platform enum ('CHESSCOM', 'LICHESS', 'OVER_THE_BOARD', 'FIDE') not null;
+UPDATE account a SET a.platform = 'FIDE' WHERE a.platform = 'OVER_THE_BOARD';
+alter table account modify platform enum ('CHESSCOM', 'LICHESS', 'FIDE') not null;
+
+INSERT INTO account (id, created_at, person_id, name, platform_id, url, username, platform)
+SELECT
+    UUID() AS id,                                                   -- Generate a new UUID for the account ID
+    NULL AS created_at,                                             -- Set created_at to NULL
+    p.id AS person_id,                                              -- Use the person's ID
+    CONCAT(p.lastname, ', ', p.firstname) AS name,                  -- Use the person's full name for the account name
+    p.fide_id AS platform_id,                                       -- Use the person's FIDE ID as the platform_id
+    CONCAT('https://ratings.fide.com/profile/', p.fide_id) AS url,  -- Generate the URL using FIDE ID
+    CONCAT(p.lastname, ', ', p.firstname) AS username,              -- Use the person's full name for the account name
+    'FIDE' AS platform                                              -- Set the platform to "FIDE"
+FROM
+    person p
+WHERE
+    p.platform_id IS NOT NULL AND p.platform_id != '' AND           -- Check that platform_id is not null and not empty
+    NOT EXISTS (                                                    -- Check if the user has already a Fide account
+        SELECT 1
+        FROM account a
+        WHERE a.person_id = p.id AND a.platform = 'FIDE'
+    );
+
+alter table account drop column url;
+alter table person drop column fide_id;
+alter table event add platform enum ('CHESSCOM', 'LICHESS', 'FIDE') NOT NULL DEFAULT 'FIDE';
+alter table event MODIFY platform ENUM('CHESSCOM', 'LICHESS', 'FIDE') NOT NULL;
\ No newline at end of file
diff --git a/website/src/app/core/models/chess/chess.models.ts b/website/src/app/core/models/chess/chess.models.ts
index d07f46cd..fc40f5e4 100644
--- a/website/src/app/core/models/chess/chess.models.ts
+++ b/website/src/app/core/models/chess/chess.models.ts
@@ -4,7 +4,6 @@ export interface Person {
   id: string
   firstname:string
   lastname:string
-  fideId?:string
   federation?:string
   birthday?:string
   gender: Gender
@@ -14,7 +13,6 @@ export interface Person {
 export interface WritePerson {
   firstname:string
   lastname:string
-  fideId?:string
   federation?:string
   birthday?:string
   gender: Gender
@@ -40,7 +38,7 @@ export interface Account {
 export enum ChessPlatform{
   CHESSCOM="CHESSCOM",
   LICHESS="LICHESS",
-  OVER_THE_BOARD="OVER_THE_BOARD"
+  FIDE="FIDE"
 }
 
 export enum ChessGameType{

From 875e1ddeba2f2bd20880fce6166e5efe9bd9e87c Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Thu, 26 Dec 2024 15:10:38 +0100
Subject: [PATCH 08/27] Refactor Account conversion and fix FIDE ID check.

Remove unused `url` field from Account conversion logic and update AccountDto and AccountConverter accordingly. Correct SQL migration to check `fide_id` instead of `platform_id` for adding FIDE accounts. Includes a placeholder for generating `url` in AccountConverter.
---
 .../kotlin/com/michibaum/chess_service/apis/dtos/AccountDto.kt  | 2 +-
 .../com/michibaum/chess_service/app/account/AccountConverter.kt | 2 +-
 .../resources/db/migration/V3__move_fide_infos_to_account.sql   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/dtos/AccountDto.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/dtos/AccountDto.kt
index 8e7667c9..f1e7daa8 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/dtos/AccountDto.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/dtos/AccountDto.kt
@@ -15,6 +15,6 @@ class AccountDto(
     val createdAt: LocalDate? = null
 ) {
     fun toAccount(id: UUID? = null, games: Set<Game> = emptySet()): Account {
-        return Account(id = id, platformId = this.id, username = username, platform = platform, url = url, name = name, person = null, createdAt = createdAt, games = games)
+        return Account(id = id, platformId = this.id, username = username, platform = platform, name = name, person = null, createdAt = createdAt, games = games)
     }
 }
\ No newline at end of file
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/account/AccountConverter.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/account/AccountConverter.kt
index a5da90f2..afd171f0 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/account/AccountConverter.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/account/AccountConverter.kt
@@ -11,7 +11,7 @@ class AccountConverter {
             id = account.idOrThrow(),
             username = account.username,
             platform = account.platform,
-            url = account.url,
+            url = "", // TODO create url
         )
     }
 
diff --git a/chess-service/src/main/resources/db/migration/V3__move_fide_infos_to_account.sql b/chess-service/src/main/resources/db/migration/V3__move_fide_infos_to_account.sql
index 2d8c1c14..4d1159c5 100644
--- a/chess-service/src/main/resources/db/migration/V3__move_fide_infos_to_account.sql
+++ b/chess-service/src/main/resources/db/migration/V3__move_fide_infos_to_account.sql
@@ -16,7 +16,7 @@ SELECT
 FROM
     person p
 WHERE
-    p.platform_id IS NOT NULL AND p.platform_id != '' AND           -- Check that platform_id is not null and not empty
+    p.fide_id IS NOT NULL AND p.fide_id != '' AND           -- Check that fide_id is not null and not empty
     NOT EXISTS (                                                    -- Check if the user has already a Fide account
         SELECT 1
         FROM account a

From da6c970a8b6ddaa82789e8721ec614d0c0563ea6 Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Fri, 27 Dec 2024 17:21:22 +0100
Subject: [PATCH 09/27] Add internalComment field to events and improve
 authentication

Introduce `internalComment` to event-related models, DTOs, and database schema to enable admin-specific notes in events. Enhance authentication processes by integrating server exchange matchers, replacing reactive authentication methods, and updating event service logic to handle permissions for admin users. Remove `fideId` from person forms as part of cleanup.
---
 .run/All Backend.run.xml                      |  13 ++
 .../AuthenticationExtensions.kt               |  15 ++
 .../ReactiveDelegateAuthenticationManager.kt  |  10 +-
 .../security/ServletAuthenticationFilter.kt   |   8 +-
 .../ServletDelegateAuthenticationManager.kt   |   9 +-
 .../security/SpecificAuthenticationManager.kt |   3 +-
 .../basic/BasicAuthenticationManager.kt       |  23 +--
 .../security/basic/BasicExchangeMatcher.kt    |  16 ++
 .../security/jwt/JwtAuthenticationManager.kt  |  25 ++--
 .../security/jwt/JwtExchangeMatcher.kt        |  26 ++++
 .../AuthenticationExtensionsUT.kt             | 141 ++++++++++++++++++
 .../security/SecurityBeansConfiguration.kt    |   4 +
 .../app/event/EventController.kt              |   2 +
 .../chess_service/app/event/EventConverter.kt |  11 ++
 .../chess_service/app/event/EventDto.kt       |   1 +
 .../chess_service/app/event/EventService.kt   |  18 +++
 .../chess_service/app/event/WriteEventDto.kt  |   2 +
 .../eventcategory/EventCategoryController.kt  |   3 +-
 .../app/person/PersonController.kt            |  40 ++---
 .../app/person/PersonRepository.kt            |   1 -
 .../chess_service/app/person/PersonService.kt |  22 +--
 .../michibaum/chess_service/domain/Event.kt   |   3 +
 .../security/SecurityBeansConfiguration.kt    |   4 +
 .../security/SecurityConfiguration.kt         |   5 +
 .../V3__move_fide_infos_to_account.sql        |   3 +-
 docs/Writerside/s.tree                        |   1 +
 docs/Writerside/topics/Authentication.md      |   7 +
 .../security/SecurityBeansConfiguration.kt    |   4 +
 .../security/SecurityBeansConfiguration.kt    |   4 +
 .../security/SecurityBeansConfiguration.kt    |   4 +
 .../chess-update-account.component.ts         |   2 +-
 .../chess-update-event.component.html         |   4 +
 .../chess-update-event.component.ts           |  10 +-
 .../chess-update-person.component.html        |   5 -
 .../chess-update-person.component.ts          |   7 -
 .../src/app/core/models/chess/chess.models.ts |   2 +
 36 files changed, 372 insertions(+), 86 deletions(-)
 create mode 100644 .run/All Backend.run.xml
 create mode 100644 authentication-library/src/main/kotlin/com/michibaum/authentication_library/AuthenticationExtensions.kt
 create mode 100644 authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/basic/BasicExchangeMatcher.kt
 create mode 100644 authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/JwtExchangeMatcher.kt
 create mode 100644 authentication-library/src/test/kotlin/com/michibaum/authentication_library/AuthenticationExtensionsUT.kt
 create mode 100644 docs/Writerside/topics/Authentication.md

diff --git a/.run/All Backend.run.xml b/.run/All Backend.run.xml
new file mode 100644
index 00000000..f1b2bd36
--- /dev/null
+++ b/.run/All Backend.run.xml	
@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="All Backend" type="CompoundRunConfigurationType">
+    <toRun name="Dev Admin-Service" type="SpringBootApplicationConfigurationType" />
+    <toRun name="Dev Authentication-Service" type="SpringBootApplicationConfigurationType" />
+    <toRun name="Dev Chess-Service" type="SpringBootApplicationConfigurationType" />
+    <toRun name="Dev Fitness-Service" type="SpringBootApplicationConfigurationType" />
+    <toRun name="Dev Gateway-Service" type="SpringBootApplicationConfigurationType" />
+    <toRun name="Dev Music-Service" type="SpringBootApplicationConfigurationType" />
+    <toRun name="Dev Registry-Service" type="SpringBootApplicationConfigurationType" />
+    <toRun name="Dev Usermanagement-Service" type="SpringBootApplicationConfigurationType" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/AuthenticationExtensions.kt b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/AuthenticationExtensions.kt
new file mode 100644
index 00000000..397001ac
--- /dev/null
+++ b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/AuthenticationExtensions.kt
@@ -0,0 +1,15 @@
+package com.michibaum.authentication_library
+
+import com.michibaum.permission_library.Permissions
+import org.springframework.security.core.Authentication
+
+fun Authentication.anyOf(vararg permissions: Permissions): Boolean {
+    if (permissions.isEmpty())
+        return true
+
+    return permissions.any { permission ->
+        authorities.any {
+                a -> a.authority == permission.name
+        }
+    }
+}
diff --git a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ReactiveDelegateAuthenticationManager.kt b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ReactiveDelegateAuthenticationManager.kt
index 261f59a0..6079361a 100644
--- a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ReactiveDelegateAuthenticationManager.kt
+++ b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ReactiveDelegateAuthenticationManager.kt
@@ -2,6 +2,7 @@ package com.michibaum.authentication_library.security
 
 import org.springframework.security.authentication.ReactiveAuthenticationManager
 import org.springframework.security.core.Authentication
+import org.springframework.security.core.context.ReactiveSecurityContextHolder
 import reactor.core.publisher.Mono
 
 class ReactiveDelegateAuthenticationManager(private val authenticationManagers: List<SpecificAuthenticationManager>): ReactiveAuthenticationManager {
@@ -10,14 +11,15 @@ class ReactiveDelegateAuthenticationManager(private val authenticationManagers:
             return Mono.empty()
         }
 
-        for(auth in authenticationManagers){
-            if(auth.supports(authentication.javaClass)){
-                return auth.authenticate(authentication)
+        for(authManager in authenticationManagers){
+            if(authManager.supports(authentication.javaClass)){
+                val auth = authManager.authenticate(authentication) ?: return Mono.error(Exception("Empty authentication"))
+                ReactiveSecurityContextHolder.withAuthentication(auth)
+                return Mono.just(authentication)
             }
         }
 
         throw NoAuthenticationManagerException("No authentication Manager found for ${authentication::class}")
-
     }
 
 
diff --git a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ServletAuthenticationFilter.kt b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ServletAuthenticationFilter.kt
index 6bdfef74..2301e7ca 100644
--- a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ServletAuthenticationFilter.kt
+++ b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ServletAuthenticationFilter.kt
@@ -37,11 +37,9 @@ class ServletAuthenticationFilter(private val authenticationManager: Authenticat
     ) {
         try {
 
-            val authenticationResult: Authentication? = converters.map { converter: AuthenticationConverter -> converter.convert(request) }
-                .filterNotNull()
-                .map { authentication -> authenticationManager.authenticate(authentication) }
-                .filterNotNull()
-                .firstOrNull()
+            val authenticationResult: Authentication? =
+                converters.mapNotNull { converter: AuthenticationConverter -> converter.convert(request) }
+                    .firstNotNullOfOrNull { authentication -> authenticationManager.authenticate(authentication) }
 
             if (authenticationResult == null) {
                 filterChain.doFilter(request, response)
diff --git a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ServletDelegateAuthenticationManager.kt b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ServletDelegateAuthenticationManager.kt
index 82b02d0e..449a9e61 100644
--- a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ServletDelegateAuthenticationManager.kt
+++ b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ServletDelegateAuthenticationManager.kt
@@ -2,6 +2,7 @@ package com.michibaum.authentication_library.security
 
 import org.springframework.security.authentication.AuthenticationManager
 import org.springframework.security.core.Authentication
+import org.springframework.security.core.context.SecurityContextHolder
 
 class ServletDelegateAuthenticationManager(private val authenticationManagers: List<SpecificAuthenticationManager>): AuthenticationManager {
     override fun authenticate(authentication: Authentication?): Authentication {
@@ -9,9 +10,11 @@ class ServletDelegateAuthenticationManager(private val authenticationManagers: L
             throw Exception("Empty authentication")
         }
 
-        for(auth in authenticationManagers){
-            if(auth.supports(authentication.javaClass)){
-                return auth.authenticate(authentication).block() ?: throw Exception("Empty authentication")
+        for(authManager in authenticationManagers){
+            if(authManager.supports(authentication.javaClass)){
+                val auth =  authManager.authenticate(authentication) ?: throw Exception("Empty authentication")
+                SecurityContextHolder.getContext().authentication = auth
+                return auth
             }
         }
 
diff --git a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/SpecificAuthenticationManager.kt b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/SpecificAuthenticationManager.kt
index 2bfcebf8..9b837753 100644
--- a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/SpecificAuthenticationManager.kt
+++ b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/SpecificAuthenticationManager.kt
@@ -2,12 +2,11 @@ package com.michibaum.authentication_library.security
 
 import org.springframework.security.core.Authentication
 import org.springframework.security.core.AuthenticationException
-import reactor.core.publisher.Mono
 
 interface SpecificAuthenticationManager {
 
     @Throws(AuthenticationException::class)
-    fun authenticate(authentication: Authentication): Mono<Authentication>
+    fun authenticate(authentication: Authentication): Authentication?
 
     fun supports(authentication: Class<*>): Boolean
 
diff --git a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/basic/BasicAuthenticationManager.kt b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/basic/BasicAuthenticationManager.kt
index 3e94d847..bc60c88b 100644
--- a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/basic/BasicAuthenticationManager.kt
+++ b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/basic/BasicAuthenticationManager.kt
@@ -2,20 +2,23 @@ package com.michibaum.authentication_library.security.basic
 
 import com.michibaum.authentication_library.security.SpecificAuthenticationManager
 import org.springframework.security.core.Authentication
-import reactor.core.publisher.Mono
 
 class BasicAuthenticationManager(private val credentialsValidator: CredentialsValidator):
     SpecificAuthenticationManager {
 
-    override fun authenticate(authentication: Authentication): Mono<Authentication> {
-        return Mono.just(authentication)
-            .cast(BasicAuthentication::class.java)
-            .map { basic: BasicAuthentication ->
-                val valid = credentialsValidator.validate(basic)
-                basic.apply { isAuthenticated = valid }
-            }
-            .switchIfEmpty(Mono.error(BasicAuthenticationException("")))
-            .cast(Authentication::class.java)
+    override fun authenticate(authentication: Authentication): Authentication? {
+
+        if (authentication !is BasicAuthentication) {
+            return null
+        }
+
+        val valid = credentialsValidator.validate(authentication)
+        if (!valid) {
+            return null
+        }
+        authentication.isAuthenticated = true
+
+        return authentication
     }
 
     override fun supports(authentication: Class<*>): Boolean {
diff --git a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/basic/BasicExchangeMatcher.kt b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/basic/BasicExchangeMatcher.kt
new file mode 100644
index 00000000..12bc311b
--- /dev/null
+++ b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/basic/BasicExchangeMatcher.kt
@@ -0,0 +1,16 @@
+package com.michibaum.authentication_library.security.basic
+
+import org.springframework.http.HttpHeaders
+import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher
+import org.springframework.web.server.ServerWebExchange
+import reactor.core.publisher.Mono
+
+class BasicExchangeMatcher: ServerWebExchangeMatcher {
+    override fun matches(exchange: ServerWebExchange?): Mono<ServerWebExchangeMatcher.MatchResult> {
+        val authHeader = exchange?.request?.headers?.getFirst(HttpHeaders.AUTHORIZATION)
+        if(authHeader != null && authHeader.startsWith("Basic ")) {
+            return ServerWebExchangeMatcher.MatchResult.match()
+        }
+        return ServerWebExchangeMatcher.MatchResult.notMatch()
+    }
+}
\ No newline at end of file
diff --git a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/JwtAuthenticationManager.kt b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/JwtAuthenticationManager.kt
index e71232c2..265442cc 100644
--- a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/JwtAuthenticationManager.kt
+++ b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/JwtAuthenticationManager.kt
@@ -4,22 +4,21 @@ import com.michibaum.authentication_library.JwsValidationFailed
 import com.michibaum.authentication_library.JwsValidationSuccess
 import com.michibaum.authentication_library.security.SpecificAuthenticationManager
 import org.springframework.security.core.Authentication
-import reactor.core.publisher.Mono
 
 class JwtAuthenticationManager(private val jwtService: JwsValidator): SpecificAuthenticationManager {
 
-    override fun authenticate(authentication: Authentication): Mono<Authentication> {
-        return Mono.just(authentication)
-            .cast(JwtAuthentication::class.java)
-            .map { jwtAuthentication: JwtAuthentication ->
-                val result = jwtService.validate(jwtAuthentication.token)
-                when (result) {
-                    is JwsValidationSuccess -> jwtAuthentication.apply { isAuthenticated = true }
-                    is JwsValidationFailed -> jwtAuthentication.apply { isAuthenticated = false }
-                }
-            }
-            .switchIfEmpty(Mono.error(JwtAuthenticationException("")))
-            .cast(Authentication::class.java)
+    override fun authenticate(authentication: Authentication): Authentication? {
+
+        if(authentication !is JwtAuthentication){
+            return null
+        }
+        val result = jwtService.validate(authentication.token)
+        when (result) {
+            is JwsValidationSuccess -> authentication.apply { isAuthenticated = true }
+            is JwsValidationFailed -> authentication.apply { isAuthenticated = false }
+        }
+
+        return authentication
     }
 
     override fun supports(authentication: Class<*>): Boolean {
diff --git a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/JwtExchangeMatcher.kt b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/JwtExchangeMatcher.kt
new file mode 100644
index 00000000..0e08b3a4
--- /dev/null
+++ b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/JwtExchangeMatcher.kt
@@ -0,0 +1,26 @@
+package com.michibaum.authentication_library.security.jwt
+
+import org.springframework.http.HttpHeaders
+import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher
+import org.springframework.web.server.ServerWebExchange
+import reactor.core.publisher.Mono
+
+class JwtExchangeMatcher: ServerWebExchangeMatcher {
+    override fun matches(exchange: ServerWebExchange?): Mono<ServerWebExchangeMatcher.MatchResult> {
+
+        val header = exchange?.request?.headers?.getFirst(HttpHeaders.AUTHORIZATION)
+
+        if(header != null && header.startsWith("Bearer ")) {
+            return ServerWebExchangeMatcher.MatchResult.match()
+        }
+
+        val cookie = exchange?.request?.cookies?.getFirst("jwt")?.value
+
+        if(!cookie.isNullOrBlank()) {
+            return ServerWebExchangeMatcher.MatchResult.match()
+        }
+
+        return ServerWebExchangeMatcher.MatchResult.notMatch()
+
+    }
+}
\ No newline at end of file
diff --git a/authentication-library/src/test/kotlin/com/michibaum/authentication_library/AuthenticationExtensionsUT.kt b/authentication-library/src/test/kotlin/com/michibaum/authentication_library/AuthenticationExtensionsUT.kt
new file mode 100644
index 00000000..1b6bd22b
--- /dev/null
+++ b/authentication-library/src/test/kotlin/com/michibaum/authentication_library/AuthenticationExtensionsUT.kt
@@ -0,0 +1,141 @@
+package com.michibaum.authentication_library
+
+import com.michibaum.permission_library.Permissions
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+import org.springframework.security.core.Authentication
+import org.springframework.security.core.GrantedAuthority
+
+class AuthenticationExtensionsUT {
+
+    @Test
+    fun `without input should return true`(){
+        //  GIVEN
+        val authorities = mutableListOf(GrantedAuthority { Permissions.ADMIN_SERVICE.name })
+        val auth = TestAuthentication(authorities)
+
+        // WHEN
+        val result = auth.anyOf()
+
+        // THEN
+        Assertions.assertTrue(result)
+    }
+
+    @Test
+    fun `without input and empty authentication should return true`(){
+        //  GIVEN
+        val authorities = mutableListOf<GrantedAuthority>()
+        val auth = TestAuthentication(authorities)
+
+        // WHEN
+        val result = auth.anyOf()
+
+        // THEN
+        Assertions.assertTrue(result)
+    }
+
+    @Test
+    fun `with input and empty authentication should return false`(){
+        //  GIVEN
+        val authorities = mutableListOf<GrantedAuthority>()
+        val auth = TestAuthentication(authorities)
+
+        // WHEN
+        val result = auth.anyOf(Permissions.ADMIN_SERVICE)
+
+        // THEN
+        Assertions.assertFalse(result)
+    }
+
+    @Test
+    fun `has exact permission should return true`(){
+        //  GIVEN
+        val authorities = mutableListOf(GrantedAuthority { Permissions.ADMIN_SERVICE.name })
+        val auth = TestAuthentication(authorities)
+
+        // WHEN
+        val result = auth.anyOf(Permissions.ADMIN_SERVICE)
+
+        // THEN
+        Assertions.assertTrue(result)
+    }
+
+    @Test
+    fun `is one of permission should return true`(){
+        //  GIVEN
+        val authorities = mutableListOf(
+            GrantedAuthority { Permissions.CHESS_SERVICE_ADMIN.name },
+            GrantedAuthority { Permissions.ADMIN_SERVICE.name },
+            GrantedAuthority { Permissions.FITNESS_SERVICE.name },
+            )
+        val auth = TestAuthentication(authorities)
+
+        // WHEN
+        val result = auth.anyOf(Permissions.ADMIN_SERVICE)
+
+        // THEN
+        Assertions.assertTrue(result)
+    }
+
+    @Test
+    fun `does not have permission should return false`(){
+        //  GIVEN
+        val authorities = mutableListOf(
+            GrantedAuthority { Permissions.CHESS_SERVICE_ADMIN.name },
+            GrantedAuthority { Permissions.ADMIN_SERVICE.name },
+            GrantedAuthority { Permissions.FITNESS_SERVICE.name },
+        )
+        val auth = TestAuthentication(authorities)
+
+        // WHEN
+        val result = auth.anyOf(Permissions.REGISTRY_SERVICE)
+
+        // THEN
+        Assertions.assertFalse(result)
+    }
+
+    @Test
+    fun `has exact permissions should return true`(){
+        //  GIVEN
+        val authorities = mutableListOf(
+            GrantedAuthority { Permissions.CHESS_SERVICE_ADMIN.name },
+            GrantedAuthority { Permissions.FITNESS_SERVICE.name },
+        )
+        val auth = TestAuthentication(authorities)
+
+        // WHEN
+        val result = auth.anyOf(Permissions.CHESS_SERVICE_ADMIN, Permissions.FITNESS_SERVICE)
+
+        // THEN
+        Assertions.assertTrue(result)
+    }
+
+    @Test
+    fun `has one of permissions should return true`(){
+        //  GIVEN
+        val authorities = mutableListOf(
+            GrantedAuthority { Permissions.CHESS_SERVICE_ADMIN.name },
+            GrantedAuthority { Permissions.FITNESS_SERVICE.name },
+            GrantedAuthority { Permissions.USERMANAGEMENT_SERVICE_EDIT_OWN_USER.name },
+        )
+        val auth = TestAuthentication(authorities)
+
+        // WHEN
+        val result = auth.anyOf(Permissions.MUSIC_SERVICE, Permissions.FITNESS_SERVICE)
+
+        // THEN
+        Assertions.assertTrue(result)
+    }
+
+
+}
+
+class TestAuthentication(private val authoritiesParam: MutableCollection<GrantedAuthority> = mutableListOf()) : Authentication {
+    override fun getName(): String = ""
+    override fun getAuthorities(): MutableCollection<out GrantedAuthority> = authoritiesParam
+    override fun getCredentials(): Any = ""
+    override fun getDetails(): Any = ""
+    override fun getPrincipal(): Any = ""
+    override fun isAuthenticated(): Boolean = false
+    override fun setAuthenticated(isAuthenticated: Boolean) = Unit
+}
\ No newline at end of file
diff --git a/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityBeansConfiguration.kt b/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityBeansConfiguration.kt
index c3e40764..76f46819 100644
--- a/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityBeansConfiguration.kt
+++ b/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityBeansConfiguration.kt
@@ -5,10 +5,12 @@ import com.michibaum.authentication_library.PublicKeyDto
 import com.michibaum.authentication_library.security.ReactiveDelegateAuthenticationManager
 import com.michibaum.authentication_library.security.SpecificAuthenticationManager
 import com.michibaum.authentication_library.security.basic.BasicAuthenticationManager
+import com.michibaum.authentication_library.security.basic.BasicExchangeMatcher
 import com.michibaum.authentication_library.security.basic.CredentialsValidator
 import com.michibaum.authentication_library.security.basic.netty.BasicAuthenticationConverter
 import com.michibaum.authentication_library.security.jwt.JwsValidator
 import com.michibaum.authentication_library.security.jwt.JwtAuthenticationManager
+import com.michibaum.authentication_library.security.jwt.JwtExchangeMatcher
 import com.michibaum.authentication_library.security.jwt.netty.JwtAuthenticationConverter
 import com.michibaum.authentication_service.authentication.AuthenticationService
 import org.springframework.context.annotation.Bean
@@ -74,6 +76,7 @@ class SecurityBeansConfiguration {
         jwtAuthenticationConverter: JwtAuthenticationConverter
     ) =
         AuthenticationWebFilter(authenticationManager).apply {
+            setRequiresAuthenticationMatcher(JwtExchangeMatcher())
             setServerAuthenticationConverter(jwtAuthenticationConverter)
         }
 
@@ -83,6 +86,7 @@ class SecurityBeansConfiguration {
         basicAuthenticationConverter: BasicAuthenticationConverter
     ) =
         AuthenticationWebFilter(authenticationManager).apply {
+            setRequiresAuthenticationMatcher(BasicExchangeMatcher())
             setServerAuthenticationConverter(basicAuthenticationConverter)
         }
 
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventController.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventController.kt
index 0cb31ceb..8eb3494a 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventController.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventController.kt
@@ -1,5 +1,6 @@
 package com.michibaum.chess_service.app.event
 
+import com.michibaum.authentication_library.security.jwt.JwtAuthentication
 import com.michibaum.chess_service.app.game.GameConverter
 import com.michibaum.chess_service.app.game.GameDto
 import com.michibaum.chess_service.app.game.GameService
@@ -8,6 +9,7 @@ import com.michibaum.chess_service.app.person.PersonDto
 import jakarta.validation.Valid
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
+import org.springframework.security.core.context.ReactiveSecurityContextHolder
 import org.springframework.transaction.annotation.Isolation
 import org.springframework.transaction.annotation.Propagation
 import org.springframework.transaction.annotation.Transactional
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt
index fad5b63a..bca07e84 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt
@@ -1,8 +1,13 @@
 package com.michibaum.chess_service.app.event
 
+import com.michibaum.authentication_library.anyOf
+import com.michibaum.authentication_library.security.jwt.JwtAuthentication
 import com.michibaum.chess_service.app.eventcategory.EventCategoryConverter
 import com.michibaum.chess_service.app.person.PersonConverter
 import com.michibaum.chess_service.domain.Event
+import com.michibaum.permission_library.Permissions
+import org.springframework.security.core.context.ReactiveSecurityContextHolder
+import org.springframework.security.core.context.SecurityContextHolder
 import org.springframework.stereotype.Component
 
 @Component
@@ -20,9 +25,15 @@ class EventConverter(
             embedUrl = event.embedUrl,
             dateFrom = event.dateFrom.toString(),
             dateTo = event.dateTo.toString(),
+            internalComment = getInternalComment(event.internalComment),
             categories = event.categories.map { eventCategoryConverter.toDto(it) },
             participants = event.participants.map { personConverter.convert(it) }
         )
     }
 
+    private fun getInternalComment(comment: String): String {
+        val authentication = ReactiveSecurityContextHolder.getContext().map { it.authentication }.block()
+        return if (authentication != null && authentication.anyOf(Permissions.CHESS_SERVICE_ADMIN)) comment else ""
+    }
+
 }
\ No newline at end of file
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventDto.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventDto.kt
index 6cb66e48..173650a2 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventDto.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventDto.kt
@@ -12,6 +12,7 @@ data class EventDto(
     val embedUrl: String? = null,
     val dateFrom: String? = null,
     val dateTo: String? = null,
+    val internalComment: String = "",
     val categories: List<EventCategoryDto> = mutableListOf(),
     val participants: List<PersonDto> = mutableListOf(),
 )
\ No newline at end of file
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventService.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventService.kt
index ec265997..e0867649 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventService.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventService.kt
@@ -1,13 +1,17 @@
 package com.michibaum.chess_service.app.event
 
+import com.michibaum.authentication_library.anyOf
+import com.michibaum.authentication_library.security.jwt.JwtAuthentication
 import com.michibaum.chess_service.app.eventcategory.EventCategoryService
 import com.michibaum.chess_service.app.person.PersonRepository
 import com.michibaum.chess_service.domain.Event
 import com.michibaum.chess_service.domain.EventCategory
 import com.michibaum.chess_service.domain.Person
+import com.michibaum.permission_library.Permissions
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.PageRequest
 import org.springframework.data.jpa.domain.Specification
+import org.springframework.security.core.context.SecurityContextHolder
 import org.springframework.stereotype.Service
 import java.time.LocalDate
 import java.util.*
@@ -33,6 +37,12 @@ class EventService(
         val categories = getCategories(dto.categoryIds)
         val participants = getPersons(dto.participantsIds)
 
+        val authentication = SecurityContextHolder.getContext().authentication
+        val internalComment = if (authentication != null && authentication.anyOf(Permissions.CHESS_SERVICE_ADMIN))
+            dto.internalComment
+        else
+            ""
+
         val event = Event(
             title = dto.title,
             location = dto.location,
@@ -40,6 +50,7 @@ class EventService(
             embedUrl = dto.embedUrl,
             dateFrom = LocalDate.parse(dto.dateFrom),
             dateTo = LocalDate.parse(dto.dateTo),
+            internalComment = internalComment,
             categories = categories,
             participants = participants
         )
@@ -50,6 +61,12 @@ class EventService(
         val categories = getCategories(dto.categoryIds)
         val participants = getPersons(dto.participantsIds)
 
+        val authentication = SecurityContextHolder.getContext().authentication
+        val internalComment = if (authentication != null && authentication.anyOf(Permissions.CHESS_SERVICE_ADMIN))
+            dto.internalComment
+        else
+            event.internalComment
+
         val newEvent = Event(
             title = dto.title,
             location = dto.location,
@@ -57,6 +74,7 @@ class EventService(
             embedUrl = dto.embedUrl,
             dateFrom = LocalDate.parse(dto.dateFrom),
             dateTo = LocalDate.parse(dto.dateTo),
+            internalComment = internalComment,
             categories = categories,
             participants = participants,
             id = event.id
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/WriteEventDto.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/WriteEventDto.kt
index 191d9468..5604a3d0 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/WriteEventDto.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/WriteEventDto.kt
@@ -21,6 +21,8 @@ class WriteEventDto(
 
     val embedUrl: String? = null,
 
+    val internalComment: String = "",
+
     val categoryIds: List<String> = mutableListOf(),
 
     val participantsIds: List<String> = mutableListOf()
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryController.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryController.kt
index 6ac9140c..15b0cf2e 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryController.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryController.kt
@@ -1,5 +1,6 @@
 package com.michibaum.chess_service.app.eventcategory
 
+import com.michibaum.authentication_library.security.jwt.JwtAuthentication
 import com.michibaum.chess_service.app.event.EventConverter
 import com.michibaum.chess_service.app.event.EventService
 import jakarta.validation.Valid
@@ -29,7 +30,7 @@ class EventCategoryController(
 
     @Transactional(propagation = Propagation.REQUIRED, readOnly = true, isolation = Isolation.REPEATABLE_READ)
     @GetMapping("/api/event-categories/with-events")
-    fun getEventCategoriesWithEvents(): ResponseEntity<List<EventCategoryWithEventDto>> {
+    fun getEventCategoriesWithEvents(principal: JwtAuthentication): ResponseEntity<List<EventCategoryWithEventDto>> {
         val dtos = service.getAll().map { category ->
             val eventDtos = eventService.findByCategoryId(category.idOrThrow()).map { event -> eventConverter.toDto(event) }
             converter.toDto(category, eventDtos)
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonController.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonController.kt
index c5d88dc0..fe6855cb 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonController.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonController.kt
@@ -80,26 +80,26 @@ class PersonController(
         return ResponseEntity(persons, HttpStatus.OK)
     }
 
-    @Transactional(propagation = Propagation.REQUIRED, readOnly = false, isolation = Isolation.REPEATABLE_READ)
-    @PostMapping(value = ["/api/fide/ratings"], consumes = [MediaType.MULTIPART_FORM_DATA_VALUE], produces = [MediaType.APPLICATION_JSON_VALUE])
-    fun fideImport(@RequestPart("file") filePartMono: Mono<FilePart>): Mono<ResponseEntity<FileImportResult>> {
-        val processFileContent: (InputStream) -> List<Person> = { stream ->
-            fideApiService.getPersons(stream).let {
-                personService.createAndUpdate(it)
-            }
-        }
-        return filePartMono.flatMap { filePart ->
-            processFilePart(filePart.content(), processFileContent)
-        }.map { processedContent ->
-            val importResult = FileImportResult("", true)
-            ResponseEntity(importResult, HttpStatus.OK)
-        }.doOnError { error ->
-            println("Error occurred: ${error.message}")
-        }.onErrorResume {
-            val importResult = FileImportResult("", false)
-            Mono.just(ResponseEntity(importResult, HttpStatus.INTERNAL_SERVER_ERROR))
-        }
-    }
+//    @Transactional(propagation = Propagation.REQUIRED, readOnly = false, isolation = Isolation.REPEATABLE_READ)
+//    @PostMapping(value = ["/api/fide/ratings"], consumes = [MediaType.MULTIPART_FORM_DATA_VALUE], produces = [MediaType.APPLICATION_JSON_VALUE])
+//    fun fideImport(@RequestPart("file") filePartMono: Mono<FilePart>): Mono<ResponseEntity<FileImportResult>> {
+//        val processFileContent: (InputStream) -> List<Person> = { stream ->
+//            fideApiService.getPersons(stream).let {
+//                personService.createAndUpdate(it)
+//            }
+//        }
+//        return filePartMono.flatMap { filePart ->
+//            processFilePart(filePart.content(), processFileContent)
+//        }.map { processedContent ->
+//            val importResult = FileImportResult("", true)
+//            ResponseEntity(importResult, HttpStatus.OK)
+//        }.doOnError { error ->
+//            println("Error occurred: ${error.message}")
+//        }.onErrorResume {
+//            val importResult = FileImportResult("", false)
+//            Mono.just(ResponseEntity(importResult, HttpStatus.INTERNAL_SERVER_ERROR))
+//        }
+//    }
 
     private fun <T> processFilePart(content: Flux<DataBuffer>, processFileContent: (InputStream) -> T): Mono<T> {
         return DataBufferUtils.join(content).map { dataBuffer ->
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonRepository.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonRepository.kt
index 8a565bec..88eb3c6a 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonRepository.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonRepository.kt
@@ -8,5 +8,4 @@ interface PersonRepository: JpaRepository<Person, UUID> {
     fun findByFirstnameContainingIgnoreCaseOrLastnameContainingIgnoreCase(firstname: String, lastname: String): Set<Person>
     fun findByFirstnameContainingIgnoreCase(firstname: String): Set<Person>
     fun findByLastnameContainingIgnoreCase(lastname: String): Set<Person>
-    fun findByFideId(fideId: String): Person?
 }
\ No newline at end of file
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonService.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonService.kt
index 946ebf4a..27704301 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonService.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonService.kt
@@ -55,17 +55,17 @@ class PersonService(
         return personRepository.findAll()
     }
 
-    fun createAndUpdate(persons: List<FidePersonDto>): List<Person> {
-        return persons.map {
-            val foundPerson = personRepository.findByFideId(it.fideId)
-            if (foundPerson != null) {
-                val updatedPerson = it.toPerson(id = foundPerson.idOrThrow(), birthDay = foundPerson.birthday, accounts = foundPerson.accounts)
-                personRepository.save(updatedPerson)
-            } else {
-                personRepository.save(it.toPerson())
-            }
-        }.toList()
-    }
+//    fun createAndUpdate(persons: List<FidePersonDto>): List<Person> {
+//        return persons.map {
+//            val foundPerson = personRepository.findByFideId(it.fideId)
+//            if (foundPerson != null) {
+//                val updatedPerson = it.toPerson(id = foundPerson.idOrThrow(), birthDay = foundPerson.birthday, accounts = foundPerson.accounts)
+//                personRepository.save(updatedPerson)
+//            } else {
+//                personRepository.save(it.toPerson())
+//            }
+//        }.toList()
+//    }
 
     fun find(uuid: UUID): Person? =
         personRepository.findById(uuid).getOrNull()
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/Event.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/Event.kt
index e5e1d568..df8670b1 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/Event.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/Event.kt
@@ -27,6 +27,9 @@ class Event(
     @Temporal(TemporalType.DATE)
     val dateTo: LocalDate,
 
+    @Column(nullable = false, columnDefinition = "TEXT")
+    val internalComment: String,
+
     @ManyToMany(fetch = FetchType.LAZY, targetEntity = EventCategory::class)
     @JoinTable(name = "EVENT_CATEGORY_MAPPING", joinColumns = [JoinColumn(name = "event_id")], inverseJoinColumns = [JoinColumn(name = "category_id")])
     val categories: Set<EventCategory> = setOf(),
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityBeansConfiguration.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityBeansConfiguration.kt
index a95c7a35..f172baef 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityBeansConfiguration.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityBeansConfiguration.kt
@@ -4,10 +4,12 @@ import com.michibaum.authentication_library.AuthenticationClient
 import com.michibaum.authentication_library.security.ReactiveDelegateAuthenticationManager
 import com.michibaum.authentication_library.security.SpecificAuthenticationManager
 import com.michibaum.authentication_library.security.basic.BasicAuthenticationManager
+import com.michibaum.authentication_library.security.basic.BasicExchangeMatcher
 import com.michibaum.authentication_library.security.basic.CredentialsValidator
 import com.michibaum.authentication_library.security.basic.netty.BasicAuthenticationConverter
 import com.michibaum.authentication_library.security.jwt.JwsValidator
 import com.michibaum.authentication_library.security.jwt.JwtAuthenticationManager
+import com.michibaum.authentication_library.security.jwt.JwtExchangeMatcher
 import com.michibaum.authentication_library.security.jwt.netty.JwtAuthenticationConverter
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -67,6 +69,7 @@ class SecurityBeansConfiguration {
         jwtAuthenticationConverter: JwtAuthenticationConverter
     ) =
         AuthenticationWebFilter(authenticationManager).apply {
+            setRequiresAuthenticationMatcher(JwtExchangeMatcher())
             setServerAuthenticationConverter(jwtAuthenticationConverter)
         }
 
@@ -76,6 +79,7 @@ class SecurityBeansConfiguration {
         basicAuthenticationConverter: BasicAuthenticationConverter
     ) =
         AuthenticationWebFilter(authenticationManager).apply {
+            setRequiresAuthenticationMatcher(BasicExchangeMatcher())
             setServerAuthenticationConverter(basicAuthenticationConverter)
         }
 
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityConfiguration.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityConfiguration.kt
index d7e34305..80a85326 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityConfiguration.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityConfiguration.kt
@@ -4,11 +4,14 @@ import com.michibaum.permission_library.Permissions
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpMethod
+import org.springframework.security.authentication.AuthenticationManager
+import org.springframework.security.authentication.ReactiveAuthenticationManager
 import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity
 import org.springframework.security.config.web.server.SecurityWebFiltersOrder
 import org.springframework.security.config.web.server.ServerHttpSecurity
 import org.springframework.security.config.web.server.ServerHttpSecurity.AuthorizeExchangeSpec
+import org.springframework.security.config.web.server.ServerHttpSecurity.http
 import org.springframework.security.web.server.SecurityWebFilterChain
 import org.springframework.security.web.server.authentication.AuthenticationWebFilter
 
@@ -23,6 +26,7 @@ class SecurityConfiguration {
         http: ServerHttpSecurity,
         jwtAuthenticationWebFilter: AuthenticationWebFilter,
         basicAuthenticationWebFilter: AuthenticationWebFilter,
+        authenticationManager: ReactiveAuthenticationManager
     ): SecurityWebFilterChain {
         return http
             .authorizeExchange { exchanges: AuthorizeExchangeSpec ->
@@ -43,6 +47,7 @@ class SecurityConfiguration {
             }
             .addFilterAt(basicAuthenticationWebFilter, SecurityWebFiltersOrder.AUTHENTICATION)
             .addFilterAt(jwtAuthenticationWebFilter, SecurityWebFiltersOrder.AUTHENTICATION)
+            .authenticationManager(authenticationManager)
             .httpBasic { httpBasicSpec -> httpBasicSpec.disable() }
             .formLogin { formLoginSpec -> formLoginSpec.disable() }
             .csrf { csrfSpec -> csrfSpec.disable() }
diff --git a/chess-service/src/main/resources/db/migration/V3__move_fide_infos_to_account.sql b/chess-service/src/main/resources/db/migration/V3__move_fide_infos_to_account.sql
index 4d1159c5..8618b80b 100644
--- a/chess-service/src/main/resources/db/migration/V3__move_fide_infos_to_account.sql
+++ b/chess-service/src/main/resources/db/migration/V3__move_fide_infos_to_account.sql
@@ -26,4 +26,5 @@ WHERE
 alter table account drop column url;
 alter table person drop column fide_id;
 alter table event add platform enum ('CHESSCOM', 'LICHESS', 'FIDE') NOT NULL DEFAULT 'FIDE';
-alter table event MODIFY platform ENUM('CHESSCOM', 'LICHESS', 'FIDE') NOT NULL;
\ No newline at end of file
+alter table event MODIFY platform ENUM('CHESSCOM', 'LICHESS', 'FIDE') NOT NULL;
+alter table event add internal_comment TEXT default '' not null;
\ No newline at end of file
diff --git a/docs/Writerside/s.tree b/docs/Writerside/s.tree
index 39e9838a..57c231d4 100644
--- a/docs/Writerside/s.tree
+++ b/docs/Writerside/s.tree
@@ -17,6 +17,7 @@
     <toc-element topic="Database.md">
         <toc-element topic="Flyway.md"/>
     </toc-element>
+    <toc-element topic="Authentication.md"/>
     <toc-element topic="Services.md">
         <toc-element topic="Website-Service.md"/>
         <toc-element topic="Usermanagement-Service.md"/>
diff --git a/docs/Writerside/topics/Authentication.md b/docs/Writerside/topics/Authentication.md
new file mode 100644
index 00000000..a19b15b3
--- /dev/null
+++ b/docs/Writerside/topics/Authentication.md
@@ -0,0 +1,7 @@
+# Authentication
+
+https://docs.spring.io/spring-security/reference/servlet/authentication/architecture.html
+
+
+https://docs.spring.io/spring-security/reference/servlet/index.html
+https://docs.spring.io/spring-security/reference/reactive/index.html
\ No newline at end of file
diff --git a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/security/SecurityBeansConfiguration.kt b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/security/SecurityBeansConfiguration.kt
index b021fe0d..6aa49772 100644
--- a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/security/SecurityBeansConfiguration.kt
+++ b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/security/SecurityBeansConfiguration.kt
@@ -4,10 +4,12 @@ import com.michibaum.authentication_library.AuthenticationClient
 import com.michibaum.authentication_library.security.ReactiveDelegateAuthenticationManager
 import com.michibaum.authentication_library.security.SpecificAuthenticationManager
 import com.michibaum.authentication_library.security.basic.BasicAuthenticationManager
+import com.michibaum.authentication_library.security.basic.BasicExchangeMatcher
 import com.michibaum.authentication_library.security.basic.CredentialsValidator
 import com.michibaum.authentication_library.security.basic.netty.BasicAuthenticationConverter
 import com.michibaum.authentication_library.security.jwt.JwsValidator
 import com.michibaum.authentication_library.security.jwt.JwtAuthenticationManager
+import com.michibaum.authentication_library.security.jwt.JwtExchangeMatcher
 import com.michibaum.authentication_library.security.jwt.netty.JwtAuthenticationConverter
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -67,6 +69,7 @@ class SecurityBeansConfiguration {
         jwtAuthenticationConverter: JwtAuthenticationConverter
     ) =
         AuthenticationWebFilter(authenticationManager).apply {
+            setRequiresAuthenticationMatcher(JwtExchangeMatcher())
             setServerAuthenticationConverter(jwtAuthenticationConverter)
         }
 
@@ -76,6 +79,7 @@ class SecurityBeansConfiguration {
         basicAuthenticationConverter: BasicAuthenticationConverter
     ) =
         AuthenticationWebFilter(authenticationManager).apply {
+            setRequiresAuthenticationMatcher(BasicExchangeMatcher())
             setServerAuthenticationConverter(basicAuthenticationConverter)
         }
 
diff --git a/music-service/src/main/kotlin/com/michibaum/music_service/security/SecurityBeansConfiguration.kt b/music-service/src/main/kotlin/com/michibaum/music_service/security/SecurityBeansConfiguration.kt
index b67b4540..2a5bed02 100644
--- a/music-service/src/main/kotlin/com/michibaum/music_service/security/SecurityBeansConfiguration.kt
+++ b/music-service/src/main/kotlin/com/michibaum/music_service/security/SecurityBeansConfiguration.kt
@@ -4,10 +4,12 @@ import com.michibaum.authentication_library.AuthenticationClient
 import com.michibaum.authentication_library.security.ReactiveDelegateAuthenticationManager
 import com.michibaum.authentication_library.security.SpecificAuthenticationManager
 import com.michibaum.authentication_library.security.basic.BasicAuthenticationManager
+import com.michibaum.authentication_library.security.basic.BasicExchangeMatcher
 import com.michibaum.authentication_library.security.basic.CredentialsValidator
 import com.michibaum.authentication_library.security.basic.netty.BasicAuthenticationConverter
 import com.michibaum.authentication_library.security.jwt.JwsValidator
 import com.michibaum.authentication_library.security.jwt.JwtAuthenticationManager
+import com.michibaum.authentication_library.security.jwt.JwtExchangeMatcher
 import com.michibaum.authentication_library.security.jwt.netty.JwtAuthenticationConverter
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -67,6 +69,7 @@ class SecurityBeansConfiguration {
         jwtAuthenticationConverter: JwtAuthenticationConverter
     ) =
         AuthenticationWebFilter(authenticationManager).apply {
+            setRequiresAuthenticationMatcher(JwtExchangeMatcher())
             setServerAuthenticationConverter(jwtAuthenticationConverter)
         }
 
@@ -76,6 +79,7 @@ class SecurityBeansConfiguration {
         basicAuthenticationConverter: BasicAuthenticationConverter
     ) =
         AuthenticationWebFilter(authenticationManager).apply {
+            setRequiresAuthenticationMatcher(BasicExchangeMatcher())
             setServerAuthenticationConverter(basicAuthenticationConverter)
         }
 
diff --git a/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/security/SecurityBeansConfiguration.kt b/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/security/SecurityBeansConfiguration.kt
index a78ba67b..8ea273ae 100644
--- a/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/security/SecurityBeansConfiguration.kt
+++ b/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/security/SecurityBeansConfiguration.kt
@@ -4,10 +4,12 @@ import com.michibaum.authentication_library.AuthenticationClient
 import com.michibaum.authentication_library.security.ReactiveDelegateAuthenticationManager
 import com.michibaum.authentication_library.security.SpecificAuthenticationManager
 import com.michibaum.authentication_library.security.basic.BasicAuthenticationManager
+import com.michibaum.authentication_library.security.basic.BasicExchangeMatcher
 import com.michibaum.authentication_library.security.basic.CredentialsValidator
 import com.michibaum.authentication_library.security.basic.netty.BasicAuthenticationConverter
 import com.michibaum.authentication_library.security.jwt.JwsValidator
 import com.michibaum.authentication_library.security.jwt.JwtAuthenticationManager
+import com.michibaum.authentication_library.security.jwt.JwtExchangeMatcher
 import com.michibaum.authentication_library.security.jwt.netty.JwtAuthenticationConverter
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -66,6 +68,7 @@ class SecurityBeansConfiguration {
         jwtAuthenticationConverter: JwtAuthenticationConverter
     ) =
         AuthenticationWebFilter(authenticationManager).apply {
+            setRequiresAuthenticationMatcher(JwtExchangeMatcher())
             setServerAuthenticationConverter(jwtAuthenticationConverter)
         }
 
@@ -75,6 +78,7 @@ class SecurityBeansConfiguration {
         basicAuthenticationConverter: BasicAuthenticationConverter
     ) =
         AuthenticationWebFilter(authenticationManager).apply {
+            setRequiresAuthenticationMatcher(BasicExchangeMatcher())
             setServerAuthenticationConverter(basicAuthenticationConverter)
         }
 
diff --git a/website/src/app/chess-settings/chess-update-account/chess-update-account.component.ts b/website/src/app/chess-settings/chess-update-account/chess-update-account.component.ts
index 4fdb9f31..706397fa 100644
--- a/website/src/app/chess-settings/chess-update-account/chess-update-account.component.ts
+++ b/website/src/app/chess-settings/chess-update-account/chess-update-account.component.ts
@@ -55,7 +55,7 @@ export class ChessUpdateAccountComponent{
   }
 
   showImportGameButton(account: Account) {
-    let isOverTheBoard = account.platform === ChessPlatform.OVER_THE_BOARD;
+    let isOverTheBoard = account.platform === ChessPlatform.FIDE;
     return !isOverTheBoard
   }
 
diff --git a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html
index 5fb1eca8..8ee1139c 100644
--- a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html
+++ b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html
@@ -43,6 +43,10 @@
             <input class="w-full" pInputText id="embedUrl" formControlName="embedUrl" autocomplete="off" />
             <label for="embedUrl">Embed Url</label>
           </p-floatlabel>
+          <p-floatlabel variant="in" class="mb-2">
+            <textarea pTextarea id="internalComment" rows="5" formControlName="internalComment" class="w-full"></textarea>
+            <label for="internalComment">Internal Comment</label>
+          </p-floatlabel>
 
           <p-floatlabel variant="in" class="w-full">
             <p-multiSelect id="category" [options]="categories.value()" optionLabel="title" formControlName="categories" styleClass="w-full"/>
diff --git a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts
index 66bb0cfe..a6796d7c 100644
--- a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts
+++ b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts
@@ -16,11 +16,12 @@ import {MultiSelect} from "primeng/multiselect";
 import {Button} from "primeng/button";
 import {InputText} from "primeng/inputtext";
 import {FaIconComponent} from "@fortawesome/angular-fontawesome";
-import {NgIf} from "@angular/common";
+import {NgClass, NgIf} from "@angular/common";
 import {PickList} from "primeng/picklist";
 import {LazyLoad} from "../../core/models/lazy-load.model";
 import {rxResource} from "@angular/core/rxjs-interop";
 import {EventIconPipe} from "../../core/pipes/gender-icon.pipe";
+import {Textarea} from "primeng/textarea";
 
 @Component({
   selector: 'app-chess-update-event',
@@ -37,7 +38,9 @@ import {EventIconPipe} from "../../core/pipes/gender-icon.pipe";
     NgIf,
     PickList,
     FormsModule,
-    EventIconPipe
+    EventIconPipe,
+    Textarea,
+    NgClass
   ],
   templateUrl: './chess-update-event.component.html',
   styleUrl: './chess-update-event.component.scss'
@@ -88,6 +91,7 @@ export class ChessUpdateEventComponent implements OnInit{
     ]),
     url: new FormControl<string | null>(null),
     embedUrl: new FormControl<string | null>(null),
+    internalComment: new FormControl<string>(''),
     categories: new FormControl<ChessEventCategory[]>({
       value: [],
       disabled: false
@@ -149,6 +153,7 @@ export class ChessUpdateEventComponent implements OnInit{
       dateFrom: dateFrom ?? null,
       dateTo: dateTo ?? null,
       url: selectedEvent.url ?? '',
+      internalComment: selectedEvent.internalComment ?? '',
       embedUrl: selectedEvent.embedUrl ?? '',
       categories: selectedEvent.categories ?? [],
     });
@@ -170,6 +175,7 @@ export class ChessUpdateEventComponent implements OnInit{
       dateTo: dateTo,
       url: this.formGroup.controls['url'].value,
       embedUrl: this.formGroup.controls['embedUrl'].value,
+      internalComment: this.formGroup.controls['internalComment'].value,
       categoryIds: (this.formGroup.controls['categories'].value as ChessEventCategory[]).map(value => value.id),
       participantsIds: this.participants.map(value => value.id)
     };
diff --git a/website/src/app/chess-settings/chess-update-person/chess-update-person.component.html b/website/src/app/chess-settings/chess-update-person/chess-update-person.component.html
index 25f4e44a..c0741eef 100644
--- a/website/src/app/chess-settings/chess-update-person/chess-update-person.component.html
+++ b/website/src/app/chess-settings/chess-update-person/chess-update-person.component.html
@@ -25,11 +25,6 @@
             <label for="lastname">Lastname</label>
           </p-floatlabel>
 
-          <p-floatlabel variant="in" class="mb-2">
-            <input class="w-full" pInputText id="fideId" formControlName="fideId" autocomplete="off" />
-            <label for="fideId">Fide Id</label>
-          </p-floatlabel>
-
           <p-floatlabel variant="in" class="mb-2">
             <input class="w-full" pInputText id="federation" formControlName="federation" autocomplete="off" />
             <label for="federation">Federation</label>
diff --git a/website/src/app/chess-settings/chess-update-person/chess-update-person.component.ts b/website/src/app/chess-settings/chess-update-person/chess-update-person.component.ts
index 1168379f..85a55c84 100644
--- a/website/src/app/chess-settings/chess-update-person/chess-update-person.component.ts
+++ b/website/src/app/chess-settings/chess-update-person/chess-update-person.component.ts
@@ -64,11 +64,6 @@ export class ChessUpdatePersonComponent implements OnInit{
     }, [
       Validators.required,
     ]),
-    fideId: new FormControl<string>({
-      value: '',
-      disabled: false
-    }, [
-    ]),
     federation: new FormControl<string>({
       value: '',
       disabled: false
@@ -113,7 +108,6 @@ export class ChessUpdatePersonComponent implements OnInit{
       id: selectedPerson?.id ?? '',
       firstname: selectedPerson?.firstname ?? '',
       lastname: selectedPerson?.lastname ?? '',
-      fideId: selectedPerson?.fideId ?? '',
       federation: selectedPerson?.federation ?? '',
       birthday: birthday ?? null,
       gender: selectedPerson?.gender ?? null,
@@ -141,7 +135,6 @@ export class ChessUpdatePersonComponent implements OnInit{
     const person: WritePerson = {
       firstname: this.formGroup.controls['firstname'].value,
       lastname: this.formGroup.controls['lastname'].value,
-      fideId: this.formGroup.controls['fideId'].value,
       federation: this.formGroup.controls['federation'].value,
       birthday: birthday,
       gender: this.formGroup.controls['gender'].value,
diff --git a/website/src/app/core/models/chess/chess.models.ts b/website/src/app/core/models/chess/chess.models.ts
index fc40f5e4..76e94fff 100644
--- a/website/src/app/core/models/chess/chess.models.ts
+++ b/website/src/app/core/models/chess/chess.models.ts
@@ -57,6 +57,7 @@ export interface ChessEvent {
   embedUrl: string | undefined;
   dateFrom: string | undefined;
   dateTo: string | undefined;
+  internalComment: string;
   categories: ChessEventCategory[];
   participants: Person[];
 }
@@ -68,6 +69,7 @@ export interface WriteChessEvent {
   dateTo: string | undefined;
   url: string | undefined;
   embedUrl: string | undefined;
+  internalComment: string;
   categoryIds: string[];
   participantsIds: string[];
 }

From 8ca081aee62ea079c74266fe313b0736de2afcd7 Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Fri, 27 Dec 2024 18:16:57 +0100
Subject: [PATCH 10/27] Refactor authentication and API logic for servlet-based
 architecture.

TODO needs correction and testing.

Removed reactive Spring security setup in favor of servlet-based security with `ServletAuthenticationFilter`. Updated API implementations to replace `WebClient` with `RestClient`, improving handling of requests and responses. Removed unused legacy classes and configurations specific to the reactive setup.
---
 .../ReactiveDelegateAuthenticationManager.kt  | 28 ---------
 .../security/basic/BasicExchangeMatcher.kt    | 16 -----
 .../netty/BasicAuthenticationConverter.kt     | 32 ----------
 .../security/jwt/JwtExchangeMatcher.kt        | 26 ---------
 .../jwt/netty/JwtAuthenticationConverter.kt   | 58 -------------------
 authentication-service/pom.xml                |  2 +-
 .../security/SecurityBeansConfiguration.kt    | 56 +++++-------------
 .../security/SecurityConfiguration.kt         | 30 +++++-----
 chess-service/pom.xml                         |  2 +-
 .../apis/chesscom/ApiServiceImpl.kt           | 14 ++---
 .../apis/config/ApisConfigProperties.kt       | 10 +---
 .../apis/lichess/ApiServiceImpl.kt            | 16 +++--
 .../chess_service/app/event/EventConverter.kt |  2 +-
 .../security/SecurityBeansConfiguration.kt    | 42 ++++----------
 .../security/SecurityConfiguration.kt         | 32 +++++-----
 fitness-service/pom.xml                       |  2 +-
 .../fitbit/api/FitbitApiImpl.kt               | 47 ++++++---------
 .../fitbit/oauth/FitbitOAuthController.kt     | 12 ++--
 .../fitbit/oauth/FitbitOAuthImpl.kt           | 10 ++--
 .../security/SecurityBeansConfiguration.kt    | 42 ++++----------
 .../security/SecurityConfiguration.kt         | 30 +++++-----
 music-service/pom.xml                         |  2 +-
 .../security/SecurityBeansConfiguration.kt    | 42 ++++----------
 .../security/SecurityConfiguration.kt         | 30 +++++-----
 .../spotify/api/AbstractSpotifyApiClient.kt   |  8 +--
 .../spotify/api/user/SpotifyUserApiImpl.kt    | 36 +++++-------
 .../spotify/oauth/SpotifyOAuthController.kt   | 12 ++--
 usermanagement-service/pom.xml                |  2 +-
 .../security/SecurityBeansConfiguration.kt    | 42 ++++----------
 .../security/SecurityConfiguration.kt         | 30 +++++-----
 30 files changed, 219 insertions(+), 494 deletions(-)
 delete mode 100644 authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ReactiveDelegateAuthenticationManager.kt
 delete mode 100644 authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/basic/BasicExchangeMatcher.kt
 delete mode 100644 authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/basic/netty/BasicAuthenticationConverter.kt
 delete mode 100644 authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/JwtExchangeMatcher.kt
 delete mode 100644 authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/netty/JwtAuthenticationConverter.kt

diff --git a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ReactiveDelegateAuthenticationManager.kt b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ReactiveDelegateAuthenticationManager.kt
deleted file mode 100644
index 6079361a..00000000
--- a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ReactiveDelegateAuthenticationManager.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.michibaum.authentication_library.security
-
-import org.springframework.security.authentication.ReactiveAuthenticationManager
-import org.springframework.security.core.Authentication
-import org.springframework.security.core.context.ReactiveSecurityContextHolder
-import reactor.core.publisher.Mono
-
-class ReactiveDelegateAuthenticationManager(private val authenticationManagers: List<SpecificAuthenticationManager>): ReactiveAuthenticationManager {
-    override fun authenticate(authentication: Authentication?): Mono<Authentication> {
-        if (authentication == null) {
-            return Mono.empty()
-        }
-
-        for(authManager in authenticationManagers){
-            if(authManager.supports(authentication.javaClass)){
-                val auth = authManager.authenticate(authentication) ?: return Mono.error(Exception("Empty authentication"))
-                ReactiveSecurityContextHolder.withAuthentication(auth)
-                return Mono.just(authentication)
-            }
-        }
-
-        throw NoAuthenticationManagerException("No authentication Manager found for ${authentication::class}")
-    }
-
-
-
-
-}
\ No newline at end of file
diff --git a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/basic/BasicExchangeMatcher.kt b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/basic/BasicExchangeMatcher.kt
deleted file mode 100644
index 12bc311b..00000000
--- a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/basic/BasicExchangeMatcher.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.michibaum.authentication_library.security.basic
-
-import org.springframework.http.HttpHeaders
-import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher
-import org.springframework.web.server.ServerWebExchange
-import reactor.core.publisher.Mono
-
-class BasicExchangeMatcher: ServerWebExchangeMatcher {
-    override fun matches(exchange: ServerWebExchange?): Mono<ServerWebExchangeMatcher.MatchResult> {
-        val authHeader = exchange?.request?.headers?.getFirst(HttpHeaders.AUTHORIZATION)
-        if(authHeader != null && authHeader.startsWith("Basic ")) {
-            return ServerWebExchangeMatcher.MatchResult.match()
-        }
-        return ServerWebExchangeMatcher.MatchResult.notMatch()
-    }
-}
\ No newline at end of file
diff --git a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/basic/netty/BasicAuthenticationConverter.kt b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/basic/netty/BasicAuthenticationConverter.kt
deleted file mode 100644
index db3978d7..00000000
--- a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/basic/netty/BasicAuthenticationConverter.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.michibaum.authentication_library.security.basic.netty
-
-import com.michibaum.authentication_library.security.basic.BasicAuthentication
-import com.michibaum.permission_library.Permissions
-import org.springframework.http.HttpHeaders
-import org.springframework.security.core.Authentication
-import org.springframework.security.core.authority.SimpleGrantedAuthority
-import org.springframework.security.core.userdetails.User
-import org.springframework.security.core.userdetails.UserDetails
-import org.springframework.security.web.server.authentication.ServerAuthenticationConverter
-import org.springframework.web.server.ServerWebExchange
-import reactor.core.publisher.Mono
-import java.util.*
-
-class BasicAuthenticationConverter: ServerAuthenticationConverter {
-    override fun convert(exchange: ServerWebExchange): Mono<Authentication> {
-        return Mono.justOrEmpty(exchange.request.headers.getFirst(HttpHeaders.AUTHORIZATION))
-            .filter { header -> header.startsWith("Basic ") }
-            .map { header -> header.substring("Basic ".length) }
-            .map { token -> BasicAuthentication(createUserDetails(token)) }
-    }
-
-    private fun createUserDetails(token: String): UserDetails {
-        val decoded = Base64.getDecoder().decode(token)
-        val usernameAndPassword = String(decoded).split(":")
-        return User.builder()
-            .username(usernameAndPassword[0])
-            .authorities(SimpleGrantedAuthority(Permissions.ADMIN_SERVICE.name))
-            .password(usernameAndPassword[1])
-            .build()
-    }
-}
\ No newline at end of file
diff --git a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/JwtExchangeMatcher.kt b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/JwtExchangeMatcher.kt
deleted file mode 100644
index 0e08b3a4..00000000
--- a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/JwtExchangeMatcher.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.michibaum.authentication_library.security.jwt
-
-import org.springframework.http.HttpHeaders
-import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher
-import org.springframework.web.server.ServerWebExchange
-import reactor.core.publisher.Mono
-
-class JwtExchangeMatcher: ServerWebExchangeMatcher {
-    override fun matches(exchange: ServerWebExchange?): Mono<ServerWebExchangeMatcher.MatchResult> {
-
-        val header = exchange?.request?.headers?.getFirst(HttpHeaders.AUTHORIZATION)
-
-        if(header != null && header.startsWith("Bearer ")) {
-            return ServerWebExchangeMatcher.MatchResult.match()
-        }
-
-        val cookie = exchange?.request?.cookies?.getFirst("jwt")?.value
-
-        if(!cookie.isNullOrBlank()) {
-            return ServerWebExchangeMatcher.MatchResult.match()
-        }
-
-        return ServerWebExchangeMatcher.MatchResult.notMatch()
-
-    }
-}
\ No newline at end of file
diff --git a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/netty/JwtAuthenticationConverter.kt b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/netty/JwtAuthenticationConverter.kt
deleted file mode 100644
index cfb32df8..00000000
--- a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/netty/JwtAuthenticationConverter.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.michibaum.authentication_library.security.jwt.netty
-
-import com.michibaum.authentication_library.JwsWrapper
-import com.michibaum.authentication_library.security.jwt.JwtAuthentication
-import org.springframework.http.HttpHeaders
-import org.springframework.security.core.Authentication
-import org.springframework.security.core.authority.SimpleGrantedAuthority
-import org.springframework.security.core.userdetails.User
-import org.springframework.security.core.userdetails.UserDetails
-import org.springframework.security.web.server.authentication.ServerAuthenticationConverter
-import org.springframework.web.server.ServerWebExchange
-import reactor.core.publisher.Mono
-
-
-class JwtAuthenticationConverter: ServerAuthenticationConverter {
-
-    override fun convert(exchange: ServerWebExchange?): Mono<Authentication> {
-        if(exchange == null)
-            return Mono.empty()
-
-        val token = getToken(exchange) ?: return Mono.empty()
-        return Mono.just(JwtAuthentication(token, createUserDetails(token)))
-    }
-
-    fun getToken(exchange: ServerWebExchange): String? {
-        val header = exchange.request?.headers?.getFirst(HttpHeaders.AUTHORIZATION)
-
-        if(header != null && header.startsWith("Bearer ")) {
-            return header.substring("Bearer ".length)
-        }
-
-        val cookie = exchange.request?.cookies?.getFirst("jwt")?.value
-
-        if(!cookie.isNullOrBlank()) {
-            return cookie
-        }
-
-        return null
-    }
-
-
-    private fun createUserDetails(token: String): UserDetails {
-        val username: String = JwsWrapper(token).getUsername()
-        return User.builder()
-            .username(username)
-            .authorities(createAuthorities(token))
-            .password("")
-            .build()
-    }
-
-    private fun createAuthorities(token: String): List<SimpleGrantedAuthority> {
-        return JwsWrapper(token).getPermissions().stream()
-            .map { permission -> "$permission" }
-            .map { permission: String? -> SimpleGrantedAuthority(permission) }
-            .toList()
-    }
-
-}
\ No newline at end of file
diff --git a/authentication-service/pom.xml b/authentication-service/pom.xml
index 65507564..72cb980b 100644
--- a/authentication-service/pom.xml
+++ b/authentication-service/pom.xml
@@ -21,7 +21,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
         <dependency>
diff --git a/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityBeansConfiguration.kt b/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityBeansConfiguration.kt
index 76f46819..adc08d89 100644
--- a/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityBeansConfiguration.kt
+++ b/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityBeansConfiguration.kt
@@ -1,26 +1,23 @@
 package com.michibaum.authentication_service.security
 
 import com.michibaum.authentication_library.AuthenticationClient
-import com.michibaum.authentication_library.PublicKeyDto
-import com.michibaum.authentication_library.security.ReactiveDelegateAuthenticationManager
+import com.michibaum.authentication_library.security.ServletAuthenticationFilter
+import com.michibaum.authentication_library.security.ServletDelegateAuthenticationManager
 import com.michibaum.authentication_library.security.SpecificAuthenticationManager
 import com.michibaum.authentication_library.security.basic.BasicAuthenticationManager
-import com.michibaum.authentication_library.security.basic.BasicExchangeMatcher
 import com.michibaum.authentication_library.security.basic.CredentialsValidator
-import com.michibaum.authentication_library.security.basic.netty.BasicAuthenticationConverter
+import com.michibaum.authentication_library.security.basic.servlet.BasicAuthenticationConverter
 import com.michibaum.authentication_library.security.jwt.JwsValidator
 import com.michibaum.authentication_library.security.jwt.JwtAuthenticationManager
-import com.michibaum.authentication_library.security.jwt.JwtExchangeMatcher
-import com.michibaum.authentication_library.security.jwt.netty.JwtAuthenticationConverter
-import com.michibaum.authentication_service.authentication.AuthenticationService
+import com.michibaum.authentication_library.security.jwt.servlet.JwtAuthenticationConverter
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import org.springframework.security.authentication.ReactiveAuthenticationManager
-import org.springframework.security.web.server.authentication.AuthenticationWebFilter
+import org.springframework.context.annotation.Lazy
+import org.springframework.security.authentication.AuthenticationManager
+import org.springframework.security.web.authentication.AuthenticationConverter
 
 @Configuration
 class SecurityBeansConfiguration {
-
     @Bean
     fun adminServiceCredentials(): AdminServiceCredentials =
         AdminServiceCredentials()
@@ -28,14 +25,8 @@ class SecurityBeansConfiguration {
 
 
     @Bean
-    fun jwsValidator(authenticationService: AuthenticationService): JwsValidator {
-        val authenticationClient = object: AuthenticationClient{
-            override fun publicKey(): PublicKeyDto {
-                return authenticationService.publicKey
-            }
-        }
-        return JwsValidator(authenticationClient)
-    }
+    fun jwsValidator(@Lazy authenticationClient: AuthenticationClient): JwsValidator =
+        JwsValidator(authenticationClient)
 
     @Bean
     fun credentialsValidator(adminServiceCredentials: AdminServiceCredentials): CredentialsValidator =
@@ -55,39 +46,22 @@ class SecurityBeansConfiguration {
         BasicAuthenticationManager(credentialsValidator)
 
     @Bean
-    fun authenticationManager(specificAuthenticationManagers: List<SpecificAuthenticationManager>): ReactiveAuthenticationManager =
-        ReactiveDelegateAuthenticationManager(specificAuthenticationManagers)
+    fun authenticationManager(specificAuthenticationManagers: List<SpecificAuthenticationManager>): AuthenticationManager =
+        ServletDelegateAuthenticationManager(specificAuthenticationManagers)
 
 
 
     @Bean
-    fun jwtAuthenticationConverter(): JwtAuthenticationConverter =
+    fun jwtAuthenticationConverter(): AuthenticationConverter =
         JwtAuthenticationConverter()
 
     @Bean
-    fun basicAuthenticationConverter(): BasicAuthenticationConverter =
+    fun basicAuthenticationConverter(): AuthenticationConverter =
         BasicAuthenticationConverter()
 
 
 
     @Bean
-    fun jwtAuthenticationWebFilter(
-        authenticationManager: ReactiveAuthenticationManager,
-        jwtAuthenticationConverter: JwtAuthenticationConverter
-    ) =
-        AuthenticationWebFilter(authenticationManager).apply {
-            setRequiresAuthenticationMatcher(JwtExchangeMatcher())
-            setServerAuthenticationConverter(jwtAuthenticationConverter)
-        }
-
-    @Bean
-    fun basicAuthenticationWebFilter(
-        authenticationManager: ReactiveAuthenticationManager,
-        basicAuthenticationConverter: BasicAuthenticationConverter
-    ) =
-        AuthenticationWebFilter(authenticationManager).apply {
-            setRequiresAuthenticationMatcher(BasicExchangeMatcher())
-            setServerAuthenticationConverter(basicAuthenticationConverter)
-        }
-
+    fun authenticationFilter(authenticationManager: AuthenticationManager, authenticationConverters: List<AuthenticationConverter>) =
+        ServletAuthenticationFilter(authenticationManager, authenticationConverters)
 }
\ No newline at end of file
diff --git a/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityConfiguration.kt b/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityConfiguration.kt
index 44e779b5..78d2140f 100644
--- a/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityConfiguration.kt
+++ b/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityConfiguration.kt
@@ -1,45 +1,49 @@
 package com.michibaum.authentication_service.security
 
+import com.michibaum.authentication_library.security.ServletAuthenticationFilter
 import com.michibaum.permission_library.Permissions
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity
 import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity
+import org.springframework.security.config.annotation.web.builders.HttpSecurity
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity
 import org.springframework.security.config.web.server.SecurityWebFiltersOrder
 import org.springframework.security.config.web.server.ServerHttpSecurity
 import org.springframework.security.config.web.server.ServerHttpSecurity.AuthorizeExchangeSpec
+import org.springframework.security.web.SecurityFilterChain
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
 import org.springframework.security.web.server.SecurityWebFilterChain
 import org.springframework.security.web.server.authentication.AuthenticationWebFilter
 
 
 @Configuration
-@EnableWebFluxSecurity
-@EnableReactiveMethodSecurity
+@EnableWebSecurity
+@EnableMethodSecurity
 class SecurityConfiguration {
 
     @Bean
     fun securityFilterChain(
-        http: ServerHttpSecurity,
-        jwtAuthenticationWebFilter: AuthenticationWebFilter,
-        basicAuthenticationWebFilter: AuthenticationWebFilter,
-    ): SecurityWebFilterChain {
+        http: HttpSecurity,
+        authenticationFilter: ServletAuthenticationFilter
+    ): SecurityFilterChain {
         return http
-            .authorizeExchange { exchanges: AuthorizeExchangeSpec ->
-                exchanges
-                    .pathMatchers(
+            .authorizeHttpRequests {
+                it
+                    .requestMatchers(
                         "/api/authenticate",
                         "/api/getAuthDetails",
                         "/api/logout",
                         "/api/register"
                     ).permitAll()
-                    .pathMatchers(
+                    .requestMatchers(
                         "/actuator",
                         "/actuator/**"
                     ).hasAnyAuthority(Permissions.ADMIN_SERVICE.name)
-                    .anyExchange().authenticated()
+                    .anyRequest().authenticated()
             }
-            .addFilterAt(basicAuthenticationWebFilter, SecurityWebFiltersOrder.AUTHENTICATION)
-            .addFilterAt(jwtAuthenticationWebFilter, SecurityWebFiltersOrder.AUTHENTICATION)
+            .addFilterBefore(authenticationFilter, UsernamePasswordAuthenticationFilter::class.java)
             .httpBasic { httpBasicSpec -> httpBasicSpec.disable() }
             .formLogin { formLoginSpec -> formLoginSpec.disable() }
             .csrf { csrfSpec -> csrfSpec.disable() }
diff --git a/chess-service/pom.xml b/chess-service/pom.xml
index 6c9b5818..5390e597 100644
--- a/chess-service/pom.xml
+++ b/chess-service/pom.xml
@@ -22,7 +22,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/chesscom/ApiServiceImpl.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/chesscom/ApiServiceImpl.kt
index c5a2e7ce..7a217827 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/chesscom/ApiServiceImpl.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/chesscom/ApiServiceImpl.kt
@@ -29,8 +29,7 @@ class ApiServiceImpl(
                 .uri("/pub/player/{0}", username)
                 .accept(MediaType.APPLICATION_JSON)
                 .retrieve()
-                .bodyToMono(ChesscomAccountDto::class.java) // TODO onError
-                .block()
+                .body(ChesscomAccountDto::class.java) // TODO onError
         } catch (throwable: Throwable){
             return Exception("Exception chesscom findUser with username=$username", throwable)
         }
@@ -48,8 +47,7 @@ class ApiServiceImpl(
                 .uri("/pub/player/{0}/stats", account.username)
                 .accept(MediaType.APPLICATION_JSON)
                 .retrieve()
-                .bodyToMono(ChesscomStatsDto::class.java) // TODO onError
-                .block()
+                .body(ChesscomStatsDto::class.java) // TODO onError
         } catch (throwable: Throwable){
             return Exception("Exception chesscom getStats with username=${account.username}", throwable)
         }
@@ -82,9 +80,8 @@ class ApiServiceImpl(
                         .uri("/pub/player/{0}/games/{1}/{2}", account.username, currentYear, currentMonth)
                         .accept(MediaType.APPLICATION_JSON)
                         .retrieve()
-                        .bodyToMono(Gamesresult::class.java)
-                        .mapNotNull { it.games }
-                        .block()
+                        .body(Gamesresult::class.java)
+                        ?.games
                 } catch (throwable: Throwable){
                     return Exception("Exception chesscom getGames with username=${account.username} and year=$currentYear and month=$currentMonth", throwable)
                 }
@@ -109,8 +106,7 @@ class ApiServiceImpl(
                 .uri("/pub/leaderboards")
                 .accept(MediaType.APPLICATION_JSON)
                 .retrieve()
-                .bodyToMono(ChesscomLeaderboards::class.java) // TODO onError
-                .block()
+                .body(ChesscomLeaderboards::class.java) // TODO onError
         } catch (throwable: Throwable){
             return Exception("Exception chesscom findTopAccounts", throwable)
         }
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/config/ApisConfigProperties.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/config/ApisConfigProperties.kt
index 35289f8b..0a4d667c 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/config/ApisConfigProperties.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/config/ApisConfigProperties.kt
@@ -2,7 +2,7 @@ package com.michibaum.chess_service.apis.config
 
 import com.michibaum.chess_service.domain.ChessPlatform
 import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.web.reactive.function.client.WebClient
+import org.springframework.web.client.RestClient
 
 /**
  * Configuration properties for API clients.
@@ -27,13 +27,9 @@ data class ApisConfigProperties(
      * This instance is built with a base URL and a custom User-Agent header.
      * Additionally, it configures the maximum in-memory size for codecs to 10MB.
      */
-    val webClient: WebClient = WebClient.builder()
+    val webClient: RestClient = RestClient.builder()
         .baseUrl(baseUrl)
         .defaultHeader("User-Agent", "chess-statistic-application/0.1; +http://www.michibaum.ch")
-        .codecs { configurer ->
-            configurer.defaultCodecs()
-            .maxInMemorySize(10000000)
-        }
         .build()
 
 }
@@ -42,7 +38,7 @@ data class ApisConfigProperties(
 data class ChessConfigProperties(
     var properties: Map<ChessPlatform, ApisConfigProperties> = emptyMap()
 ) {
-    fun getWebClient(apis: ChessPlatform): WebClient {
+    fun getWebClient(apis: ChessPlatform): RestClient {
         return properties[apis]?.webClient ?: throw NoSuchElementException("No WebClient configured for $apis")
     }
 }
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/lichess/ApiServiceImpl.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/lichess/ApiServiceImpl.kt
index e89a79fe..4aaa302c 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/lichess/ApiServiceImpl.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/lichess/ApiServiceImpl.kt
@@ -8,6 +8,7 @@ import com.michibaum.chess_service.apis.dtos.StatsDto
 import com.michibaum.chess_service.apis.dtos.TopAccountDto
 import com.michibaum.chess_service.domain.Account
 import com.michibaum.chess_service.domain.ChessPlatform
+import org.springframework.core.ParameterizedTypeReference
 import org.springframework.http.MediaType
 import org.springframework.stereotype.Service
 
@@ -28,8 +29,7 @@ class ApiServiceImpl(
                 }
                 .accept(MediaType.APPLICATION_NDJSON)
                 .retrieve()
-                .bodyToMono(LichessAccountDto::class.java)
-                .block()
+                .body(LichessAccountDto::class.java)
         } catch (throwable: Throwable) {
             return Exception("Exception lichess findUser with username=${username}", throwable)
         }
@@ -47,8 +47,7 @@ class ApiServiceImpl(
                 .uri("/api/user/{0}/perf/{1}", account.username, perf)
                 .accept(MediaType.APPLICATION_JSON)
                 .retrieve()
-                .bodyToMono(LichessStatsDto::class.java)
-                .block()
+                .body(LichessStatsDto::class.java)
         }
 
         val bullet = try {
@@ -82,13 +81,13 @@ class ApiServiceImpl(
     override fun getGames(account: Account): ApiResult<List<GameDto>> {
         val result = try {
             val url = "/api/games/user/{0}?perfType=bullet,blitz,rapid&pgnInJson=true&tags=true&clocks=true"
+            val typeRef: ParameterizedTypeReference<List<LichessGameDto>> =
+                object : ParameterizedTypeReference<List<LichessGameDto>>() {}
             client.get()
                 .uri(url, account.username)
                 .accept(MediaType.APPLICATION_NDJSON)
                 .retrieve()
-                .bodyToFlux(LichessGameDto::class.java)
-                .collectList()
-                .block()
+                .body(typeRef)
         } catch (throwable: Throwable) {
             return Exception("Exception lichess getGames with username=${account.username}", throwable)
         }
@@ -106,8 +105,7 @@ class ApiServiceImpl(
                 .uri("/api/player")
                 .accept(MediaType.APPLICATION_NDJSON)
                 .retrieve()
-                .bodyToMono(LichessLeaderboards::class.java)
-                .block()
+                .body(LichessLeaderboards::class.java)
         } catch (throwable: Throwable) {
             return Exception("Exception lichess findTopAccounts", throwable)
         }
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt
index bca07e84..4510fba8 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt
@@ -32,7 +32,7 @@ class EventConverter(
     }
 
     private fun getInternalComment(comment: String): String {
-        val authentication = ReactiveSecurityContextHolder.getContext().map { it.authentication }.block()
+        val authentication = SecurityContextHolder.getContext().authentication
         return if (authentication != null && authentication.anyOf(Permissions.CHESS_SERVICE_ADMIN)) comment else ""
     }
 
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityBeansConfiguration.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityBeansConfiguration.kt
index f172baef..4baea59f 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityBeansConfiguration.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityBeansConfiguration.kt
@@ -1,21 +1,20 @@
 package com.michibaum.chess_service.security
 
 import com.michibaum.authentication_library.AuthenticationClient
-import com.michibaum.authentication_library.security.ReactiveDelegateAuthenticationManager
+import com.michibaum.authentication_library.security.ServletAuthenticationFilter
+import com.michibaum.authentication_library.security.ServletDelegateAuthenticationManager
 import com.michibaum.authentication_library.security.SpecificAuthenticationManager
 import com.michibaum.authentication_library.security.basic.BasicAuthenticationManager
-import com.michibaum.authentication_library.security.basic.BasicExchangeMatcher
 import com.michibaum.authentication_library.security.basic.CredentialsValidator
-import com.michibaum.authentication_library.security.basic.netty.BasicAuthenticationConverter
+import com.michibaum.authentication_library.security.basic.servlet.BasicAuthenticationConverter
 import com.michibaum.authentication_library.security.jwt.JwsValidator
 import com.michibaum.authentication_library.security.jwt.JwtAuthenticationManager
-import com.michibaum.authentication_library.security.jwt.JwtExchangeMatcher
-import com.michibaum.authentication_library.security.jwt.netty.JwtAuthenticationConverter
+import com.michibaum.authentication_library.security.jwt.servlet.JwtAuthenticationConverter
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Lazy
-import org.springframework.security.authentication.ReactiveAuthenticationManager
-import org.springframework.security.web.server.authentication.AuthenticationWebFilter
+import org.springframework.security.authentication.AuthenticationManager
+import org.springframework.security.web.authentication.AuthenticationConverter
 
 @Configuration
 class SecurityBeansConfiguration {
@@ -48,39 +47,22 @@ class SecurityBeansConfiguration {
         BasicAuthenticationManager(credentialsValidator)
 
     @Bean
-    fun authenticationManager(specificAuthenticationManagers: List<SpecificAuthenticationManager>): ReactiveAuthenticationManager =
-        ReactiveDelegateAuthenticationManager(specificAuthenticationManagers)
+    fun authenticationManager(specificAuthenticationManagers: List<SpecificAuthenticationManager>): AuthenticationManager =
+        ServletDelegateAuthenticationManager(specificAuthenticationManagers)
 
 
 
     @Bean
-    fun jwtAuthenticationConverter(): JwtAuthenticationConverter =
+    fun jwtAuthenticationConverter(): AuthenticationConverter =
         JwtAuthenticationConverter()
 
     @Bean
-    fun basicAuthenticationConverter(): BasicAuthenticationConverter =
+    fun basicAuthenticationConverter(): AuthenticationConverter =
         BasicAuthenticationConverter()
 
 
 
     @Bean
-    fun jwtAuthenticationWebFilter(
-        authenticationManager: ReactiveAuthenticationManager,
-        jwtAuthenticationConverter: JwtAuthenticationConverter
-    ) =
-        AuthenticationWebFilter(authenticationManager).apply {
-            setRequiresAuthenticationMatcher(JwtExchangeMatcher())
-            setServerAuthenticationConverter(jwtAuthenticationConverter)
-        }
-
-    @Bean
-    fun basicAuthenticationWebFilter(
-        authenticationManager: ReactiveAuthenticationManager,
-        basicAuthenticationConverter: BasicAuthenticationConverter
-    ) =
-        AuthenticationWebFilter(authenticationManager).apply {
-            setRequiresAuthenticationMatcher(BasicExchangeMatcher())
-            setServerAuthenticationConverter(basicAuthenticationConverter)
-        }
-
+    fun authenticationFilter(authenticationManager: AuthenticationManager, authenticationConverters: List<AuthenticationConverter>) =
+        ServletAuthenticationFilter(authenticationManager, authenticationConverters)
 }
\ No newline at end of file
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityConfiguration.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityConfiguration.kt
index 80a85326..e117de9d 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityConfiguration.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityConfiguration.kt
@@ -1,37 +1,41 @@
 package com.michibaum.chess_service.security
 
+import com.michibaum.authentication_library.security.ServletAuthenticationFilter
 import com.michibaum.permission_library.Permissions
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpMethod
 import org.springframework.security.authentication.AuthenticationManager
 import org.springframework.security.authentication.ReactiveAuthenticationManager
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity
 import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity
+import org.springframework.security.config.annotation.web.builders.HttpSecurity
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity
 import org.springframework.security.config.web.server.SecurityWebFiltersOrder
 import org.springframework.security.config.web.server.ServerHttpSecurity
 import org.springframework.security.config.web.server.ServerHttpSecurity.AuthorizeExchangeSpec
 import org.springframework.security.config.web.server.ServerHttpSecurity.http
+import org.springframework.security.web.SecurityFilterChain
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
 import org.springframework.security.web.server.SecurityWebFilterChain
 import org.springframework.security.web.server.authentication.AuthenticationWebFilter
 
 
 @Configuration
-@EnableWebFluxSecurity
-@EnableReactiveMethodSecurity
+@EnableWebSecurity
+@EnableMethodSecurity
 class SecurityConfiguration {
 
     @Bean
     fun securityFilterChain(
-        http: ServerHttpSecurity,
-        jwtAuthenticationWebFilter: AuthenticationWebFilter,
-        basicAuthenticationWebFilter: AuthenticationWebFilter,
-        authenticationManager: ReactiveAuthenticationManager
-    ): SecurityWebFilterChain {
+        http: HttpSecurity,
+        authenticationFilter: ServletAuthenticationFilter
+    ): SecurityFilterChain {
         return http
-            .authorizeExchange { exchanges: AuthorizeExchangeSpec ->
-                exchanges
-                    .pathMatchers(
+            .authorizeHttpRequests {
+                it
+                    .requestMatchers(
                         HttpMethod.GET,"/api/events",
                         "/api/events/*",
                         "/api/events/*/participants",
@@ -39,15 +43,13 @@ class SecurityConfiguration {
                         "/api/event-categories",
                         "/api/event-categories/with-events"
                     ).permitAll()
-                    .pathMatchers(
+                    .requestMatchers(
                         "/actuator",
                         "/actuator/**"
                     ).hasAnyAuthority(Permissions.ADMIN_SERVICE.name)
-                    .anyExchange().authenticated()
+                    .anyRequest().authenticated()
             }
-            .addFilterAt(basicAuthenticationWebFilter, SecurityWebFiltersOrder.AUTHENTICATION)
-            .addFilterAt(jwtAuthenticationWebFilter, SecurityWebFiltersOrder.AUTHENTICATION)
-            .authenticationManager(authenticationManager)
+            .addFilterBefore(authenticationFilter, UsernamePasswordAuthenticationFilter::class.java)
             .httpBasic { httpBasicSpec -> httpBasicSpec.disable() }
             .formLogin { formLoginSpec -> formLoginSpec.disable() }
             .csrf { csrfSpec -> csrfSpec.disable() }
diff --git a/fitness-service/pom.xml b/fitness-service/pom.xml
index 5efa5d0e..28dde302 100644
--- a/fitness-service/pom.xml
+++ b/fitness-service/pom.xml
@@ -19,7 +19,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
         <dependency>
diff --git a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/api/FitbitApiImpl.kt b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/api/FitbitApiImpl.kt
index 2212473f..1ed9a521 100644
--- a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/api/FitbitApiImpl.kt
+++ b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/api/FitbitApiImpl.kt
@@ -9,21 +9,17 @@ import com.michibaum.fitness_service.fitbit.oauth.FitbitOAuthCredentials
 import org.springframework.http.HttpHeaders
 import org.springframework.http.MediaType
 import org.springframework.stereotype.Component
-import org.springframework.web.reactive.function.client.WebClient
-import reactor.core.publisher.Mono
+import org.springframework.web.client.RestClient
+import org.springframework.web.client.body
 
 @Component
 class FitbitApiImpl: FitbitApi {
 
-    val client = WebClient.builder()
+    val client = RestClient.builder()
     .baseUrl("https://api.fitbit.com")
     .defaultHeaders {
         it.set(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
     }
-    .codecs { configurer ->
-        configurer.defaultCodecs()
-            .maxInMemorySize(10000000)
-    }
     .build()
 
     override fun profile(credentials: FitbitOAuthCredentials): ProfileDto? {
@@ -33,14 +29,11 @@ class FitbitApiImpl: FitbitApi {
                 it.setBearerAuth(credentials.accessToken)
             }
             .retrieve()
-            .onStatus({ t -> t.value() == 400 }, { Mono.error(Exception()) }) // TODO The request had bad syntax or was inherently impossible to be satisfied.
-            .onStatus({ t -> t.value() == 401 }, { Mono.error(Exception()) }) // TODO The request requires user authentication. Use FitbitOAuth to refresh token
-            .onStatus({ t -> t.value() == 403 }, { Mono.error(Exception()) }) // TODO Forbidden
-            .onStatus({ t -> t.value() == 429 }, { Mono.error(Exception()) }) // TODO Returned if the application has reached the rate limit for a specific user. The rate limit will be reset at the top of the hour.
-            .bodyToMono(ProfileDto::class.java)
-            // TODO .onError
-            .block()
-
+            .onStatus({ t -> t.value() == 400 }, { _, _ ->  }) // TODO The request had bad syntax or was inherently impossible to be satisfied.
+            .onStatus({ t -> t.value() == 401 }, { _, _ ->  }) // TODO The request requires user authentication. Use FitbitOAuth to refresh token
+            .onStatus({ t -> t.value() == 403 }, { _, _ ->  }) // TODO Forbidden
+            .onStatus({ t -> t.value() == 429 }, { _, _ ->  }) // TODO Returned if the application has reached the rate limit for a specific user. The rate limit will be reset at the top of the hour.
+            .body<ProfileDto>()
     }
 
 
@@ -53,13 +46,11 @@ class FitbitApiImpl: FitbitApi {
                 it.setBearerAuth(credentials.accessToken)
             }
             .retrieve()
-            .onStatus({ t -> t.value() == 400 }, { Mono.error(Exception()) }) // TODO The request had bad syntax or was inherently impossible to be satisfied.
-            .onStatus({ t -> t.value() == 401 }, { Mono.error(Exception()) }) // TODO The request requires user authentication. Use FitbitOAuth to refresh token
-            .onStatus({ t -> t.value() == 403 }, { Mono.error(Exception()) }) // TODO Forbidden
-            .onStatus({ t -> t.value() == 429 }, { Mono.error(Exception()) }) // TODO Returned if the application has reached the rate limit for a specific user. The rate limit will be reset at the top of the hour.
-            .bodyToMono(WeightLogDto::class.java)
-            // TODO .onError
-            .block()
+            .onStatus({ t -> t.value() == 400 }, { _, _ ->  }) // TODO The request had bad syntax or was inherently impossible to be satisfied.
+            .onStatus({ t -> t.value() == 401 }, { _, _ ->  }) // TODO The request requires user authentication. Use FitbitOAuth to refresh token
+            .onStatus({ t -> t.value() == 403 }, { _, _ ->  }) // TODO Forbidden
+            .onStatus({ t -> t.value() == 429 }, { _, _ ->  }) // TODO Returned if the application has reached the rate limit for a specific user. The rate limit will be reset at the top of the hour.
+            .body<WeightLogDto>()
             ?.weight ?: emptyList()
     }
 
@@ -72,13 +63,11 @@ class FitbitApiImpl: FitbitApi {
                 it.setBearerAuth(credentials.accessToken)
             }
             .retrieve()
-            .onStatus({ t -> t.value() == 400 }, { Mono.error(Exception()) }) // TODO The request had bad syntax or was inherently impossible to be satisfied.
-            .onStatus({ t -> t.value() == 401 }, { Mono.error(Exception()) }) // TODO The request requires user authentication. Use FitbitOAuth to refresh token
-            .onStatus({ t -> t.value() == 403 }, { Mono.error(Exception()) }) // TODO Forbidden
-            .onStatus({ t -> t.value() == 429 }, { Mono.error(Exception()) }) // TODO Returned if the application has reached the rate limit for a specific user. The rate limit will be reset at the top of the hour.
-            .bodyToMono(SleepLogDto::class.java)
-            // TODO .onError
-            .block()
+            .onStatus({ t -> t.value() == 400 }, { _, _ ->  }) // TODO The request had bad syntax or was inherently impossible to be satisfied.
+            .onStatus({ t -> t.value() == 401 }, { _, _ ->  }) // TODO The request requires user authentication. Use FitbitOAuth to refresh token
+            .onStatus({ t -> t.value() == 403 }, { _, _ ->  }) // TODO Forbidden
+            .onStatus({ t -> t.value() == 429 }, { _, _ ->  }) // TODO Returned if the application has reached the rate limit for a specific user. The rate limit will be reset at the top of the hour.
+            .body<SleepLogDto>()
             ?.sleep ?: emptyList()
     }
 }
\ No newline at end of file
diff --git a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthController.kt b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthController.kt
index ce6d75ef..51a159d1 100644
--- a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthController.kt
+++ b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthController.kt
@@ -6,8 +6,7 @@ import org.springframework.http.MediaType
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
-import org.springframework.web.reactive.function.BodyInserters
-import org.springframework.web.reactive.function.client.WebClient
+import org.springframework.web.client.RestClient
 import reactor.core.publisher.Mono
 import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
@@ -19,13 +18,13 @@ class FitbitOAuthController(
     private val fitbitOAuthProperties: FitbitOAuthProperties
 ) {
 
-    private final val client: WebClient
+    private final val client: RestClient
 
     init {
         val clientAndSecret = fitbitOAuthProperties.clientId + ":" + fitbitOAuthProperties.clientSecret
         val authBasic = Base64.getUrlEncoder().withoutPadding().encodeToString(clientAndSecret.encodeToByteArray())
 
-        client = WebClient.builder()
+        client = RestClient.builder()
             .baseUrl("https://api.fitbit.com")
             .defaultHeaders {
                 it.set("Authorization", "Basic $authBasic")
@@ -77,9 +76,8 @@ class FitbitOAuthController(
                     .with("redirect_uri", "https://fitness.michibaum.ch/api/fitbit/auth")
             )
             .retrieve()
-            .onStatus({ t -> t.is4xxClientError }, { Mono.error(Exception()) }) // TODO https://dev.fitbit.com/build/reference/web-api/troubleshooting-guide/error-messages/#authorization-errors
-            .bodyToMono(FitbitOAuthCredentialsDto::class.java)
-            .block()
+            .onStatus({ t -> t.is4xxClientError }, { _, _ -> }) // TODO https://dev.fitbit.com/build/reference/web-api/troubleshooting-guide/error-messages/#authorization-errors
+            .body(FitbitOAuthCredentialsDto::class.java)
 
         if(response == null){
             throw Exception("Fitbit OAuth exchange for access token returned null")
diff --git a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthImpl.kt b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthImpl.kt
index b1d06d2d..1aade2db 100644
--- a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthImpl.kt
+++ b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthImpl.kt
@@ -5,8 +5,7 @@ import com.michibaum.fitness_service.fitbit.FitbitOAuth
 import org.springframework.http.HttpHeaders
 import org.springframework.http.MediaType
 import org.springframework.stereotype.Component
-import org.springframework.web.reactive.function.BodyInserters
-import org.springframework.web.reactive.function.client.WebClient
+import org.springframework.web.client.RestClient
 import reactor.core.publisher.Mono
 import java.time.Instant
 import java.util.*
@@ -23,7 +22,7 @@ class FitbitOAuthImpl(
         val clientAndSecret = fitbitOAuthProperties.clientId + ":" + fitbitOAuthProperties.clientSecret
         val authBasic = Base64.getUrlEncoder().withoutPadding().encodeToString(clientAndSecret.encodeToByteArray())
 
-        val client = WebClient.builder()
+        val client = RestClient.builder()
             .baseUrl("https://api.fitbit.com")
             .defaultHeaders {
                 it.set("Authorization", "Basic $authBasic")
@@ -40,9 +39,8 @@ class FitbitOAuthImpl(
                     .with("refresh_token", credentials.refreshToken)
             )
             .retrieve()
-            .onStatus({ t -> t.is4xxClientError }, { Mono.error(Exception()) }) // TODO https://dev.fitbit.com/build/reference/web-api/troubleshooting-guide/error-messages/#authorization-errors
-            .bodyToMono(FitbitOAuthCredentialsDto::class.java)
-            .block()
+            .onStatus({ t -> t.is4xxClientError }, { _, _ -> }) // TODO https://dev.fitbit.com/build/reference/web-api/troubleshooting-guide/error-messages/#authorization-errors
+            .body(FitbitOAuthCredentialsDto::class.java)
 
         if(response == null){
             throw Exception("Fitbit OAuth refresh access token returned null")
diff --git a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/security/SecurityBeansConfiguration.kt b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/security/SecurityBeansConfiguration.kt
index 6aa49772..f3a40f28 100644
--- a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/security/SecurityBeansConfiguration.kt
+++ b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/security/SecurityBeansConfiguration.kt
@@ -1,21 +1,20 @@
 package com.michibaum.fitness_service.security
 
 import com.michibaum.authentication_library.AuthenticationClient
-import com.michibaum.authentication_library.security.ReactiveDelegateAuthenticationManager
+import com.michibaum.authentication_library.security.ServletAuthenticationFilter
+import com.michibaum.authentication_library.security.ServletDelegateAuthenticationManager
 import com.michibaum.authentication_library.security.SpecificAuthenticationManager
 import com.michibaum.authentication_library.security.basic.BasicAuthenticationManager
-import com.michibaum.authentication_library.security.basic.BasicExchangeMatcher
 import com.michibaum.authentication_library.security.basic.CredentialsValidator
-import com.michibaum.authentication_library.security.basic.netty.BasicAuthenticationConverter
+import com.michibaum.authentication_library.security.basic.servlet.BasicAuthenticationConverter
 import com.michibaum.authentication_library.security.jwt.JwsValidator
 import com.michibaum.authentication_library.security.jwt.JwtAuthenticationManager
-import com.michibaum.authentication_library.security.jwt.JwtExchangeMatcher
-import com.michibaum.authentication_library.security.jwt.netty.JwtAuthenticationConverter
+import com.michibaum.authentication_library.security.jwt.servlet.JwtAuthenticationConverter
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Lazy
-import org.springframework.security.authentication.ReactiveAuthenticationManager
-import org.springframework.security.web.server.authentication.AuthenticationWebFilter
+import org.springframework.security.authentication.AuthenticationManager
+import org.springframework.security.web.authentication.AuthenticationConverter
 
 @Configuration
 class SecurityBeansConfiguration {
@@ -48,39 +47,22 @@ class SecurityBeansConfiguration {
         BasicAuthenticationManager(credentialsValidator)
 
     @Bean
-    fun authenticationManager(specificAuthenticationManagers: List<SpecificAuthenticationManager>): ReactiveAuthenticationManager =
-        ReactiveDelegateAuthenticationManager(specificAuthenticationManagers)
+    fun authenticationManager(specificAuthenticationManagers: List<SpecificAuthenticationManager>): AuthenticationManager =
+        ServletDelegateAuthenticationManager(specificAuthenticationManagers)
 
 
 
     @Bean
-    fun jwtAuthenticationConverter(): JwtAuthenticationConverter =
+    fun jwtAuthenticationConverter(): AuthenticationConverter =
         JwtAuthenticationConverter()
 
     @Bean
-    fun basicAuthenticationConverter(): BasicAuthenticationConverter =
+    fun basicAuthenticationConverter(): AuthenticationConverter =
         BasicAuthenticationConverter()
 
 
 
     @Bean
-    fun jwtAuthenticationWebFilter(
-        authenticationManager: ReactiveAuthenticationManager,
-        jwtAuthenticationConverter: JwtAuthenticationConverter
-    ) =
-        AuthenticationWebFilter(authenticationManager).apply {
-            setRequiresAuthenticationMatcher(JwtExchangeMatcher())
-            setServerAuthenticationConverter(jwtAuthenticationConverter)
-        }
-
-    @Bean
-    fun basicAuthenticationWebFilter(
-        authenticationManager: ReactiveAuthenticationManager,
-        basicAuthenticationConverter: BasicAuthenticationConverter
-    ) =
-        AuthenticationWebFilter(authenticationManager).apply {
-            setRequiresAuthenticationMatcher(BasicExchangeMatcher())
-            setServerAuthenticationConverter(basicAuthenticationConverter)
-        }
-
+    fun authenticationFilter(authenticationManager: AuthenticationManager, authenticationConverters: List<AuthenticationConverter>) =
+        ServletAuthenticationFilter(authenticationManager, authenticationConverters)
 }
\ No newline at end of file
diff --git a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/security/SecurityConfiguration.kt b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/security/SecurityConfiguration.kt
index 967d849c..439b3286 100644
--- a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/security/SecurityConfiguration.kt
+++ b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/security/SecurityConfiguration.kt
@@ -1,42 +1,46 @@
 package com.michibaum.fitness_service.security
 
+import com.michibaum.authentication_library.security.ServletAuthenticationFilter
 import com.michibaum.permission_library.Permissions
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity
 import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity
+import org.springframework.security.config.annotation.web.builders.HttpSecurity
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity
 import org.springframework.security.config.web.server.SecurityWebFiltersOrder
 import org.springframework.security.config.web.server.ServerHttpSecurity
 import org.springframework.security.config.web.server.ServerHttpSecurity.AuthorizeExchangeSpec
+import org.springframework.security.web.SecurityFilterChain
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
 import org.springframework.security.web.server.SecurityWebFilterChain
 import org.springframework.security.web.server.authentication.AuthenticationWebFilter
 
 
 @Configuration
-@EnableWebFluxSecurity
-@EnableReactiveMethodSecurity
+@EnableWebSecurity
+@EnableMethodSecurity
 class SecurityConfiguration {
 
     @Bean
     fun securityFilterChain(
-        http: ServerHttpSecurity,
-        jwtAuthenticationWebFilter: AuthenticationWebFilter,
-        basicAuthenticationWebFilter: AuthenticationWebFilter,
-    ): SecurityWebFilterChain {
+        http: HttpSecurity,
+        authenticationFilter: ServletAuthenticationFilter
+    ): SecurityFilterChain {
         return http
-            .authorizeExchange { exchanges: AuthorizeExchangeSpec ->
-                exchanges
-                    .pathMatchers(
+            .authorizeHttpRequests {
+                it
+                    .requestMatchers(
                         "/api/fitbit/auth",
                     ).permitAll()
-                    .pathMatchers(
+                    .requestMatchers(
                         "/actuator",
                         "/actuator/**"
                     ).hasAnyAuthority(Permissions.ADMIN_SERVICE.name)
-                    .anyExchange().authenticated()
+                    .anyRequest().authenticated()
             }
-            .addFilterAt(basicAuthenticationWebFilter, SecurityWebFiltersOrder.AUTHENTICATION)
-            .addFilterAt(jwtAuthenticationWebFilter, SecurityWebFiltersOrder.AUTHENTICATION)
+            .addFilterBefore(authenticationFilter, UsernamePasswordAuthenticationFilter::class.java)
             .httpBasic { httpBasicSpec -> httpBasicSpec.disable() }
             .formLogin { formLoginSpec -> formLoginSpec.disable() }
             .csrf { csrfSpec -> csrfSpec.disable() }
diff --git a/music-service/pom.xml b/music-service/pom.xml
index 392f59ae..d59c8589 100644
--- a/music-service/pom.xml
+++ b/music-service/pom.xml
@@ -19,7 +19,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
         <dependency>
diff --git a/music-service/src/main/kotlin/com/michibaum/music_service/security/SecurityBeansConfiguration.kt b/music-service/src/main/kotlin/com/michibaum/music_service/security/SecurityBeansConfiguration.kt
index 2a5bed02..e3f89ca3 100644
--- a/music-service/src/main/kotlin/com/michibaum/music_service/security/SecurityBeansConfiguration.kt
+++ b/music-service/src/main/kotlin/com/michibaum/music_service/security/SecurityBeansConfiguration.kt
@@ -1,21 +1,20 @@
 package com.michibaum.music_service.security
 
 import com.michibaum.authentication_library.AuthenticationClient
-import com.michibaum.authentication_library.security.ReactiveDelegateAuthenticationManager
+import com.michibaum.authentication_library.security.ServletAuthenticationFilter
+import com.michibaum.authentication_library.security.ServletDelegateAuthenticationManager
 import com.michibaum.authentication_library.security.SpecificAuthenticationManager
 import com.michibaum.authentication_library.security.basic.BasicAuthenticationManager
-import com.michibaum.authentication_library.security.basic.BasicExchangeMatcher
 import com.michibaum.authentication_library.security.basic.CredentialsValidator
-import com.michibaum.authentication_library.security.basic.netty.BasicAuthenticationConverter
+import com.michibaum.authentication_library.security.basic.servlet.BasicAuthenticationConverter
 import com.michibaum.authentication_library.security.jwt.JwsValidator
 import com.michibaum.authentication_library.security.jwt.JwtAuthenticationManager
-import com.michibaum.authentication_library.security.jwt.JwtExchangeMatcher
-import com.michibaum.authentication_library.security.jwt.netty.JwtAuthenticationConverter
+import com.michibaum.authentication_library.security.jwt.servlet.JwtAuthenticationConverter
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Lazy
-import org.springframework.security.authentication.ReactiveAuthenticationManager
-import org.springframework.security.web.server.authentication.AuthenticationWebFilter
+import org.springframework.security.authentication.AuthenticationManager
+import org.springframework.security.web.authentication.AuthenticationConverter
 
 @Configuration
 class SecurityBeansConfiguration {
@@ -48,39 +47,22 @@ class SecurityBeansConfiguration {
         BasicAuthenticationManager(credentialsValidator)
 
     @Bean
-    fun authenticationManager(specificAuthenticationManagers: List<SpecificAuthenticationManager>): ReactiveAuthenticationManager =
-        ReactiveDelegateAuthenticationManager(specificAuthenticationManagers)
+    fun authenticationManager(specificAuthenticationManagers: List<SpecificAuthenticationManager>): AuthenticationManager =
+        ServletDelegateAuthenticationManager(specificAuthenticationManagers)
 
 
 
     @Bean
-    fun jwtAuthenticationConverter(): JwtAuthenticationConverter =
+    fun jwtAuthenticationConverter(): AuthenticationConverter =
         JwtAuthenticationConverter()
 
     @Bean
-    fun basicAuthenticationConverter(): BasicAuthenticationConverter =
+    fun basicAuthenticationConverter(): AuthenticationConverter =
         BasicAuthenticationConverter()
 
 
 
     @Bean
-    fun jwtAuthenticationWebFilter(
-        authenticationManager: ReactiveAuthenticationManager,
-        jwtAuthenticationConverter: JwtAuthenticationConverter
-    ) =
-        AuthenticationWebFilter(authenticationManager).apply {
-            setRequiresAuthenticationMatcher(JwtExchangeMatcher())
-            setServerAuthenticationConverter(jwtAuthenticationConverter)
-        }
-
-    @Bean
-    fun basicAuthenticationWebFilter(
-        authenticationManager: ReactiveAuthenticationManager,
-        basicAuthenticationConverter: BasicAuthenticationConverter
-    ) =
-        AuthenticationWebFilter(authenticationManager).apply {
-            setRequiresAuthenticationMatcher(BasicExchangeMatcher())
-            setServerAuthenticationConverter(basicAuthenticationConverter)
-        }
-
+    fun authenticationFilter(authenticationManager: AuthenticationManager, authenticationConverters: List<AuthenticationConverter>) =
+        ServletAuthenticationFilter(authenticationManager, authenticationConverters)
 }
\ No newline at end of file
diff --git a/music-service/src/main/kotlin/com/michibaum/music_service/security/SecurityConfiguration.kt b/music-service/src/main/kotlin/com/michibaum/music_service/security/SecurityConfiguration.kt
index 78a98b9b..174604f3 100644
--- a/music-service/src/main/kotlin/com/michibaum/music_service/security/SecurityConfiguration.kt
+++ b/music-service/src/main/kotlin/com/michibaum/music_service/security/SecurityConfiguration.kt
@@ -1,42 +1,46 @@
 package com.michibaum.music_service.security
 
+import com.michibaum.authentication_library.security.ServletAuthenticationFilter
 import com.michibaum.permission_library.Permissions
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity
 import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity
+import org.springframework.security.config.annotation.web.builders.HttpSecurity
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity
 import org.springframework.security.config.web.server.SecurityWebFiltersOrder
 import org.springframework.security.config.web.server.ServerHttpSecurity
 import org.springframework.security.config.web.server.ServerHttpSecurity.AuthorizeExchangeSpec
+import org.springframework.security.web.SecurityFilterChain
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
 import org.springframework.security.web.server.SecurityWebFilterChain
 import org.springframework.security.web.server.authentication.AuthenticationWebFilter
 
 
 @Configuration
-@EnableWebFluxSecurity
-@EnableReactiveMethodSecurity
+@EnableWebSecurity
+@EnableMethodSecurity
 class SecurityConfiguration {
 
     @Bean
     fun securityFilterChain(
-        http: ServerHttpSecurity,
-        jwtAuthenticationWebFilter: AuthenticationWebFilter,
-        basicAuthenticationWebFilter: AuthenticationWebFilter,
-    ): SecurityWebFilterChain {
+        http: HttpSecurity,
+        authenticationFilter: ServletAuthenticationFilter
+    ): SecurityFilterChain {
         return http
-            .authorizeExchange { exchanges: AuthorizeExchangeSpec ->
-                exchanges
-                    .pathMatchers(
+            .authorizeHttpRequests {
+                it
+                    .requestMatchers(
                         "/api/spotify/auth",
                     ).permitAll()
-                    .pathMatchers(
+                    .requestMatchers(
                         "/actuator",
                         "/actuator/**"
                     ).hasAnyAuthority(Permissions.ADMIN_SERVICE.name)
-                    .anyExchange().authenticated()
+                    .anyRequest().authenticated()
             }
-            .addFilterAt(basicAuthenticationWebFilter, SecurityWebFiltersOrder.AUTHENTICATION)
-            .addFilterAt(jwtAuthenticationWebFilter, SecurityWebFiltersOrder.AUTHENTICATION)
+            .addFilterBefore(authenticationFilter, UsernamePasswordAuthenticationFilter::class.java)
             .httpBasic { httpBasicSpec -> httpBasicSpec.disable() }
             .formLogin { formLoginSpec -> formLoginSpec.disable() }
             .csrf { csrfSpec -> csrfSpec.disable() }
diff --git a/music-service/src/main/kotlin/com/michibaum/music_service/spotify/api/AbstractSpotifyApiClient.kt b/music-service/src/main/kotlin/com/michibaum/music_service/spotify/api/AbstractSpotifyApiClient.kt
index f7cd6bfd..8985b4fc 100644
--- a/music-service/src/main/kotlin/com/michibaum/music_service/spotify/api/AbstractSpotifyApiClient.kt
+++ b/music-service/src/main/kotlin/com/michibaum/music_service/spotify/api/AbstractSpotifyApiClient.kt
@@ -2,19 +2,15 @@ package com.michibaum.music_service.spotify.api
 
 import org.springframework.http.HttpHeaders
 import org.springframework.http.MediaType
-import org.springframework.web.reactive.function.client.WebClient
+import org.springframework.web.client.RestClient
 
 open class AbstractSpotifyApiClient {
 
-    val client = WebClient.builder()
+    val client = RestClient.builder()
         .baseUrl("https://api.spotify.com/v1")
         .defaultHeaders {
             it.set(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
         }
-        .codecs { configurer ->
-            configurer.defaultCodecs()
-                .maxInMemorySize(10000000)
-        }
         .build()
 
 }
diff --git a/music-service/src/main/kotlin/com/michibaum/music_service/spotify/api/user/SpotifyUserApiImpl.kt b/music-service/src/main/kotlin/com/michibaum/music_service/spotify/api/user/SpotifyUserApiImpl.kt
index cfda9a8a..cb0d0b93 100644
--- a/music-service/src/main/kotlin/com/michibaum/music_service/spotify/api/user/SpotifyUserApiImpl.kt
+++ b/music-service/src/main/kotlin/com/michibaum/music_service/spotify/api/user/SpotifyUserApiImpl.kt
@@ -20,11 +20,10 @@ class SpotifyUserApiImpl: AbstractSpotifyApiClient(), SpotifyUserApi {
                 it.setBearerAuth(credentials.accessToken)
             }
             .retrieve()
-            .onStatus({ t -> t.value() == 401 }, { Mono.error(Exception()) })
-            .onStatus({ t -> t.value() == 403 }, { Mono.error(Exception()) })
-            .onStatus({ t -> t.value() == 429 }, { Mono.error(Exception()) })
-            .bodyToMono(SpotifyMeDto::class.java)
-            .block()
+            .onStatus({ t -> t.value() == 401 }, { _, _ -> })
+            .onStatus({ t -> t.value() == 403 }, { _, _ -> })
+            .onStatus({ t -> t.value() == 429 }, { _, _ -> })
+            .body(SpotifyMeDto::class.java)
     }
 
     override fun myTopTracks(timeRange: TimeRange, credentials: SpotifyOAuthCredentials): SpotifyTopItemsDto? {
@@ -35,11 +34,10 @@ class SpotifyUserApiImpl: AbstractSpotifyApiClient(), SpotifyUserApi {
                 it.setBearerAuth(credentials.accessToken)
             }
             .retrieve()
-            .onStatus({ t -> t.value() == 401 }, { Mono.error(Exception()) })
-            .onStatus({ t -> t.value() == 403 }, { Mono.error(Exception()) })
-            .onStatus({ t -> t.value() == 429 }, { Mono.error(Exception()) })
-            .bodyToMono(SpotifyTopItemsDto::class.java)
-            .block()
+            .onStatus({ t -> t.value() == 401 }, { _, _ -> })
+            .onStatus({ t -> t.value() == 403 }, { _, _ -> })
+            .onStatus({ t -> t.value() == 429 }, { _, _ -> })
+            .body(SpotifyTopItemsDto::class.java)
     }
 
     override fun myTopArtists(timeRange: TimeRange, credentials: SpotifyOAuthCredentials): SpotifyTopItemsDto? {
@@ -50,11 +48,10 @@ class SpotifyUserApiImpl: AbstractSpotifyApiClient(), SpotifyUserApi {
                 it.setBearerAuth(credentials.accessToken)
             }
             .retrieve()
-            .onStatus({ t -> t.value() == 401 }, { Mono.error(Exception()) })
-            .onStatus({ t -> t.value() == 403 }, { Mono.error(Exception()) })
-            .onStatus({ t -> t.value() == 429 }, { Mono.error(Exception()) })
-            .bodyToMono(SpotifyTopItemsDto::class.java)
-            .block()
+            .onStatus({ t -> t.value() == 401 }, { _, _ -> })
+            .onStatus({ t -> t.value() == 403 }, { _, _ -> })
+            .onStatus({ t -> t.value() == 429 }, { _, _ -> })
+            .body(SpotifyTopItemsDto::class.java)
     }
 
     override fun profileFor(userId: String, credentials: SpotifyOAuthCredentials): SpotifyUserDto? {
@@ -64,10 +61,9 @@ class SpotifyUserApiImpl: AbstractSpotifyApiClient(), SpotifyUserApi {
                 it.setBearerAuth(credentials.accessToken)
             }
             .retrieve()
-            .onStatus({ t -> t.value() == 401 }, { Mono.error(Exception()) })
-            .onStatus({ t -> t.value() == 403 }, { Mono.error(Exception()) })
-            .onStatus({ t -> t.value() == 429 }, { Mono.error(Exception()) })
-            .bodyToMono(SpotifyUserDto::class.java)
-            .block()
+            .onStatus({ t -> t.value() == 401 }, { _, _ -> })
+            .onStatus({ t -> t.value() == 403 }, { _, _ -> })
+            .onStatus({ t -> t.value() == 429 }, { _, _ -> })
+            .body(SpotifyUserDto::class.java)
     }
 }
\ No newline at end of file
diff --git a/music-service/src/main/kotlin/com/michibaum/music_service/spotify/oauth/SpotifyOAuthController.kt b/music-service/src/main/kotlin/com/michibaum/music_service/spotify/oauth/SpotifyOAuthController.kt
index 4ae9e807..1f4ccc3c 100644
--- a/music-service/src/main/kotlin/com/michibaum/music_service/spotify/oauth/SpotifyOAuthController.kt
+++ b/music-service/src/main/kotlin/com/michibaum/music_service/spotify/oauth/SpotifyOAuthController.kt
@@ -6,8 +6,7 @@ import org.springframework.http.MediaType
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
-import org.springframework.web.reactive.function.BodyInserters
-import org.springframework.web.reactive.function.client.WebClient
+import org.springframework.web.client.RestClient
 import reactor.core.publisher.Mono
 import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
@@ -19,13 +18,13 @@ class SpotifyOAuthController(
     private val spotifyOAuthProperties: SpotifyOAuthProperties
 ) { // https://developer.spotify.com/documentation/web-api/tutorials/code-flow
 
-    private final val client: WebClient
+    private final val client: RestClient
 
     init {
         val clientAndSecret = spotifyOAuthProperties.clientId + ":" + spotifyOAuthProperties.clientSecret
         val authBasic = Base64.getUrlEncoder().withoutPadding().encodeToString(clientAndSecret.encodeToByteArray())
 
-        client = WebClient.builder()
+        client = RestClient.builder()
             .baseUrl("https://accounts.spotify.com")
             .defaultHeaders {
                 it.set("Authorization", "Basic $authBasic")
@@ -76,9 +75,8 @@ class SpotifyOAuthController(
                     .with("redirect_uri", "https://music.michibaum.ch/api/spotify/auth")
             )
             .retrieve()
-            .onStatus({ t -> t.is4xxClientError }, { Mono.error(Exception()) })
-            .bodyToMono(SpotifyOAuthCredentialsDto::class.java)
-            .block()
+            .onStatus({ t -> t.is4xxClientError }, { _, _ -> })
+            .body(SpotifyOAuthCredentialsDto::class.java)
 
         if(response == null){
             throw Exception("Spotify OAuth exchange for access token returned null")
diff --git a/usermanagement-service/pom.xml b/usermanagement-service/pom.xml
index 791801d7..521fcff8 100644
--- a/usermanagement-service/pom.xml
+++ b/usermanagement-service/pom.xml
@@ -21,7 +21,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/security/SecurityBeansConfiguration.kt b/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/security/SecurityBeansConfiguration.kt
index 8ea273ae..bf34ec32 100644
--- a/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/security/SecurityBeansConfiguration.kt
+++ b/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/security/SecurityBeansConfiguration.kt
@@ -1,21 +1,20 @@
 package com.michibaum.usermanagement_service.security
 
 import com.michibaum.authentication_library.AuthenticationClient
-import com.michibaum.authentication_library.security.ReactiveDelegateAuthenticationManager
+import com.michibaum.authentication_library.security.ServletAuthenticationFilter
+import com.michibaum.authentication_library.security.ServletDelegateAuthenticationManager
 import com.michibaum.authentication_library.security.SpecificAuthenticationManager
 import com.michibaum.authentication_library.security.basic.BasicAuthenticationManager
-import com.michibaum.authentication_library.security.basic.BasicExchangeMatcher
 import com.michibaum.authentication_library.security.basic.CredentialsValidator
-import com.michibaum.authentication_library.security.basic.netty.BasicAuthenticationConverter
+import com.michibaum.authentication_library.security.basic.servlet.BasicAuthenticationConverter
 import com.michibaum.authentication_library.security.jwt.JwsValidator
 import com.michibaum.authentication_library.security.jwt.JwtAuthenticationManager
-import com.michibaum.authentication_library.security.jwt.JwtExchangeMatcher
-import com.michibaum.authentication_library.security.jwt.netty.JwtAuthenticationConverter
+import com.michibaum.authentication_library.security.jwt.servlet.JwtAuthenticationConverter
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Lazy
-import org.springframework.security.authentication.ReactiveAuthenticationManager
-import org.springframework.security.web.server.authentication.AuthenticationWebFilter
+import org.springframework.security.authentication.AuthenticationManager
+import org.springframework.security.web.authentication.AuthenticationConverter
 
 @Configuration
 class SecurityBeansConfiguration {
@@ -47,39 +46,22 @@ class SecurityBeansConfiguration {
         BasicAuthenticationManager(credentialsValidator)
 
     @Bean
-    fun authenticationManager(specificAuthenticationManagers: List<SpecificAuthenticationManager>): ReactiveAuthenticationManager =
-        ReactiveDelegateAuthenticationManager(specificAuthenticationManagers)
+    fun authenticationManager(specificAuthenticationManagers: List<SpecificAuthenticationManager>): AuthenticationManager =
+        ServletDelegateAuthenticationManager(specificAuthenticationManagers)
 
 
 
     @Bean
-    fun jwtAuthenticationConverter(): JwtAuthenticationConverter =
+    fun jwtAuthenticationConverter(): AuthenticationConverter =
         JwtAuthenticationConverter()
 
     @Bean
-    fun basicAuthenticationConverter(): BasicAuthenticationConverter =
+    fun basicAuthenticationConverter(): AuthenticationConverter =
         BasicAuthenticationConverter()
 
 
 
     @Bean
-    fun jwtAuthenticationWebFilter(
-        authenticationManager: ReactiveAuthenticationManager,
-        jwtAuthenticationConverter: JwtAuthenticationConverter
-    ) =
-        AuthenticationWebFilter(authenticationManager).apply {
-            setRequiresAuthenticationMatcher(JwtExchangeMatcher())
-            setServerAuthenticationConverter(jwtAuthenticationConverter)
-        }
-
-    @Bean
-    fun basicAuthenticationWebFilter(
-        authenticationManager: ReactiveAuthenticationManager,
-        basicAuthenticationConverter: BasicAuthenticationConverter
-    ) =
-        AuthenticationWebFilter(authenticationManager).apply {
-            setRequiresAuthenticationMatcher(BasicExchangeMatcher())
-            setServerAuthenticationConverter(basicAuthenticationConverter)
-        }
-
+    fun authenticationFilter(authenticationManager: AuthenticationManager, authenticationConverters: List<AuthenticationConverter>) =
+        ServletAuthenticationFilter(authenticationManager, authenticationConverters)
 }
\ No newline at end of file
diff --git a/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/security/SecurityConfiguration.kt b/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/security/SecurityConfiguration.kt
index 624b32eb..1aa3811c 100644
--- a/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/security/SecurityConfiguration.kt
+++ b/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/security/SecurityConfiguration.kt
@@ -1,38 +1,42 @@
 package com.michibaum.usermanagement_service.security
 
+import com.michibaum.authentication_library.security.ServletAuthenticationFilter
 import com.michibaum.permission_library.Permissions
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpMethod.POST
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity
 import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity
+import org.springframework.security.config.annotation.web.builders.HttpSecurity
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity
 import org.springframework.security.config.web.server.SecurityWebFiltersOrder
 import org.springframework.security.config.web.server.ServerHttpSecurity
 import org.springframework.security.config.web.server.ServerHttpSecurity.AuthorizeExchangeSpec
+import org.springframework.security.web.SecurityFilterChain
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
 import org.springframework.security.web.server.SecurityWebFilterChain
 import org.springframework.security.web.server.authentication.AuthenticationWebFilter
 
 
 @Configuration
-@EnableWebFluxSecurity
-@EnableReactiveMethodSecurity
+@EnableWebSecurity
+@EnableMethodSecurity
 class SecurityConfiguration {
 
     @Bean
     fun securityFilterChain(
-        http: ServerHttpSecurity,
-        jwtAuthenticationWebFilter: AuthenticationWebFilter,
-        basicAuthenticationWebFilter: AuthenticationWebFilter,
-    ): SecurityWebFilterChain {
+        http: HttpSecurity,
+        authenticationFilter: ServletAuthenticationFilter
+    ): SecurityFilterChain {
         return http
-            .authorizeExchange { exchanges: AuthorizeExchangeSpec ->
-                exchanges
-                    .pathMatchers(POST,"/api/checkUserDetails", "/api/users").permitAll()
-                    .pathMatchers("/actuator", "/actuator/**").hasAnyAuthority(Permissions.ADMIN_SERVICE.name)
-                    .anyExchange().authenticated()
+            .authorizeHttpRequests {
+                it
+                    .requestMatchers(POST,"/api/checkUserDetails", "/api/users").permitAll()
+                    .requestMatchers("/actuator", "/actuator/**").hasAnyAuthority(Permissions.ADMIN_SERVICE.name)
+                    .anyRequest().authenticated()
             }
-            .addFilterAt(basicAuthenticationWebFilter, SecurityWebFiltersOrder.AUTHENTICATION)
-            .addFilterAt(jwtAuthenticationWebFilter, SecurityWebFiltersOrder.AUTHENTICATION)
+            .addFilterBefore(authenticationFilter, UsernamePasswordAuthenticationFilter::class.java)
             .httpBasic { httpBasicSpec -> httpBasicSpec.disable() }
             .formLogin { formLoginSpec -> formLoginSpec.disable() }
             .csrf { csrfSpec -> csrfSpec.disable() }

From 513e71a8126b4a73323bf87cd5a6a44c20752f32 Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Sun, 29 Dec 2024 11:10:47 +0100
Subject: [PATCH 11/27] Refactor OAuth requests to use dedicated DTO objects

Replaced inline form data builder with DTO classes for Fitbit and Spotify OAuth requests to improve maintainability and clarity. Added new DTOs for token requests, ensuring consistent structure and easier extensibility. Also introduced support for a new "FREESTYLE" chess platform across services and database schema.
---
 .../com/michibaum/chess_service/apis/ApiService.kt       | 2 ++
 .../com/michibaum/chess_service/domain/ChessPlatform.kt  | 3 ++-
 .../db/migration/V3__move_fide_infos_to_account.sql      | 4 ++--
 .../fitbit/oauth/FitbitOAuthController.kt                | 9 ++-------
 .../fitness_service/fitbit/oauth/FitbitOAuthImpl.kt      | 6 ++----
 .../fitness_service/fitbit/oauth/FitbitRefreshBodyDto.kt | 6 ++++++
 .../fitness_service/fitbit/oauth/FitbitTokenBodyDto.kt   | 9 +++++++++
 .../spotify/oauth/SpotifyOAuthController.kt              | 8 ++------
 .../music_service/spotify/oauth/SpotifyOAuthDto.kt       | 7 +++++++
 website/src/app/core/models/chess/chess.models.ts        | 3 ++-
 10 files changed, 36 insertions(+), 21 deletions(-)
 create mode 100644 fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitRefreshBodyDto.kt
 create mode 100644 fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitTokenBodyDto.kt
 create mode 100644 music-service/src/main/kotlin/com/michibaum/music_service/spotify/oauth/SpotifyOAuthDto.kt

diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/ApiService.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/ApiService.kt
index 9458d77a..874e23e7 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/ApiService.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/apis/ApiService.kt
@@ -27,6 +27,7 @@ class ApiService(
             ChessPlatform.CHESSCOM -> chesscomApiService.getStats(account)
             ChessPlatform.LICHESS -> lichessApiService.getStats(account)
             ChessPlatform.FIDE -> TODO()
+            ChessPlatform.FREESTYLE -> TODO()
         }
 
     }
@@ -36,6 +37,7 @@ class ApiService(
             ChessPlatform.CHESSCOM -> chesscomApiService.getGames(account)
             ChessPlatform.LICHESS -> lichessApiService.getGames(account)
             ChessPlatform.FIDE -> TODO()
+            ChessPlatform.FREESTYLE -> TODO()
         }
 
         if(result is Success){
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/ChessPlatform.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/ChessPlatform.kt
index de9b03f1..4511c185 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/ChessPlatform.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/ChessPlatform.kt
@@ -3,5 +3,6 @@ package com.michibaum.chess_service.domain
 enum class ChessPlatform{
     CHESSCOM,
     LICHESS,
-    FIDE
+    FIDE,
+    FREESTYLE
 }
\ No newline at end of file
diff --git a/chess-service/src/main/resources/db/migration/V3__move_fide_infos_to_account.sql b/chess-service/src/main/resources/db/migration/V3__move_fide_infos_to_account.sql
index 8618b80b..83ec484d 100644
--- a/chess-service/src/main/resources/db/migration/V3__move_fide_infos_to_account.sql
+++ b/chess-service/src/main/resources/db/migration/V3__move_fide_infos_to_account.sql
@@ -1,7 +1,7 @@
 -- Modify User and account table that user infos drop into separate account
 alter table account modify platform enum ('CHESSCOM', 'LICHESS', 'OVER_THE_BOARD', 'FIDE') not null;
 UPDATE account a SET a.platform = 'FIDE' WHERE a.platform = 'OVER_THE_BOARD';
-alter table account modify platform enum ('CHESSCOM', 'LICHESS', 'FIDE') not null;
+alter table account modify platform enum ('CHESSCOM', 'LICHESS', 'FIDE', 'FREESTYLE') not null;
 
 INSERT INTO account (id, created_at, person_id, name, platform_id, url, username, platform)
 SELECT
@@ -26,5 +26,5 @@ WHERE
 alter table account drop column url;
 alter table person drop column fide_id;
 alter table event add platform enum ('CHESSCOM', 'LICHESS', 'FIDE') NOT NULL DEFAULT 'FIDE';
-alter table event MODIFY platform ENUM('CHESSCOM', 'LICHESS', 'FIDE') NOT NULL;
+alter table event MODIFY platform ENUM('CHESSCOM', 'LICHESS', 'FIDE', 'FREESTYLE') NOT NULL;
 alter table event add internal_comment TEXT default '' not null;
\ No newline at end of file
diff --git a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthController.kt b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthController.kt
index 51a159d1..f391b070 100644
--- a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthController.kt
+++ b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthController.kt
@@ -64,17 +64,12 @@ class FitbitOAuthController(
     fun authorizationCode(@RequestParam code: String, @RequestParam state: String){
         val oAuthData = fitbitOAuthService.findByState(state) ?: throw Exception("No oAuthData found by state $state")
 
+        val body = FitbitTokenBodyDto(fitbitOAuthProperties.clientId, "authorization_code", code, oAuthData.codeVerifier, "https://fitness.michibaum.ch/api/fitbit/auth")
         val response = client
             .post()
             .uri("/oauth2/token")
             .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-            .body(
-                BodyInserters.fromFormData("client_id", fitbitOAuthProperties.clientId)
-                    .with("grant_type", "authorization_code")
-                    .with("code", code)
-                    .with("code_verifier", oAuthData.codeVerifier)
-                    .with("redirect_uri", "https://fitness.michibaum.ch/api/fitbit/auth")
-            )
+            .body(body) // TODO needs testing if correct deserialized
             .retrieve()
             .onStatus({ t -> t.is4xxClientError }, { _, _ -> }) // TODO https://dev.fitbit.com/build/reference/web-api/troubleshooting-guide/error-messages/#authorization-errors
             .body(FitbitOAuthCredentialsDto::class.java)
diff --git a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthImpl.kt b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthImpl.kt
index 1aade2db..495ae9d5 100644
--- a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthImpl.kt
+++ b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthImpl.kt
@@ -30,14 +30,12 @@ class FitbitOAuthImpl(
                 it.set(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE)
             }
             .build()
+        val body = FitbitRefreshBodyDto("refresh_token", credentials.refreshToken)
         val response = client
             .post()
             .uri("/oauth2/token")
             .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-            .body(
-                BodyInserters.fromFormData("grant_type", "refresh_token")
-                    .with("refresh_token", credentials.refreshToken)
-            )
+            .body(body) // TODO needs testing if this works
             .retrieve()
             .onStatus({ t -> t.is4xxClientError }, { _, _ -> }) // TODO https://dev.fitbit.com/build/reference/web-api/troubleshooting-guide/error-messages/#authorization-errors
             .body(FitbitOAuthCredentialsDto::class.java)
diff --git a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitRefreshBodyDto.kt b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitRefreshBodyDto.kt
new file mode 100644
index 00000000..5625a632
--- /dev/null
+++ b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitRefreshBodyDto.kt
@@ -0,0 +1,6 @@
+package com.michibaum.fitness_service.fitbit.oauth
+
+data class FitbitRefreshBodyDto(
+    val grantType: String,
+    val refreshToken: String
+)
diff --git a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitTokenBodyDto.kt b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitTokenBodyDto.kt
new file mode 100644
index 00000000..0551c586
--- /dev/null
+++ b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitTokenBodyDto.kt
@@ -0,0 +1,9 @@
+package com.michibaum.fitness_service.fitbit.oauth
+
+data class FitbitTokenBodyDto(
+    val clientId: String,
+    val grantType: String,
+    val code: String,
+    val codeVerifier: String,
+    val redirectUri: String
+)
diff --git a/music-service/src/main/kotlin/com/michibaum/music_service/spotify/oauth/SpotifyOAuthController.kt b/music-service/src/main/kotlin/com/michibaum/music_service/spotify/oauth/SpotifyOAuthController.kt
index 1f4ccc3c..043b5e36 100644
--- a/music-service/src/main/kotlin/com/michibaum/music_service/spotify/oauth/SpotifyOAuthController.kt
+++ b/music-service/src/main/kotlin/com/michibaum/music_service/spotify/oauth/SpotifyOAuthController.kt
@@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 import org.springframework.web.client.RestClient
-import reactor.core.publisher.Mono
 import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
 import java.util.*
@@ -65,15 +64,12 @@ class SpotifyOAuthController(
     fun authorizationCode(@RequestParam code: String, @RequestParam state: String) {
         val oAuthData = spotifyOAuthService.findByState(state) ?: throw Exception("No oAuthData found by state $state")
 
+        val data = SpotifyOAuthDto(code, "authorization_code", "https://music.michibaum.ch/api/spotify/auth")
         val response = client
             .post()
             .uri("/api/token")
             .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-            .body(
-                BodyInserters.fromFormData("code", code)
-                    .with("grant_type", "authorization_code")
-                    .with("redirect_uri", "https://music.michibaum.ch/api/spotify/auth")
-            )
+            .body(data)// TODO needs testing
             .retrieve()
             .onStatus({ t -> t.is4xxClientError }, { _, _ -> })
             .body(SpotifyOAuthCredentialsDto::class.java)
diff --git a/music-service/src/main/kotlin/com/michibaum/music_service/spotify/oauth/SpotifyOAuthDto.kt b/music-service/src/main/kotlin/com/michibaum/music_service/spotify/oauth/SpotifyOAuthDto.kt
new file mode 100644
index 00000000..e9accfed
--- /dev/null
+++ b/music-service/src/main/kotlin/com/michibaum/music_service/spotify/oauth/SpotifyOAuthDto.kt
@@ -0,0 +1,7 @@
+package com.michibaum.music_service.spotify.oauth
+
+data class SpotifyOAuthDto(
+    val code: String,
+    val grantType: String,
+    val redirectUri: String
+)
\ No newline at end of file
diff --git a/website/src/app/core/models/chess/chess.models.ts b/website/src/app/core/models/chess/chess.models.ts
index 76e94fff..98fae7fc 100644
--- a/website/src/app/core/models/chess/chess.models.ts
+++ b/website/src/app/core/models/chess/chess.models.ts
@@ -38,7 +38,8 @@ export interface Account {
 export enum ChessPlatform{
   CHESSCOM="CHESSCOM",
   LICHESS="LICHESS",
-  FIDE="FIDE"
+  FIDE="FIDE",
+  FREESTYLE="FREESTYLE"
 }
 
 export enum ChessGameType{

From f2109f878025337d1886bc46c780e3f3d50ad5ee Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Sun, 29 Dec 2024 11:15:32 +0100
Subject: [PATCH 12/27] Remove redundant fields from test data models.

This commit removes unused or unnecessary fields such as `fideId` and `url` from various test data models and test cases. The cleanup ensures that tests only include essential fields, improving maintainability and clarity of the codebase.
---
 .../chess_service/app/account/AccountRepositoryIT.kt          | 1 -
 .../michibaum/chess_service/app/person/PersonControllerIT.kt  | 4 ----
 .../com/michibaum/chess_service/domain/AccountProvider.kt     | 1 -
 .../com/michibaum/chess_service/domain/EventProvider.kt       | 3 ++-
 .../com/michibaum/chess_service/domain/PersonProvider.kt      | 1 -
 5 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/app/account/AccountRepositoryIT.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/app/account/AccountRepositoryIT.kt
index d8631560..e23ff135 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/app/account/AccountRepositoryIT.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/app/account/AccountRepositoryIT.kt
@@ -32,7 +32,6 @@ class AccountRepositoryIT {
         assertEquals(account.name, result.name)
         assertEquals(account.platformId, result.platformId)
         assertEquals(account.username, result.username)
-        assertEquals(account.url, result.url)
         assertEquals(account.platform, result.platform)
         assertEquals(account.person, result.person)
     }
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/app/person/PersonControllerIT.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/app/person/PersonControllerIT.kt
index 9723a273..7f954963 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/app/person/PersonControllerIT.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/app/person/PersonControllerIT.kt
@@ -40,13 +40,11 @@ class PersonControllerIT {
         val requestPersonDto = WritePersonDto(
             firstname = "John",
             lastname = "Doe",
-            fideId = "121212",
             gender = Gender.MALE,
         )
         val convertedPerson = Person(
             firstname = requestPersonDto.firstname,
             lastname = requestPersonDto.lastname,
-            fideId = requestPersonDto.fideId,
             gender = Gender.MALE,
             accounts = emptySet(),
             federation = null,
@@ -56,7 +54,6 @@ class PersonControllerIT {
             id = UUID.randomUUID(),
             firstname = convertedPerson.firstname,
             lastname = convertedPerson.lastname,
-            fideId = convertedPerson.fideId,
             accounts = emptySet(),
             federation = null,
             birthday = null,
@@ -66,7 +63,6 @@ class PersonControllerIT {
             id = savedPerson.idOrThrow(),
             firstname = savedPerson.firstname,
             lastname = savedPerson.lastname,
-            fideId = savedPerson.fideId,
             federation = savedPerson.federation,
             birthday = savedPerson.birthday.toString(),
             gender = savedPerson.gender,
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/AccountProvider.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/AccountProvider.kt
index fbfcdbd5..fc62ffcf 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/AccountProvider.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/AccountProvider.kt
@@ -11,7 +11,6 @@ class AccountProvider {
                 name = "Michi",
                 platformId = "TGsdisd3",
                 username = username,
-                url = "https://chess-is-best.com/Michi1",
                 platform = ChessPlatform.CHESSCOM,
                 person = person,
                 createdAt = LocalDate.ofInstant(Instant.ofEpochSecond(1595005065053), ZoneId.systemDefault()),
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/EventProvider.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/EventProvider.kt
index fe2014fa..b395e754 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/EventProvider.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/EventProvider.kt
@@ -14,7 +14,8 @@ class EventProvider {
                 embedUrl = "https://www.chess.com/events/embed/2024-fide-chess-world-championship",
                 dateFrom = LocalDate.of(2024, 11, 25),
                 dateTo = LocalDate.of(2024, 12, 13),
-                participants = participants
+                participants = participants,
+                internalComment = ""
             )
 
     }
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/PersonProvider.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/PersonProvider.kt
index 39e4c677..7e223f9a 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/PersonProvider.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/PersonProvider.kt
@@ -9,7 +9,6 @@ class PersonProvider {
             return Person(
                 firstname = "Michi",
                 lastname = "Baum",
-                fideId = null,
                 accounts = accounts,
                 federation = "SUI",
                 birthday = LocalDate.of(2001, 3, 31),

From 067639543a10435eba425206e3b4e23997c7f753 Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Mon, 30 Dec 2024 18:16:20 +0100
Subject: [PATCH 13/27] Refactor integration tests to use MockMvc and
 Testcontainers

Replaced WebTestClient with MockMvc for consistency across test cases and improved maintainability. Added Testcontainers configuration for better test isolation and removed redundant or outdated configurations. Simplified and parameterized repeated test logic for improved readability and efficiency.
---
 .../com/michibaum/admin_service/ActuatorIT.kt | 103 +++------------
 authentication-service/pom.xml                |  20 ++-
 .../authentication_service/ActuatorIT.kt      | 108 ++++------------
 .../AuthenticationServiceApplicationIT.kt     |   1 +
 .../TestcontainersConfiguration.kt            |  10 ++
 .../TestcontainersTestConfiguration.kt        |  18 +++
 .../AuthenticationControllerIT.kt             |  24 ++--
 .../authentication/AuthenticationServiceIT.kt |   2 +
 .../src/test/resources/application.yml        |  11 --
 chess-service/pom.xml                         |  43 +++----
 .../com/michibaum/chess_service/ActuatorIT.kt | 108 ++++------------
 .../ChessServiceApplicationIT.kt              |   1 +
 .../TestcontainersConfiguration.kt            |  10 ++
 .../TestcontainersTestConfiguration.kt        |  18 +++
 .../chess_service/apis/ApiServiceIT.kt        |   2 +
 .../apis/chesscom/IApiServiceImplIT.kt        |   2 +
 .../apis/lichess/IApiServiceImplIT.kt         |   2 +
 .../app/account/AccountRepositoryIT.kt        |   4 +
 .../app/account/AccountServiceIT.kt           |  10 +-
 .../app/account/AccountServiceUT.kt           |  78 ------------
 .../app/event/EventControllerIT.kt            | 118 +++++++++---------
 .../app/person/PersonControllerIT.kt          |   2 +
 .../app/person/PersonRepositoryIT.kt          |   4 +
 .../chess_service/domain/AccountProvider.kt   |   6 +-
 .../src/test/resources/application.yml        |  14 ---
 fitness-service/pom.xml                       |  20 ++-
 .../michibaum/fitness_service/ActuatorIT.kt   | 108 ++++------------
 .../FitbitOAuthControllerIT.kt                |  25 ++--
 .../FitnessServiceApplicationIT.kt            |   1 +
 .../TestcontainersConfiguration.kt            |  13 ++
 .../TestcontainersTestConfiguration.kt        |  18 +++
 .../fitbit/api/weight/RepositoryIT.kt         |   2 +
 .../src/test/resources/application.yml        |  11 --
 music-service/pom.xml                         |  20 ++-
 .../com/michibaum/music_service/ActuatorIT.kt |  55 ++++++++
 .../MusicServiceApplicationIT.kt              |   1 +
 .../TestcontainersConfiguration.kt            |  10 ++
 .../TestcontainersTestConfiguration.kt        |  18 +++
 pom.xml                                       |   1 -
 .../michibaum/registry_service/ActuatorIT.kt  |  54 ++++++++
 usermanagement-service/pom.xml                |  20 ++-
 .../usermanagement_service/ActuatorIT.kt      | 105 ++++------------
 .../TestcontainersConfiguration.kt            |  10 ++
 .../TestcontainersTestConfiguration.kt        |  18 +++
 .../UserRepositoryIT.kt                       |   3 +
 .../UsermanagementServiceApplicationIT.kt     |   1 +
 .../src/test/resources/application.yml        |  11 --
 .../michibaum/websiteservice/ActuatorIT.kt    |  78 +++---------
 48 files changed, 588 insertions(+), 734 deletions(-)
 create mode 100644 authentication-service/src/test/kotlin/com/michibaum/authentication_service/TestcontainersConfiguration.kt
 create mode 100644 authentication-service/src/test/kotlin/com/michibaum/authentication_service/TestcontainersTestConfiguration.kt
 create mode 100644 chess-service/src/test/kotlin/com/michibaum/chess_service/TestcontainersConfiguration.kt
 create mode 100644 chess-service/src/test/kotlin/com/michibaum/chess_service/TestcontainersTestConfiguration.kt
 delete mode 100644 chess-service/src/test/kotlin/com/michibaum/chess_service/app/account/AccountServiceUT.kt
 create mode 100644 fitness-service/src/test/kotlin/com/michibaum/fitness_service/TestcontainersConfiguration.kt
 create mode 100644 fitness-service/src/test/kotlin/com/michibaum/fitness_service/TestcontainersTestConfiguration.kt
 create mode 100644 music-service/src/test/kotlin/com/michibaum/music_service/ActuatorIT.kt
 create mode 100644 music-service/src/test/kotlin/com/michibaum/music_service/TestcontainersConfiguration.kt
 create mode 100644 music-service/src/test/kotlin/com/michibaum/music_service/TestcontainersTestConfiguration.kt
 create mode 100644 registry-service/src/test/kotlin/com/michibaum/registry_service/ActuatorIT.kt
 create mode 100644 usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/TestcontainersConfiguration.kt
 create mode 100644 usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/TestcontainersTestConfiguration.kt

diff --git a/admin-service/src/test/kotlin/com/michibaum/admin_service/ActuatorIT.kt b/admin-service/src/test/kotlin/com/michibaum/admin_service/ActuatorIT.kt
index 3c40e86d..ffa36d64 100644
--- a/admin-service/src/test/kotlin/com/michibaum/admin_service/ActuatorIT.kt
+++ b/admin-service/src/test/kotlin/com/michibaum/admin_service/ActuatorIT.kt
@@ -1,10 +1,13 @@
 package com.michibaum.admin_service
 
-import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 import java.util.*
 
 @AutoConfigureMockMvc
@@ -15,102 +18,34 @@ import java.util.*
 class ActuatorIT {
 
     @Autowired
-    lateinit var webClient: WebTestClient
+    lateinit var mockMvc: MockMvc
 
-    @Test
-    fun `actuator without authentication returns 401`(){
+    @ParameterizedTest
+    @ValueSource(strings = ["/actuator", "/actuator/health", "/actuator/info"])
+    fun `actuator endpoints return 401`(endpoint: String){
         // GIVEN
 
         // WHEN
-        webClient.get()
-            .uri("/actuator")
-            .exchange()
-            .expectStatus()
-            .isUnauthorized
+        mockMvc.perform(get(endpoint))
+            .andExpect(status().isUnauthorized)
 
         // THEN
 
     }
 
-    @Test
-    fun `actuator health without authentication returns 401`(){
-        // GIVEN
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator/health")
-            .exchange()
-            .expectStatus()
-            .isUnauthorized
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator info without authentication returns 401`(){
-        // GIVEN
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator/info")
-            .exchange()
-            .expectStatus()
-            .isUnauthorized
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator with authentication returns 200`(){
-        // GIVEN
-        val basicAuth = "someUsername:somePasswööörd"
-        val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator")
-            .headers { it.setBasicAuth(basicAuthEncoded) }
-            .exchange()
-            .expectStatus()
-            .isOk // TODO returns 302 redirect to / because of success authentication
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator health with authentication returns 200`(){
-        // GIVEN
-        val basicAuth = "someUsername:somePasswööörd"
-        val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator/health")
-            .headers { it.setBasicAuth(basicAuthEncoded) }
-            .exchange()
-            .expectStatus()
-            .isOk // TODO returns 302 redirect to / because of success authentication
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator info with authentication returns 200`(){
+    @ParameterizedTest
+    @ValueSource(strings = ["/actuator", "/actuator/health", "/actuator/info"])
+    fun `actuator endpoints with basic authentication return 200`(endpoint: String){
         // GIVEN
         val basicAuth = "someUsername:somePasswööörd"
         val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
 
         // WHEN
-        webClient.get()
-            .uri("/actuator/info")
-            .headers { it.setBasicAuth(basicAuthEncoded) }
-            .exchange()
-            .expectStatus()
-            .isOk // TODO returns 302 redirect to / because of success authentication
+        mockMvc.perform(
+            get(endpoint)
+                .header("Authorization", "Basic $basicAuthEncoded")
+        )
+            .andExpect(status().isOk)
 
         // THEN
 
diff --git a/authentication-service/pom.xml b/authentication-service/pom.xml
index 72cb980b..0d0fac46 100644
--- a/authentication-service/pom.xml
+++ b/authentication-service/pom.xml
@@ -112,8 +112,24 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>mariadb</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/authentication-service/src/test/kotlin/com/michibaum/authentication_service/ActuatorIT.kt b/authentication-service/src/test/kotlin/com/michibaum/authentication_service/ActuatorIT.kt
index c24b735d..b209b5c0 100644
--- a/authentication-service/src/test/kotlin/com/michibaum/authentication_service/ActuatorIT.kt
+++ b/authentication-service/src/test/kotlin/com/michibaum/authentication_service/ActuatorIT.kt
@@ -1,116 +1,52 @@
 package com.michibaum.authentication_service
 
-import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 import java.util.*
 
-@AutoConfigureWebTestClient
+@AutoConfigureMockMvc
 @SpringBootTest(properties = [
     "spring.boot.admin.client.username=someUsername",
     "spring.boot.admin.client.password=somePasswööörd"
 ])
+@TestcontainersConfiguration
 class ActuatorIT {
 
     @Autowired
-    lateinit var webClient: WebTestClient
+    lateinit var mockMvc: MockMvc
 
-    @Test
-    fun `actuator without authentication returns 401`(){
+    @ParameterizedTest
+    @ValueSource(strings = ["/actuator", "/actuator/health", "/actuator/info"])
+    fun `actuator endpoints return 401`(endpoint: String){
         // GIVEN
 
         // WHEN
-        webClient.get()
-            .uri("/actuator")
-            .exchange()
-            .expectStatus()
-            .isUnauthorized
+        mockMvc.perform(get(endpoint))
+            .andExpect(status().isUnauthorized)
 
         // THEN
 
     }
 
-    @Test
-    fun `actuator health without authentication returns 401`(){
-        // GIVEN
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator/health")
-            .exchange()
-            .expectStatus()
-            .isUnauthorized
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator info without authentication returns 401`(){
-        // GIVEN
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator/info")
-            .exchange()
-            .expectStatus()
-            .isUnauthorized
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator with authentication returns 200`(){
-        // GIVEN
-        val basicAuth = "someUsername:somePasswööörd"
-        val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator")
-            .headers { it.setBasicAuth(basicAuthEncoded) }
-            .exchange()
-            .expectStatus()
-            .isOk
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator health with authentication returns 200`(){
-        // GIVEN
-        val basicAuth = "someUsername:somePasswööörd"
-        val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator/health")
-            .headers { it.setBasicAuth(basicAuthEncoded) }
-            .exchange()
-            .expectStatus()
-            .isOk
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator info with authentication returns 200`(){
+    @ParameterizedTest
+    @ValueSource(strings = ["/actuator", "/actuator/health", "/actuator/info"])
+    fun `actuator endpoints with basic authentication return 200`(endpoint: String){
         // GIVEN
         val basicAuth = "someUsername:somePasswööörd"
         val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
 
         // WHEN
-        webClient.get()
-            .uri("/actuator/info")
-            .headers { it.setBasicAuth(basicAuthEncoded) }
-            .exchange()
-            .expectStatus()
-            .isOk
+        mockMvc.perform(
+            get(endpoint)
+                .header("Authorization", "Basic $basicAuthEncoded")
+        )
+            .andExpect(status().isOk)
 
         // THEN
 
diff --git a/authentication-service/src/test/kotlin/com/michibaum/authentication_service/AuthenticationServiceApplicationIT.kt b/authentication-service/src/test/kotlin/com/michibaum/authentication_service/AuthenticationServiceApplicationIT.kt
index c1679695..b3773836 100644
--- a/authentication-service/src/test/kotlin/com/michibaum/authentication_service/AuthenticationServiceApplicationIT.kt
+++ b/authentication-service/src/test/kotlin/com/michibaum/authentication_service/AuthenticationServiceApplicationIT.kt
@@ -7,6 +7,7 @@ import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.ApplicationContext
 
 @SpringBootTest
+@TestcontainersConfiguration
 class AuthenticationServiceApplicationIT {
 
     @Autowired
diff --git a/authentication-service/src/test/kotlin/com/michibaum/authentication_service/TestcontainersConfiguration.kt b/authentication-service/src/test/kotlin/com/michibaum/authentication_service/TestcontainersConfiguration.kt
new file mode 100644
index 00000000..756d9758
--- /dev/null
+++ b/authentication-service/src/test/kotlin/com/michibaum/authentication_service/TestcontainersConfiguration.kt
@@ -0,0 +1,10 @@
+package com.michibaum.authentication_service
+
+import org.springframework.context.annotation.Import
+import org.springframework.test.annotation.DirtiesContext
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+@Import(value = [TestcontainersTestConfiguration::class])
+annotation class TestcontainersConfiguration()
diff --git a/authentication-service/src/test/kotlin/com/michibaum/authentication_service/TestcontainersTestConfiguration.kt b/authentication-service/src/test/kotlin/com/michibaum/authentication_service/TestcontainersTestConfiguration.kt
new file mode 100644
index 00000000..9a286a36
--- /dev/null
+++ b/authentication-service/src/test/kotlin/com/michibaum/authentication_service/TestcontainersTestConfiguration.kt
@@ -0,0 +1,18 @@
+package com.michibaum.authentication_service
+
+import org.springframework.boot.test.context.TestConfiguration
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection
+import org.springframework.context.annotation.Bean
+import org.testcontainers.containers.MariaDBContainer
+import org.testcontainers.utility.DockerImageName
+
+@TestConfiguration(proxyBeanMethods = false)
+class TestcontainersTestConfiguration {
+
+    @Bean
+    @ServiceConnection
+    fun mariaDbContainer(): MariaDBContainer<*> {
+        return MariaDBContainer(DockerImageName.parse("mariadb:10.11"))
+    }
+
+}
\ No newline at end of file
diff --git a/authentication-service/src/test/kotlin/com/michibaum/authentication_service/authentication/AuthenticationControllerIT.kt b/authentication-service/src/test/kotlin/com/michibaum/authentication_service/authentication/AuthenticationControllerIT.kt
index 3d67a2d5..50f5eaaf 100644
--- a/authentication-service/src/test/kotlin/com/michibaum/authentication_service/authentication/AuthenticationControllerIT.kt
+++ b/authentication-service/src/test/kotlin/com/michibaum/authentication_service/authentication/AuthenticationControllerIT.kt
@@ -1,33 +1,33 @@
 package com.michibaum.authentication_service.authentication
 
+import com.michibaum.authentication_service.TestcontainersConfiguration
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 
 
 @SpringBootTest
 @AutoConfigureMockMvc
+@TestcontainersConfiguration
 class AuthenticationControllerIT {
 
     @Autowired
-    lateinit var client: WebTestClient
+    lateinit var mockMvc: MockMvc
 
     @Test
     fun `getAuthDetails endpoint returns result`() {
 
-        client.get()
-            .uri("/api/getAuthDetails")
-            .exchange()
-            .expectAll(
-                {it.expectStatus().isOk},
-                {it.expectBody()
-                    .jsonPath("$.algorithm").isNotEmpty
-                    .jsonPath("$.key").isNotEmpty
-                }
+        mockMvc.perform(get("/api/getAuthDetails"))
+            .andExpectAll(
+                status().isOk,
+                jsonPath("$.algorithm").isNotEmpty,
+                jsonPath("$.key").isNotEmpty
             )
-            //.expectBody().consumeWith(System.out::println)
 
     }
 
diff --git a/authentication-service/src/test/kotlin/com/michibaum/authentication_service/authentication/AuthenticationServiceIT.kt b/authentication-service/src/test/kotlin/com/michibaum/authentication_service/authentication/AuthenticationServiceIT.kt
index 288c7ee5..fc857cee 100644
--- a/authentication-service/src/test/kotlin/com/michibaum/authentication_service/authentication/AuthenticationServiceIT.kt
+++ b/authentication-service/src/test/kotlin/com/michibaum/authentication_service/authentication/AuthenticationServiceIT.kt
@@ -2,6 +2,7 @@ package com.michibaum.authentication_service.authentication
 
 import com.auth0.jwt.JWT
 import com.auth0.jwt.algorithms.Algorithm
+import com.michibaum.authentication_service.TestcontainersConfiguration
 import com.michibaum.usermanagement_library.UserDetailsDto
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Test
@@ -13,6 +14,7 @@ import java.security.interfaces.RSAPrivateKey
 import java.security.interfaces.RSAPublicKey
 
 @SpringBootTest
+@TestcontainersConfiguration
 class AuthenticationServiceIT {
 
     @Autowired
diff --git a/authentication-service/src/test/resources/application.yml b/authentication-service/src/test/resources/application.yml
index 295c24ae..8fb605a2 100644
--- a/authentication-service/src/test/resources/application.yml
+++ b/authentication-service/src/test/resources/application.yml
@@ -20,17 +20,6 @@ spring:
       lazy-attributes-resolution: true
   main:
     allow-bean-definition-overriding: true
-  datasource:
-    username: sa
-    password: password
-    driver-class-name: org.h2.Driver
-    url: jdbc:h2:mem:authentication-db
-  jpa:
-    hibernate:
-      ddl-auto: create-drop
-    properties:
-      hibernate:
-        globally_quoted_identifiers: true
 
 eureka:
   instance:
diff --git a/chess-service/pom.xml b/chess-service/pom.xml
index 5390e597..9376447d 100644
--- a/chess-service/pom.xml
+++ b/chess-service/pom.xml
@@ -29,6 +29,7 @@
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
 
+        <!-- TODO needed?? -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
@@ -79,23 +80,6 @@
             <optional>true</optional>
         </dependency>
 
-            <!-- TODO make everything async with kotlinx coroutine (CoroutineCrudRepository, awaitBody<Class>(), etc) -->
-<!--        <dependency>-->
-<!--            <groupId>org.jetbrains.kotlinx</groupId>-->
-<!--            <artifactId>kotlinx-coroutines-core</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.jetbrains.kotlinx</groupId>-->
-<!--            <artifactId>kotlinx-coroutines-core-jvm</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.jetbrains.kotlinx</groupId>-->
-<!--            <artifactId>kotlinx-coroutines-reactive</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.jetbrains.kotlinx</groupId>-->
-<!--            <artifactId>kotlinx-coroutines-reactor</artifactId>-->
-<!--        </dependency>-->
 
         <dependency>
             <groupId>com.michibaum</groupId>
@@ -130,13 +114,30 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock-standalone</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
-            <groupId>org.wiremock</groupId>
-            <artifactId>wiremock-standalone</artifactId>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>mariadb</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/ActuatorIT.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/ActuatorIT.kt
index 1ab86a41..7d43f7d3 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/ActuatorIT.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/ActuatorIT.kt
@@ -1,116 +1,52 @@
 package com.michibaum.chess_service
 
-import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 import java.util.*
 
-@AutoConfigureWebTestClient
+@AutoConfigureMockMvc
 @SpringBootTest(properties = [
     "spring.boot.admin.client.username=someUsername",
     "spring.boot.admin.client.password=somePasswööörd"
 ])
+@TestcontainersConfiguration
 class ActuatorIT {
 
     @Autowired
-    lateinit var webClient: WebTestClient
+    lateinit var mockMvc: MockMvc
 
-    @Test
-    fun `actuator without authentication returns 401`(){
+    @ParameterizedTest
+    @ValueSource(strings = ["/actuator", "/actuator/health", "/actuator/info"])
+    fun `actuator endpoints return 401`(endpoint: String){
         // GIVEN
 
         // WHEN
-        webClient.get()
-            .uri("/actuator")
-            .exchange()
-            .expectStatus()
-            .isUnauthorized
+        mockMvc.perform(get(endpoint))
+            .andExpect(status().isUnauthorized)
 
         // THEN
 
     }
 
-    @Test
-    fun `actuator health without authentication returns 401`(){
-        // GIVEN
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator/health")
-            .exchange()
-            .expectStatus()
-            .isUnauthorized
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator info without authentication returns 401`(){
-        // GIVEN
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator/info")
-            .exchange()
-            .expectStatus()
-            .isUnauthorized
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator with authentication returns 200`(){
-        // GIVEN
-        val basicAuth = "someUsername:somePasswööörd"
-        val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator")
-            .headers { it.setBasicAuth(basicAuthEncoded) }
-            .exchange()
-            .expectStatus()
-            .isOk
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator health with authentication returns 200`(){
-        // GIVEN
-        val basicAuth = "someUsername:somePasswööörd"
-        val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator/health")
-            .headers { it.setBasicAuth(basicAuthEncoded) }
-            .exchange()
-            .expectStatus()
-            .isOk
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator info with authentication returns 200`(){
+    @ParameterizedTest
+    @ValueSource(strings = ["/actuator", "/actuator/health", "/actuator/info"])
+    fun `actuator endpoints with basic authentication return 200`(endpoint: String){
         // GIVEN
         val basicAuth = "someUsername:somePasswööörd"
         val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
 
         // WHEN
-        webClient.get()
-            .uri("/actuator/info")
-            .headers { it.setBasicAuth(basicAuthEncoded) }
-            .exchange()
-            .expectStatus()
-            .isOk
+        mockMvc.perform(
+            get(endpoint)
+                .header("Authorization", "Basic $basicAuthEncoded")
+        )
+            .andExpect(status().isOk)
 
         // THEN
 
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/ChessServiceApplicationIT.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/ChessServiceApplicationIT.kt
index 108db87e..b60cd7b7 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/ChessServiceApplicationIT.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/ChessServiceApplicationIT.kt
@@ -7,6 +7,7 @@ import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.ApplicationContext
 
 @SpringBootTest
+@TestcontainersConfiguration
 class ChessServiceApplicationIT {
 
     @Autowired
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/TestcontainersConfiguration.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/TestcontainersConfiguration.kt
new file mode 100644
index 00000000..89cfce1c
--- /dev/null
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/TestcontainersConfiguration.kt
@@ -0,0 +1,10 @@
+package com.michibaum.chess_service
+
+import org.springframework.context.annotation.Import
+import org.springframework.test.annotation.DirtiesContext
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+@Import(value = [TestcontainersTestConfiguration::class])
+annotation class TestcontainersConfiguration()
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/TestcontainersTestConfiguration.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/TestcontainersTestConfiguration.kt
new file mode 100644
index 00000000..448c8283
--- /dev/null
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/TestcontainersTestConfiguration.kt
@@ -0,0 +1,18 @@
+package com.michibaum.chess_service
+
+import org.springframework.boot.test.context.TestConfiguration
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection
+import org.springframework.context.annotation.Bean
+import org.testcontainers.containers.MariaDBContainer
+import org.testcontainers.utility.DockerImageName
+
+@TestConfiguration(proxyBeanMethods = false)
+class TestcontainersTestConfiguration {
+
+    @Bean
+    @ServiceConnection
+    fun mariaDbContainer(): MariaDBContainer<*> {
+        return MariaDBContainer(DockerImageName.parse("mariadb:10.11"))
+    }
+
+}
\ No newline at end of file
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/apis/ApiServiceIT.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/apis/ApiServiceIT.kt
index e948133b..37a691d7 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/apis/ApiServiceIT.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/apis/ApiServiceIT.kt
@@ -1,5 +1,6 @@
 package com.michibaum.chess_service.apis
 
+import com.michibaum.chess_service.TestcontainersConfiguration
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotEquals
 import org.junit.jupiter.api.Disabled
@@ -11,6 +12,7 @@ import org.springframework.boot.test.context.SpringBootTest
     "chess-apis.properties.lichess.base-url=https://lichess.org",
     "chess-apis.properties.chesscom.base-url=https://api.chess.com"
 ])
+@TestcontainersConfiguration
 class ApiServiceIT{
 
     @Autowired
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/apis/chesscom/IApiServiceImplIT.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/apis/chesscom/IApiServiceImplIT.kt
index c92a1889..5553f485 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/apis/chesscom/IApiServiceImplIT.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/apis/chesscom/IApiServiceImplIT.kt
@@ -4,6 +4,7 @@ import com.github.tomakehurst.wiremock.client.WireMock
 import com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration
 import com.github.tomakehurst.wiremock.junit5.WireMockExtension
+import com.michibaum.chess_service.TestcontainersConfiguration
 import com.michibaum.chess_service.apis.Exception
 import com.michibaum.chess_service.apis.IApiService
 import com.michibaum.chess_service.apis.Success
@@ -21,6 +22,7 @@ import org.springframework.boot.test.context.SpringBootTest
 @SpringBootTest(properties = [
     "chess-apis.properties.chesscom.base-url=http://localhost:8099"
 ])
+@TestcontainersConfiguration
 class IApiServiceImplIT {
 
     @Autowired
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/apis/lichess/IApiServiceImplIT.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/apis/lichess/IApiServiceImplIT.kt
index 7ae75ddb..3839fa34 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/apis/lichess/IApiServiceImplIT.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/apis/lichess/IApiServiceImplIT.kt
@@ -3,6 +3,7 @@ package com.michibaum.chess_service.apis.lichess
 import com.github.tomakehurst.wiremock.client.WireMock
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration
 import com.github.tomakehurst.wiremock.junit5.WireMockExtension
+import com.michibaum.chess_service.TestcontainersConfiguration
 import com.michibaum.chess_service.apis.Exception
 import com.michibaum.chess_service.apis.IApiService
 import com.michibaum.chess_service.apis.Success
@@ -21,6 +22,7 @@ import org.springframework.boot.test.context.SpringBootTest
 @SpringBootTest(properties = [
 "chess-apis.properties.lichess.base-url=http://localhost:8098"
 ])
+@TestcontainersConfiguration
 class IApiServiceImplIT{
     @Autowired
     lateinit var lichessApiService: IApiService
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/app/account/AccountRepositoryIT.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/app/account/AccountRepositoryIT.kt
index e23ff135..3f30c270 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/app/account/AccountRepositoryIT.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/app/account/AccountRepositoryIT.kt
@@ -1,14 +1,18 @@
 package com.michibaum.chess_service.app.account
 
+import com.michibaum.chess_service.TestcontainersConfiguration
 import com.michibaum.chess_service.app.person.PersonRepository
 import com.michibaum.chess_service.domain.AccountProvider
 import com.michibaum.chess_service.domain.PersonProvider
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
 
 @DataJpaTest
+@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
+@TestcontainersConfiguration
 class AccountRepositoryIT {
 
     @Autowired
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/app/account/AccountServiceIT.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/app/account/AccountServiceIT.kt
index 70742226..8cdd61da 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/app/account/AccountServiceIT.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/app/account/AccountServiceIT.kt
@@ -1,13 +1,16 @@
 package com.michibaum.chess_service.app.account
 
+import com.michibaum.chess_service.TestcontainersConfiguration
 import com.michibaum.chess_service.domain.AccountProvider
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
+import java.util.*
 
 @SpringBootTest
+@TestcontainersConfiguration
 class AccountServiceIT {
 
     @Autowired
@@ -16,6 +19,7 @@ class AccountServiceIT {
     @Autowired
     lateinit var accountRepository: AccountRepository
 
+
     @Test
     fun `findById if saved account exists`(){
         // GIVEN
@@ -24,6 +28,7 @@ class AccountServiceIT {
 
         // WHEN
         val result = accountService.findById(savedAccount.idOrThrow())
+        println(accountRepository.count())
 
         // THEN
         assertNotNull(result)
@@ -32,10 +37,11 @@ class AccountServiceIT {
     @Test
     fun `findById if saved account does not exists`(){
         // GIVEN
-        val account = AccountProvider.account()
+        val id = UUID.randomUUID()
 
         // WHEN
-        val result = accountService.findById(account.idOrThrow())
+        val result = accountService.findById(id)
+        println(accountRepository.count())
 
         // THEN
         assertNull(result)
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/app/account/AccountServiceUT.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/app/account/AccountServiceUT.kt
deleted file mode 100644
index 55ba7c3c..00000000
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/app/account/AccountServiceUT.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.michibaum.chess_service.app.account
-
-import com.michibaum.chess_service.anyIterable
-import com.michibaum.chess_service.apis.ApiService
-import com.michibaum.chess_service.apis.Success
-import com.michibaum.chess_service.apis.dtos.AccountDto
-import com.michibaum.chess_service.domain.ChessPlatform
-import io.mockk.every
-import io.mockk.mockk
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
-import org.mockito.junit.jupiter.MockitoExtension
-import java.time.LocalDate
-
-@ExtendWith(MockitoExtension::class)
-class AccountServiceUT {
-
-    private val apiService: ApiService = mockk()
-    private val accountRepository: AccountRepository = mockk()
-    private val accountService: AccountService = AccountService(apiService, accountRepository)
-
-    @Test
-    fun `successfully found account` (){
-        // GIVEN
-        val username = "someUsername"
-        val apiAccount = AccountDto(
-            id = "someId",
-            url = "someUrl",
-            username = username,
-            name = "Some Name",
-            platform = ChessPlatform.CHESSCOM,
-            createdAt = LocalDate.now()
-        )
-        every { apiService.findAccount(username) } returns listOf(Success(apiAccount))
-        every { accountRepository.saveAll(anyIterable()) } returnsArgument 0
-
-        // WHEN
-        val result = accountService.getAccounts(username, false)
-
-        // THEN
-        assertEquals(1, result.size)
-        assertEquals(apiAccount.id, result[0].platformId)
-        assertEquals(apiAccount.username, result[0].username)
-
-    }
-
-    @Test
-    fun `successfully found multiple accounts` (){
-        // GIVEN
-        val username = "someUsername"
-        val apiAccount1 = AccountDto(
-            id = "someId1",
-            url = "someUrl1",
-            username = username,
-            name = "Some Name1",
-            platform = ChessPlatform.CHESSCOM,
-            createdAt = LocalDate.now()
-        )
-        val apiAccount2 = AccountDto(
-            id = "someId2",
-            url = "someUrl2",
-            username = username,
-            name = "Some Name2",
-            platform = ChessPlatform.LICHESS,
-            createdAt = LocalDate.now()
-        )
-        every { apiService.findAccount(username) } returns listOf(Success(apiAccount1), Success(apiAccount2))
-        every { accountRepository.saveAll(anyIterable()) } returnsArgument 0
-
-        // WHEN
-        val result = accountService.getAccounts(username, false)
-
-        // THEN
-        assertEquals(2, result.size)
-    }
-
-}
\ No newline at end of file
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/app/event/EventControllerIT.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/app/event/EventControllerIT.kt
index 02a5d50d..6825e224 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/app/event/EventControllerIT.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/app/event/EventControllerIT.kt
@@ -1,26 +1,27 @@
 package com.michibaum.chess_service.app.event
 
-import com.fasterxml.jackson.databind.ObjectMapper
+import com.michibaum.chess_service.TestcontainersConfiguration
 import com.michibaum.chess_service.app.person.PersonRepository
 import com.michibaum.chess_service.domain.EventProvider
 import com.michibaum.chess_service.domain.PersonProvider
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.http.MediaType
-import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 import java.util.*
 
-@AutoConfigureWebTestClient
+@AutoConfigureMockMvc
 @SpringBootTest
+@TestcontainersConfiguration
 class EventControllerIT {
 
     @Autowired
-    lateinit var webTestClient: WebTestClient
-
-    @Autowired
-    lateinit var objectMapper: ObjectMapper
+    lateinit var mockMvc: MockMvc
 
     @Autowired
     lateinit var eventRepository: EventRepository
@@ -36,14 +37,15 @@ class EventControllerIT {
         val savedEvent = eventRepository.save(event)
 
         // WHEN
-        webTestClient.get()
-            .uri("/api/events")
+        mockMvc.perform(
+            get("/api/events")
             .accept(MediaType.APPLICATION_JSON)
-            .exchange()
-            .expectAll(
-                {it.expectStatus().isOk},
-                {it.expectBody()}
-            )
+        ).andExpectAll(
+            status().isOk,
+            jsonPath("$.[0].id").exists(),
+            jsonPath("$.[0].title").exists(),
+        )
+
 
         // THEN
 
@@ -57,14 +59,14 @@ class EventControllerIT {
         val savedEvent = eventRepository.save(event)
 
         // WHEN
-        webTestClient.get()
-            .uri("/api/events/${savedEvent.id}")
-            .accept(MediaType.APPLICATION_JSON)
-            .exchange()
-            .expectAll(
-                {it.expectStatus().isOk},
-                {it.expectBody()}
-            )
+        mockMvc.perform(
+            get("/api/events/${savedEvent.id}")
+                .accept(MediaType.APPLICATION_JSON)
+        ).andExpectAll(
+            status().isOk,
+            jsonPath("$.id").exists(),
+            jsonPath("$.title").exists(),
+        )
 
         // THEN
 
@@ -82,13 +84,12 @@ class EventControllerIT {
         } while (savedEvent.id == uuid)
 
         // WHEN
-        webTestClient.get()
-            .uri("/api/events/${uuid}")
-            .accept(MediaType.APPLICATION_JSON)
-            .exchange()
-            .expectAll(
-                {it.expectStatus().isNotFound},
-            )
+        mockMvc.perform(
+            get("/api/events/${uuid}")
+                .accept(MediaType.APPLICATION_JSON)
+        ).andExpectAll(
+            status().isNotFound
+        )
 
         // THEN
 
@@ -103,17 +104,15 @@ class EventControllerIT {
         val uuid = "abc"
 
         // WHEN
-        webTestClient.get()
-            .uri("/api/events/${uuid}")
-            .accept(MediaType.APPLICATION_JSON)
-            .exchange()
-            .expectAll(
-                {it.expectStatus().isBadRequest},
-            )
+        mockMvc.perform(
+            get("/api/events/${uuid}")
+                .accept(MediaType.APPLICATION_JSON)
+        ).andExpectAll(
+            status().isBadRequest
+        )
 
         // THEN
 
-
     }
 
     @Test
@@ -125,14 +124,15 @@ class EventControllerIT {
         val savedEvent = eventRepository.save(event)
 
         // WHEN
-        webTestClient.get()
-            .uri("/api/events/${savedEvent.id}/participants")
-            .accept(MediaType.APPLICATION_JSON)
-            .exchange()
-            .expectAll(
-                {it.expectStatus().isOk},
-                {it.expectBody()}
-            )
+        mockMvc.perform(
+            get("/api/events/${savedEvent.id}/participants")
+                .accept(MediaType.APPLICATION_JSON)
+        ).andExpectAll(
+            status().isOk,
+            jsonPath("$.[0].id").exists(),
+            jsonPath("$.[0].firstname").exists(),
+            jsonPath("$.[0].lastname").exists(),
+        )
 
         // THEN
 
@@ -152,13 +152,12 @@ class EventControllerIT {
         } while (savedEvent.id == uuid)
 
         // WHEN
-        webTestClient.get()
-            .uri("/api/events/${uuid}/participants")
-            .accept(MediaType.APPLICATION_JSON)
-            .exchange()
-            .expectAll(
-                {it.expectStatus().isNotFound}
-            )
+        mockMvc.perform(
+            get("/api/events/${uuid}/participants")
+                .accept(MediaType.APPLICATION_JSON)
+        ).andExpectAll(
+            status().isNotFound
+        )
 
         // THEN
 
@@ -175,13 +174,12 @@ class EventControllerIT {
         val uuid = "abc"
 
         // WHEN
-        webTestClient.get()
-            .uri("/api/events/${uuid}/participants")
-            .accept(MediaType.APPLICATION_JSON)
-            .exchange()
-            .expectAll(
-                {it.expectStatus().isBadRequest}
-            )
+        mockMvc.perform(
+            get("/api/events/${uuid}/participants")
+                .accept(MediaType.APPLICATION_JSON)
+        ).andExpectAll(
+            status().isBadRequest
+        )
 
         // THEN
 
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/app/person/PersonControllerIT.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/app/person/PersonControllerIT.kt
index 7f954963..f2cc665c 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/app/person/PersonControllerIT.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/app/person/PersonControllerIT.kt
@@ -3,6 +3,7 @@ package com.michibaum.chess_service.app.person
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.michibaum.authentication_library.JwsValidationSuccess
 import com.michibaum.authentication_library.security.jwt.JwsValidator
+import com.michibaum.chess_service.TestcontainersConfiguration
 import com.michibaum.chess_service.domain.Gender
 import com.michibaum.chess_service.domain.Person
 import org.junit.jupiter.api.Test
@@ -17,6 +18,7 @@ import java.util.*
 
 @AutoConfigureWebTestClient
 @SpringBootTest
+@TestcontainersConfiguration
 class PersonControllerIT {
 
     @Autowired
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/app/person/PersonRepositoryIT.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/app/person/PersonRepositoryIT.kt
index 56a380d1..0a8521f7 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/app/person/PersonRepositoryIT.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/app/person/PersonRepositoryIT.kt
@@ -1,13 +1,17 @@
 package com.michibaum.chess_service.app.person
 
+import com.michibaum.chess_service.TestcontainersConfiguration
 import com.michibaum.chess_service.domain.PersonProvider
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
 
 @DataJpaTest
+@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
+@TestcontainersConfiguration
 class PersonRepositoryIT {
 
     @Autowired
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/AccountProvider.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/AccountProvider.kt
index fc62ffcf..d1fd5ea1 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/AccountProvider.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/AccountProvider.kt
@@ -1,9 +1,5 @@
 package com.michibaum.chess_service.domain
 
-import java.time.Instant
-import java.time.LocalDate
-import java.time.ZoneId
-
 class AccountProvider {
     companion object {
         fun account(username: String = "Michi1", person: Person? = null): Account {
@@ -13,7 +9,7 @@ class AccountProvider {
                 username = username,
                 platform = ChessPlatform.CHESSCOM,
                 person = person,
-                createdAt = LocalDate.ofInstant(Instant.ofEpochSecond(1595005065053), ZoneId.systemDefault()),
+                createdAt = null,
                 games = emptySet()
             )
         }
diff --git a/chess-service/src/test/resources/application.yml b/chess-service/src/test/resources/application.yml
index e62babc4..5055a231 100644
--- a/chess-service/src/test/resources/application.yml
+++ b/chess-service/src/test/resources/application.yml
@@ -20,20 +20,6 @@ spring:
       lazy-attributes-resolution: true
   main:
     allow-bean-definition-overriding: true
-  datasource:
-    username: sa
-    password: password
-    driver-class-name: org.h2.Driver
-    url: jdbc:h2:mem:chess-db
-  jpa:
-    hibernate:
-      ddl-auto: create-drop
-    properties:
-      hibernate:
-        globally_quoted_identifiers: true
-  h2:
-    console:
-      enabled: true
 
 eureka:
   instance:
diff --git a/fitness-service/pom.xml b/fitness-service/pom.xml
index 28dde302..8bbd7e33 100644
--- a/fitness-service/pom.xml
+++ b/fitness-service/pom.xml
@@ -99,8 +99,24 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>mariadb</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/fitness-service/src/test/kotlin/com/michibaum/fitness_service/ActuatorIT.kt b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/ActuatorIT.kt
index 62f54012..f3fa4bb5 100644
--- a/fitness-service/src/test/kotlin/com/michibaum/fitness_service/ActuatorIT.kt
+++ b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/ActuatorIT.kt
@@ -1,116 +1,52 @@
 package com.michibaum.fitness_service
 
-import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 import java.util.*
 
-@AutoConfigureWebTestClient
+@AutoConfigureMockMvc
 @SpringBootTest(properties = [
     "spring.boot.admin.client.username=someUsername",
     "spring.boot.admin.client.password=somePasswööörd"
 ])
+@TestcontainersConfiguration
 class ActuatorIT {
 
     @Autowired
-    lateinit var webClient: WebTestClient
+    lateinit var mockMvc: MockMvc
 
-    @Test
-    fun `actuator without authentication returns 401`(){
+    @ParameterizedTest
+    @ValueSource(strings = ["/actuator", "/actuator/health", "/actuator/info"])
+    fun `actuator endpoints return 401`(endpoint: String){
         // GIVEN
 
         // WHEN
-        webClient.get()
-            .uri("/actuator")
-            .exchange()
-            .expectStatus()
-            .isUnauthorized
+        mockMvc.perform(get(endpoint))
+            .andExpect(status().isUnauthorized)
 
         // THEN
 
     }
 
-    @Test
-    fun `actuator health without authentication returns 401`(){
-        // GIVEN
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator/health")
-            .exchange()
-            .expectStatus()
-            .isUnauthorized
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator info without authentication returns 401`(){
-        // GIVEN
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator/info")
-            .exchange()
-            .expectStatus()
-            .isUnauthorized
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator with authentication returns 200`(){
-        // GIVEN
-        val basicAuth = "someUsername:somePasswööörd"
-        val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator")
-            .headers { it.setBasicAuth(basicAuthEncoded) }
-            .exchange()
-            .expectStatus()
-            .isOk
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator health with authentication returns 200`(){
-        // GIVEN
-        val basicAuth = "someUsername:somePasswööörd"
-        val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator/health")
-            .headers { it.setBasicAuth(basicAuthEncoded) }
-            .exchange()
-            .expectStatus()
-            .isOk
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator info with authentication returns 200`(){
+    @ParameterizedTest
+    @ValueSource(strings = ["/actuator", "/actuator/health", "/actuator/info"])
+    fun `actuator endpoints with basic authentication return 200`(endpoint: String){
         // GIVEN
         val basicAuth = "someUsername:somePasswööörd"
         val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
 
         // WHEN
-        webClient.get()
-            .uri("/actuator/info")
-            .headers { it.setBasicAuth(basicAuthEncoded) }
-            .exchange()
-            .expectStatus()
-            .isOk
+        mockMvc.perform(
+            get(endpoint)
+                .header("Authorization", "Basic $basicAuthEncoded")
+        )
+            .andExpect(status().isOk)
 
         // THEN
 
diff --git a/fitness-service/src/test/kotlin/com/michibaum/fitness_service/FitbitOAuthControllerIT.kt b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/FitbitOAuthControllerIT.kt
index dff90fa6..e9053fb5 100644
--- a/fitness-service/src/test/kotlin/com/michibaum/fitness_service/FitbitOAuthControllerIT.kt
+++ b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/FitbitOAuthControllerIT.kt
@@ -9,19 +9,24 @@ import org.mockito.Mockito.anyString
 import org.mockito.Mockito.`when`
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.test.annotation.DirtiesContext
 import org.springframework.test.context.bean.override.mockito.MockitoBean
 import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.get
 
-@AutoConfigureWebTestClient
+@AutoConfigureMockMvc
 @SpringBootTest(properties = [
     "fitbit.oauth.client-id=someClientId",
     "fitbit.oauth.client-secret=someClientSecret",
 ])
+@TestcontainersConfiguration
 class FitbitOAuthControllerIT {
 
     @Autowired
-    lateinit var webClient: WebTestClient
+    lateinit var mockMvc: MockMvc
 
     @Autowired
     lateinit var fitbitOAuthRepository: FitbitOAuthRepository
@@ -34,11 +39,8 @@ class FitbitOAuthControllerIT {
         // GIVEN
 
         // WHEN
-        webClient.get()
-            .uri("/api/fitbit/token")
-            .exchange()
-            .expectStatus()
-            .isUnauthorized()
+        mockMvc.get("/api/fitbit/token")
+            .andExpect { status { isUnauthorized() } }
         // THEN
 
     }
@@ -49,12 +51,9 @@ class FitbitOAuthControllerIT {
         `when`(jwsValidator.validate(anyString())).thenReturn(JwsValidationSuccess())
 
         // WHEN
-        webClient.get()
-            .uri("/api/fitbit/token")
-            .header("Authorization", "Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJhdXRoZW50aWNhdGlvbi1zZXJ2aWNlIiwic3ViIjoiU29tZVVzZXJuYW1lIiwiZXhwIjoxNzMwNDA2MzM4LCJpYXQiOjE3MzAzNzc1MzgsInVzZXJJZCI6IjBmMzdjMTkyLTRjNTgtNGQyZS1iM2U5LTljNDMyZTk4ZWQzMSIsInBlcm1pc3Npb25zIjpbIkNIRVNTX1NFUlZJQ0UiLCJSRUdJU1RSWV9TRVJWSUNFIiwiQURNSU5fU0VSVklDRSJdfQ.FGEUdC0S7CveGnSSUMIPBGaOnzljBTpv1Nfs1dYHiocwCA5gSEY-_WkQJN3p18Nc0FsuGqNXAbJrLkRd_Mzc8W1OHIb7s5TW-klX1ePkhDxkNmzSpxpHTad04hjTiIeXmeCUb52S-9m_MqU5OBYlaWn8k2zBRe_P14cmUbMa2X3aXDxKkBmNmDS12ry0czPIz_20RPgpNuRyp9mk79uGlrUPNBbNpcodULgvjr9WGN32VAu5CNMtZM-wmpSz5e6YGq9S46OdPOWkRquS3vktJ4ikx7u4fKPNXWqkhpuGM81IlQu7OC2Dy8jKkc_6QUD4gnHqvLc51R8XXQfxWLqdrkzvXR6BqvOQ_iQvntR1VPjU15D4KUKUnBFRDWM_lUdJJRGKlq1xkS37AV96Jqqb9MlXfso57uenjdfrhaF5sCd7PJIEfHRUu0QhymnCyvxfWAmY3NBi_Fk6S-XXCKOcDXhKjAVE_xMkZzidMOwZ6GR9GPBbrDkL5VheozcGm_D9lq9klpFRdScAAg7mIsYnfmNMGzmW3l4TyNpTqTvKlu5tq_9dXgqGJgVQ3L_123eLJBNwSpKG0GHcPYtMZhJeqWG0rJ2cCsyOEfd7l8CPAzY3NNA-D289SJOJTJyOLssi3eDmPj8UISR5ClAg12jdhSsMGJYuLCnbm5DngCKh9XI")
-            .exchange()
-            .expectStatus()
-            .isOk()
+        mockMvc.get("/api/fitbit/token") {
+            header("Authorization", "Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJhdXRoZW50aWNhdGlvbi1zZXJ2aWNlIiwic3ViIjoiU29tZVVzZXJuYW1lIiwiZXhwIjoxNzMwNDA2MzM4LCJpYXQiOjE3MzAzNzc1MzgsInVzZXJJZCI6IjBmMzdjMTkyLTRjNTgtNGQyZS1iM2U5LTljNDMyZTk4ZWQzMSIsInBlcm1pc3Npb25zIjpbIkNIRVNTX1NFUlZJQ0UiLCJSRUdJU1RSWV9TRVJWSUNFIiwiQURNSU5fU0VSVklDRSJdfQ.FGEUdC0S7CveGnSSUMIPBGaOnzljBTpv1Nfs1dYHiocwCA5gSEY-_WkQJN3p18Nc0FsuGqNXAbJrLkRd_Mzc8W1OHIb7s5TW-klX1ePkhDxkNmzSpxpHTad04hjTiIeXmeCUb52S-9m_MqU5OBYlaWn8k2zBRe_P14cmUbMa2X3aXDxKkBmNmDS12ry0czPIz_20RPgpNuRyp9mk79uGlrUPNBbNpcodULgvjr9WGN32VAu5CNMtZM-wmpSz5e6YGq9S46OdPOWkRquS3vktJ4ikx7u4fKPNXWqkhpuGM81IlQu7OC2Dy8jKkc_6QUD4gnHqvLc51R8XXQfxWLqdrkzvXR6BqvOQ_iQvntR1VPjU15D4KUKUnBFRDWM_lUdJJRGKlq1xkS37AV96Jqqb9MlXfso57uenjdfrhaF5sCd7PJIEfHRUu0QhymnCyvxfWAmY3NBi_Fk6S-XXCKOcDXhKjAVE_xMkZzidMOwZ6GR9GPBbrDkL5VheozcGm_D9lq9klpFRdScAAg7mIsYnfmNMGzmW3l4TyNpTqTvKlu5tq_9dXgqGJgVQ3L_123eLJBNwSpKG0GHcPYtMZhJeqWG0rJ2cCsyOEfd7l8CPAzY3NNA-D289SJOJTJyOLssi3eDmPj8UISR5ClAg12jdhSsMGJYuLCnbm5DngCKh9XI")
+        }.andExpect { status { isOk() } }
         // THEN
 
         val all = fitbitOAuthRepository.findAll()
diff --git a/fitness-service/src/test/kotlin/com/michibaum/fitness_service/FitnessServiceApplicationIT.kt b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/FitnessServiceApplicationIT.kt
index 0e5926dd..8fe56aa7 100644
--- a/fitness-service/src/test/kotlin/com/michibaum/fitness_service/FitnessServiceApplicationIT.kt
+++ b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/FitnessServiceApplicationIT.kt
@@ -7,6 +7,7 @@ import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.ApplicationContext
 
 @SpringBootTest
+@TestcontainersConfiguration
 class FitnessServiceApplicationIT{
     @Autowired
     lateinit var applicationContext: ApplicationContext
diff --git a/fitness-service/src/test/kotlin/com/michibaum/fitness_service/TestcontainersConfiguration.kt b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/TestcontainersConfiguration.kt
new file mode 100644
index 00000000..2497626f
--- /dev/null
+++ b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/TestcontainersConfiguration.kt
@@ -0,0 +1,13 @@
+package com.michibaum.fitness_service
+
+import org.springframework.context.annotation.Import
+import org.springframework.test.annotation.DirtiesContext
+import org.springframework.test.annotation.DirtiesContext.ClassMode.*
+import kotlin.annotation.AnnotationRetention.*
+import kotlin.annotation.AnnotationTarget.*
+
+@Target(CLASS)
+@Retention(RUNTIME)
+@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
+@Import(value = [TestcontainersTestConfiguration::class])
+annotation class TestcontainersConfiguration()
diff --git a/fitness-service/src/test/kotlin/com/michibaum/fitness_service/TestcontainersTestConfiguration.kt b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/TestcontainersTestConfiguration.kt
new file mode 100644
index 00000000..bdfce427
--- /dev/null
+++ b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/TestcontainersTestConfiguration.kt
@@ -0,0 +1,18 @@
+package com.michibaum.fitness_service
+
+import org.springframework.boot.test.context.TestConfiguration
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection
+import org.springframework.context.annotation.Bean
+import org.testcontainers.containers.MariaDBContainer
+import org.testcontainers.utility.DockerImageName
+
+@TestConfiguration(proxyBeanMethods = false)
+class TestcontainersTestConfiguration {
+
+    @Bean
+    @ServiceConnection
+    fun mariaDbContainer(): MariaDBContainer<*> {
+        return MariaDBContainer(DockerImageName.parse("mariadb:10.11"))
+    }
+
+}
\ No newline at end of file
diff --git a/fitness-service/src/test/kotlin/com/michibaum/fitness_service/fitbit/api/weight/RepositoryIT.kt b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/fitbit/api/weight/RepositoryIT.kt
index 7e6cde29..063d573d 100644
--- a/fitness-service/src/test/kotlin/com/michibaum/fitness_service/fitbit/api/weight/RepositoryIT.kt
+++ b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/fitbit/api/weight/RepositoryIT.kt
@@ -1,9 +1,11 @@
 package com.michibaum.fitness_service.fitbit.api.weight
 
+import com.michibaum.fitness_service.TestcontainersConfiguration
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 
 @SpringBootTest
+@TestcontainersConfiguration
 class RepositoryIT {
 
     @Autowired
diff --git a/fitness-service/src/test/resources/application.yml b/fitness-service/src/test/resources/application.yml
index 33b449b0..30435f57 100644
--- a/fitness-service/src/test/resources/application.yml
+++ b/fitness-service/src/test/resources/application.yml
@@ -20,17 +20,6 @@ spring:
       lazy-attributes-resolution: true
   main:
     allow-bean-definition-overriding: true
-  datasource:
-    username: sa
-    password: password
-    driver-class-name: org.h2.Driver
-    url: jdbc:h2:mem:fitness-db
-  jpa:
-    hibernate:
-      ddl-auto: create-drop
-    properties:
-      hibernate:
-        globally_quoted_identifiers: true
 
 eureka:
   instance:
diff --git a/music-service/pom.xml b/music-service/pom.xml
index d59c8589..9bb5475b 100644
--- a/music-service/pom.xml
+++ b/music-service/pom.xml
@@ -99,8 +99,24 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>mariadb</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/music-service/src/test/kotlin/com/michibaum/music_service/ActuatorIT.kt b/music-service/src/test/kotlin/com/michibaum/music_service/ActuatorIT.kt
new file mode 100644
index 00000000..5096ce9e
--- /dev/null
+++ b/music-service/src/test/kotlin/com/michibaum/music_service/ActuatorIT.kt
@@ -0,0 +1,55 @@
+package com.michibaum.music_service
+
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
+import java.util.*
+
+@AutoConfigureMockMvc
+@SpringBootTest(properties = [
+    "spring.boot.admin.client.username=someUsername",
+    "spring.boot.admin.client.password=somePasswööörd"
+])
+@TestcontainersConfiguration
+class ActuatorIT {
+
+    @Autowired
+    lateinit var mockMvc: MockMvc
+
+    @ParameterizedTest
+    @ValueSource(strings = ["/actuator", "/actuator/health", "/actuator/info"])
+    fun `actuator endpoints return 401`(endpoint: String){
+        // GIVEN
+
+        // WHEN
+        mockMvc.perform(get(endpoint))
+            .andExpect(status().isUnauthorized)
+
+        // THEN
+
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = ["/actuator", "/actuator/health", "/actuator/info"])
+    fun `actuator endpoints with basic authentication return 200`(endpoint: String){
+        // GIVEN
+        val basicAuth = "someUsername:somePasswööörd"
+        val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
+
+        // WHEN
+        mockMvc.perform(
+            get(endpoint)
+                .header("Authorization", "Basic $basicAuthEncoded")
+        )
+            .andExpect(status().isOk)
+
+        // THEN
+
+    }
+
+}
\ No newline at end of file
diff --git a/music-service/src/test/kotlin/com/michibaum/music_service/MusicServiceApplicationIT.kt b/music-service/src/test/kotlin/com/michibaum/music_service/MusicServiceApplicationIT.kt
index e3f06307..5ac3028e 100644
--- a/music-service/src/test/kotlin/com/michibaum/music_service/MusicServiceApplicationIT.kt
+++ b/music-service/src/test/kotlin/com/michibaum/music_service/MusicServiceApplicationIT.kt
@@ -7,6 +7,7 @@ import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.ApplicationContext
 
 @SpringBootTest
+@TestcontainersConfiguration
 class MusicServiceApplicationIT{
     @Autowired
     lateinit var applicationContext: ApplicationContext
diff --git a/music-service/src/test/kotlin/com/michibaum/music_service/TestcontainersConfiguration.kt b/music-service/src/test/kotlin/com/michibaum/music_service/TestcontainersConfiguration.kt
new file mode 100644
index 00000000..4c025b92
--- /dev/null
+++ b/music-service/src/test/kotlin/com/michibaum/music_service/TestcontainersConfiguration.kt
@@ -0,0 +1,10 @@
+package com.michibaum.music_service
+
+import org.springframework.context.annotation.Import
+import org.springframework.test.annotation.DirtiesContext
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+@Import(value = [TestcontainersTestConfiguration::class])
+annotation class TestcontainersConfiguration()
diff --git a/music-service/src/test/kotlin/com/michibaum/music_service/TestcontainersTestConfiguration.kt b/music-service/src/test/kotlin/com/michibaum/music_service/TestcontainersTestConfiguration.kt
new file mode 100644
index 00000000..835471fd
--- /dev/null
+++ b/music-service/src/test/kotlin/com/michibaum/music_service/TestcontainersTestConfiguration.kt
@@ -0,0 +1,18 @@
+package com.michibaum.music_service
+
+import org.springframework.boot.test.context.TestConfiguration
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection
+import org.springframework.context.annotation.Bean
+import org.testcontainers.containers.MariaDBContainer
+import org.testcontainers.utility.DockerImageName
+
+@TestConfiguration(proxyBeanMethods = false)
+class TestcontainersTestConfiguration {
+
+    @Bean
+    @ServiceConnection
+    fun mariaDbContainer(): MariaDBContainer<*> {
+        return MariaDBContainer(DockerImageName.parse("mariadb:10.11"))
+    }
+
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9dedfbc7..1f6d7969 100644
--- a/pom.xml
+++ b/pom.xml
@@ -336,7 +336,6 @@
                         <configuration>
                             <sourceDirs>
                                 <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
-                                <sourceDir>${project.basedir}/src/test/java</sourceDir>
                             </sourceDirs>
                         </configuration>
                     </execution>
diff --git a/registry-service/src/test/kotlin/com/michibaum/registry_service/ActuatorIT.kt b/registry-service/src/test/kotlin/com/michibaum/registry_service/ActuatorIT.kt
new file mode 100644
index 00000000..5cefa1ad
--- /dev/null
+++ b/registry-service/src/test/kotlin/com/michibaum/registry_service/ActuatorIT.kt
@@ -0,0 +1,54 @@
+package com.michibaum.registry_service
+
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
+import java.util.*
+
+@AutoConfigureMockMvc
+@SpringBootTest(properties = [
+    "spring.boot.admin.client.username=someUsername",
+    "spring.boot.admin.client.password=somePasswööörd"
+])
+class ActuatorIT {
+
+    @Autowired
+    lateinit var mockMvc: MockMvc
+
+    @ParameterizedTest
+    @ValueSource(strings = ["/actuator", "/actuator/health", "/actuator/info"])
+    fun `actuator endpoints return 401`(endpoint: String){
+        // GIVEN
+
+        // WHEN
+        mockMvc.perform(get(endpoint))
+            .andExpect(status().isUnauthorized)
+
+        // THEN
+
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = ["/actuator", "/actuator/health", "/actuator/info"])
+    fun `actuator endpoints with basic authentication return 200`(endpoint: String){
+        // GIVEN
+        val basicAuth = "someUsername:somePasswööörd"
+        val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
+
+        // WHEN
+        mockMvc.perform(
+            get(endpoint)
+                .header("Authorization", "Basic $basicAuthEncoded")
+        )
+            .andExpect(status().isOk)
+
+        // THEN
+
+    }
+
+}
\ No newline at end of file
diff --git a/usermanagement-service/pom.xml b/usermanagement-service/pom.xml
index 521fcff8..be68a15a 100644
--- a/usermanagement-service/pom.xml
+++ b/usermanagement-service/pom.xml
@@ -107,8 +107,24 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>mariadb</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/ActuatorIT.kt b/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/ActuatorIT.kt
index e0d152b2..ff01e60c 100644
--- a/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/ActuatorIT.kt
+++ b/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/ActuatorIT.kt
@@ -1,116 +1,55 @@
 package com.michibaum.usermanagement_service
 
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 import java.util.*
 
-@AutoConfigureWebTestClient
+@AutoConfigureMockMvc
 @SpringBootTest(properties = [
     "spring.boot.admin.client.username=someUsername",
     "spring.boot.admin.client.password=somePasswööörd"
 ])
+@TestcontainersConfiguration
 class ActuatorIT {
 
     @Autowired
-    lateinit var webClient: WebTestClient
+    lateinit var mockMvc: MockMvc
 
-    @Test
-    fun `actuator without authentication returns 401`(){
+    @ParameterizedTest
+    @ValueSource(strings = ["/actuator", "/actuator/health", "/actuator/info"])
+    fun `actuator endpoints return 401`(endpoint: String){
         // GIVEN
 
         // WHEN
-        webClient.get()
-            .uri("/actuator")
-            .exchange()
-            .expectStatus()
-            .isUnauthorized
+        mockMvc.perform(get(endpoint))
+            .andExpect(status().isUnauthorized)
 
         // THEN
 
     }
 
-    @Test
-    fun `actuator health without authentication returns 401`(){
-        // GIVEN
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator/health")
-            .exchange()
-            .expectStatus()
-            .isUnauthorized
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator info without authentication returns 401`(){
-        // GIVEN
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator/info")
-            .exchange()
-            .expectStatus()
-            .isUnauthorized
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator with authentication returns 200`(){
-        // GIVEN
-        val basicAuth = "someUsername:somePasswööörd"
-        val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator")
-            .headers { it.setBasicAuth(basicAuthEncoded) }
-            .exchange()
-            .expectStatus()
-            .isOk
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator health with authentication returns 200`(){
-        // GIVEN
-        val basicAuth = "someUsername:somePasswööörd"
-        val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
-
-        // WHEN
-        webClient.get()
-            .uri("/actuator/health")
-            .headers { it.setBasicAuth(basicAuthEncoded) }
-            .exchange()
-            .expectStatus()
-            .isOk
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator info with authentication returns 200`(){
+    @ParameterizedTest
+    @ValueSource(strings = ["/actuator", "/actuator/health", "/actuator/info"])
+    fun `actuator endpoints with basic authentication return 200`(endpoint: String){
         // GIVEN
         val basicAuth = "someUsername:somePasswööörd"
         val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
 
         // WHEN
-        webClient.get()
-            .uri("/actuator/info")
-            .headers { it.setBasicAuth(basicAuthEncoded) }
-            .exchange()
-            .expectStatus()
-            .isOk
+        mockMvc.perform(
+            get(endpoint)
+                .header("Authorization", "Basic $basicAuthEncoded")
+        )
+            .andExpect(status().isOk)
 
         // THEN
 
diff --git a/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/TestcontainersConfiguration.kt b/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/TestcontainersConfiguration.kt
new file mode 100644
index 00000000..20481e01
--- /dev/null
+++ b/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/TestcontainersConfiguration.kt
@@ -0,0 +1,10 @@
+package com.michibaum.usermanagement_service
+
+import org.springframework.context.annotation.Import
+import org.springframework.test.annotation.DirtiesContext
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+@Import(value = [TestcontainersTestConfiguration::class])
+annotation class TestcontainersConfiguration()
diff --git a/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/TestcontainersTestConfiguration.kt b/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/TestcontainersTestConfiguration.kt
new file mode 100644
index 00000000..0f7023be
--- /dev/null
+++ b/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/TestcontainersTestConfiguration.kt
@@ -0,0 +1,18 @@
+package com.michibaum.usermanagement_service
+
+import org.springframework.boot.test.context.TestConfiguration
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection
+import org.springframework.context.annotation.Bean
+import org.testcontainers.containers.MariaDBContainer
+import org.testcontainers.utility.DockerImageName
+
+@TestConfiguration(proxyBeanMethods = false)
+class TestcontainersTestConfiguration {
+
+    @Bean
+    @ServiceConnection
+    fun mariaDbContainer(): MariaDBContainer<*> {
+        return MariaDBContainer(DockerImageName.parse("mariadb:10.11"))
+    }
+
+}
\ No newline at end of file
diff --git a/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/UserRepositoryIT.kt b/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/UserRepositoryIT.kt
index 62a0becd..89c48e5a 100644
--- a/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/UserRepositoryIT.kt
+++ b/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/UserRepositoryIT.kt
@@ -3,9 +3,12 @@ package com.michibaum.usermanagement_service
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
 
 @DataJpaTest
+@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
+@TestcontainersConfiguration
 class UserRepositoryIT {
 
     @Autowired
diff --git a/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/UsermanagementServiceApplicationIT.kt b/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/UsermanagementServiceApplicationIT.kt
index 2eee4b41..4529978e 100644
--- a/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/UsermanagementServiceApplicationIT.kt
+++ b/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/UsermanagementServiceApplicationIT.kt
@@ -7,6 +7,7 @@ import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.ApplicationContext
 
 @SpringBootTest
+@TestcontainersConfiguration
 class UsermanagementServiceApplicationIT {
 
     @Autowired
diff --git a/usermanagement-service/src/test/resources/application.yml b/usermanagement-service/src/test/resources/application.yml
index 0ca71755..646d6542 100644
--- a/usermanagement-service/src/test/resources/application.yml
+++ b/usermanagement-service/src/test/resources/application.yml
@@ -20,17 +20,6 @@ spring:
       lazy-attributes-resolution: true
   main:
     allow-bean-definition-overriding: true
-  datasource:
-    username: sa
-    password: password
-    driver-class-name: org.h2.Driver
-    url: jdbc:h2:mem:usermanagement-db
-  jpa:
-    hibernate:
-      ddl-auto: create-drop
-    properties:
-      hibernate:
-        globally_quoted_identifiers: true
 
 eureka:
   instance:
diff --git a/website-service/src/test/kotlin/com/michibaum/websiteservice/ActuatorIT.kt b/website-service/src/test/kotlin/com/michibaum/websiteservice/ActuatorIT.kt
index 25bb21f6..c14eaa09 100644
--- a/website-service/src/test/kotlin/com/michibaum/websiteservice/ActuatorIT.kt
+++ b/website-service/src/test/kotlin/com/michibaum/websiteservice/ActuatorIT.kt
@@ -1,6 +1,7 @@
 package com.michibaum.websiteservice
 
-import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
@@ -17,81 +18,34 @@ import java.util.*
 class ActuatorIT {
 
     @Autowired
-    lateinit var webClient: MockMvc
+    lateinit var mockMvc: MockMvc
 
-    @Test
-    fun `actuator without authentication returns 401`(){
+    @ParameterizedTest
+    @ValueSource(strings = ["/actuator", "/actuator/health", "/actuator/info"])
+    fun `actuator endpoints return 401`(endpoint: String){
         // GIVEN
 
         // WHEN
-        webClient.perform(get("/actuator"))
-            .andExpect(status().isUnauthorized())
+        mockMvc.perform(get(endpoint))
+            .andExpect(status().isUnauthorized)
 
         // THEN
 
     }
 
-    @Test
-    fun `actuator health without authentication returns 401`(){
-        // GIVEN
-
-        // WHEN
-        webClient.perform(get("/actuator/health"))
-            .andExpect(status().isUnauthorized())
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator info without authentication returns 401`(){
-        // GIVEN
-
-        // WHEN
-        webClient.perform(get("/actuator/info"))
-            .andExpect(status().isUnauthorized())
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator with authentication returns 200`(){
-        // GIVEN
-        val basicAuth = "someUsername:somePasswööörd"
-        val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
-
-        // WHEN
-        webClient.perform(get("/actuator").header("Authorization", "Basic $basicAuthEncoded"))
-            .andExpect(status().isOk()) // TODO returns 302 redirect to / because of success authentication
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator health with authentication returns 200`(){
-        // GIVEN
-        val basicAuth = "someUsername:somePasswööörd"
-        val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
-
-        // WHEN
-        webClient.perform(get("/actuator/health").header("Authorization", "Basic $basicAuthEncoded"))
-            .andExpect(status().isOk()) // TODO returns 302 redirect to / because of success authentication
-
-        // THEN
-
-    }
-
-    @Test
-    fun `actuator info with authentication returns 200`(){
+    @ParameterizedTest
+    @ValueSource(strings = ["/actuator", "/actuator/health", "/actuator/info"])
+    fun `actuator endpoints with basic authentication return 200`(endpoint: String){
         // GIVEN
         val basicAuth = "someUsername:somePasswööörd"
         val basicAuthEncoded = Base64.getEncoder().encodeToString(basicAuth.toByteArray())
 
         // WHEN
-        webClient.perform(get("/actuator/info").header("Authorization", "Basic $basicAuthEncoded"))
-            .andExpect(status().isOk()) // TODO returns 302 redirect to / because of success authentication
+        mockMvc.perform(
+            get(endpoint)
+                .header("Authorization", "Basic $basicAuthEncoded")
+        )
+            .andExpect(status().isOk)
 
         // THEN
 

From 5b844e5c335917c71b4191f3cf9790c33bd5c82c Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Tue, 31 Dec 2024 02:06:42 +0100
Subject: [PATCH 14/27] Add Flyway-based database cleanup for tests

Introduce `FlywayClearDatabaseJunitExtension` to clean and migrate databases before each test across all services. Replace `DirtiesContext` with this extension in `TestcontainersConfiguration` and ensure proper Flyway configuration with test properties. This enhances test isolation and improves database handling consistency.
---
 .../FlywayClearDatabaseJunitExtension.kt       | 18 ++++++++++++++++++
 .../TestcontainersConfiguration.kt             |  6 ++++--
 .../FlywayClearDatabaseJunitExtension.kt       | 18 ++++++++++++++++++
 .../TestcontainersConfiguration.kt             |  6 ++++--
 .../FlywayClearDatabaseJunitExtension.kt       | 18 ++++++++++++++++++
 .../TestcontainersConfiguration.kt             |  9 ++++++---
 .../FlywayClearDatabaseJunitExtension.kt       | 18 ++++++++++++++++++
 .../TestcontainersConfiguration.kt             |  6 ++++--
 .../FlywayClearDatabaseJunitExtension.kt       | 18 ++++++++++++++++++
 .../TestcontainersConfiguration.kt             |  6 ++++--
 .../chess-update-event.component.ts            |  5 ++---
 11 files changed, 114 insertions(+), 14 deletions(-)
 create mode 100644 authentication-service/src/test/kotlin/com/michibaum/authentication_service/FlywayClearDatabaseJunitExtension.kt
 create mode 100644 chess-service/src/test/kotlin/com/michibaum/chess_service/FlywayClearDatabaseJunitExtension.kt
 create mode 100644 fitness-service/src/test/kotlin/com/michibaum/fitness_service/FlywayClearDatabaseJunitExtension.kt
 create mode 100644 music-service/src/test/kotlin/com/michibaum/music_service/FlywayClearDatabaseJunitExtension.kt
 create mode 100644 usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/FlywayClearDatabaseJunitExtension.kt

diff --git a/authentication-service/src/test/kotlin/com/michibaum/authentication_service/FlywayClearDatabaseJunitExtension.kt b/authentication-service/src/test/kotlin/com/michibaum/authentication_service/FlywayClearDatabaseJunitExtension.kt
new file mode 100644
index 00000000..2338c82f
--- /dev/null
+++ b/authentication-service/src/test/kotlin/com/michibaum/authentication_service/FlywayClearDatabaseJunitExtension.kt
@@ -0,0 +1,18 @@
+package com.michibaum.authentication_service
+
+import org.flywaydb.core.Flyway
+import org.junit.jupiter.api.extension.BeforeEachCallback
+import org.junit.jupiter.api.extension.ExtensionContext
+import org.springframework.test.context.junit.jupiter.SpringExtension
+
+
+class FlywayClearDatabaseJunitExtension: BeforeEachCallback {
+    override fun beforeEach(context: ExtensionContext?) {
+        if(context == null) throw IllegalArgumentException("Context must not be null")
+
+        val flyway = SpringExtension.getApplicationContext(context)
+            .getBean(Flyway::class.java)
+        flyway.clean()
+        flyway.migrate()
+    }
+}
\ No newline at end of file
diff --git a/authentication-service/src/test/kotlin/com/michibaum/authentication_service/TestcontainersConfiguration.kt b/authentication-service/src/test/kotlin/com/michibaum/authentication_service/TestcontainersConfiguration.kt
index 756d9758..ebd59f5e 100644
--- a/authentication-service/src/test/kotlin/com/michibaum/authentication_service/TestcontainersConfiguration.kt
+++ b/authentication-service/src/test/kotlin/com/michibaum/authentication_service/TestcontainersConfiguration.kt
@@ -1,10 +1,12 @@
 package com.michibaum.authentication_service
 
+import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.context.annotation.Import
-import org.springframework.test.annotation.DirtiesContext
+import org.springframework.test.context.TestPropertySource
 
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+@ExtendWith(value = [FlywayClearDatabaseJunitExtension::class])
 @Import(value = [TestcontainersTestConfiguration::class])
+@TestPropertySource(properties = ["spring.flyway.clean-disabled=false"])
 annotation class TestcontainersConfiguration()
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/FlywayClearDatabaseJunitExtension.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/FlywayClearDatabaseJunitExtension.kt
new file mode 100644
index 00000000..c808bba6
--- /dev/null
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/FlywayClearDatabaseJunitExtension.kt
@@ -0,0 +1,18 @@
+package com.michibaum.chess_service
+
+import org.flywaydb.core.Flyway
+import org.junit.jupiter.api.extension.BeforeEachCallback
+import org.junit.jupiter.api.extension.ExtensionContext
+import org.springframework.test.context.junit.jupiter.SpringExtension
+
+
+class FlywayClearDatabaseJunitExtension: BeforeEachCallback {
+    override fun beforeEach(context: ExtensionContext?) {
+        if(context == null) throw IllegalArgumentException("Context must not be null")
+
+        val flyway = SpringExtension.getApplicationContext(context)
+            .getBean(Flyway::class.java)
+        flyway.clean()
+        flyway.migrate()
+    }
+}
\ No newline at end of file
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/TestcontainersConfiguration.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/TestcontainersConfiguration.kt
index 89cfce1c..d8a3dfc6 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/TestcontainersConfiguration.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/TestcontainersConfiguration.kt
@@ -1,10 +1,12 @@
 package com.michibaum.chess_service
 
+import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.context.annotation.Import
-import org.springframework.test.annotation.DirtiesContext
+import org.springframework.test.context.TestPropertySource
 
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+@ExtendWith(value = [FlywayClearDatabaseJunitExtension::class])
 @Import(value = [TestcontainersTestConfiguration::class])
+@TestPropertySource(properties = ["spring.flyway.clean-disabled=false"])
 annotation class TestcontainersConfiguration()
diff --git a/fitness-service/src/test/kotlin/com/michibaum/fitness_service/FlywayClearDatabaseJunitExtension.kt b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/FlywayClearDatabaseJunitExtension.kt
new file mode 100644
index 00000000..bb540778
--- /dev/null
+++ b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/FlywayClearDatabaseJunitExtension.kt
@@ -0,0 +1,18 @@
+package com.michibaum.fitness_service
+
+import org.flywaydb.core.Flyway
+import org.junit.jupiter.api.extension.BeforeEachCallback
+import org.junit.jupiter.api.extension.ExtensionContext
+import org.springframework.test.context.junit.jupiter.SpringExtension
+
+
+class FlywayClearDatabaseJunitExtension: BeforeEachCallback {
+    override fun beforeEach(context: ExtensionContext?) {
+        if(context == null) throw IllegalArgumentException("Context must not be null")
+
+        val flyway = SpringExtension.getApplicationContext(context)
+            .getBean(Flyway::class.java)
+        flyway.clean()
+        flyway.migrate()
+    }
+}
\ No newline at end of file
diff --git a/fitness-service/src/test/kotlin/com/michibaum/fitness_service/TestcontainersConfiguration.kt b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/TestcontainersConfiguration.kt
index 2497626f..7a54e8b2 100644
--- a/fitness-service/src/test/kotlin/com/michibaum/fitness_service/TestcontainersConfiguration.kt
+++ b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/TestcontainersConfiguration.kt
@@ -1,13 +1,16 @@
 package com.michibaum.fitness_service
 
+import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.context.annotation.Import
 import org.springframework.test.annotation.DirtiesContext
 import org.springframework.test.annotation.DirtiesContext.ClassMode.*
+import org.springframework.test.context.TestPropertySource
 import kotlin.annotation.AnnotationRetention.*
 import kotlin.annotation.AnnotationTarget.*
 
-@Target(CLASS)
-@Retention(RUNTIME)
-@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+@ExtendWith(value = [FlywayClearDatabaseJunitExtension::class])
 @Import(value = [TestcontainersTestConfiguration::class])
+@TestPropertySource(properties = ["spring.flyway.clean-disabled=false"])
 annotation class TestcontainersConfiguration()
diff --git a/music-service/src/test/kotlin/com/michibaum/music_service/FlywayClearDatabaseJunitExtension.kt b/music-service/src/test/kotlin/com/michibaum/music_service/FlywayClearDatabaseJunitExtension.kt
new file mode 100644
index 00000000..47042844
--- /dev/null
+++ b/music-service/src/test/kotlin/com/michibaum/music_service/FlywayClearDatabaseJunitExtension.kt
@@ -0,0 +1,18 @@
+package com.michibaum.music_service
+
+import org.flywaydb.core.Flyway
+import org.junit.jupiter.api.extension.BeforeEachCallback
+import org.junit.jupiter.api.extension.ExtensionContext
+import org.springframework.test.context.junit.jupiter.SpringExtension
+
+
+class FlywayClearDatabaseJunitExtension: BeforeEachCallback {
+    override fun beforeEach(context: ExtensionContext?) {
+        if(context == null) throw IllegalArgumentException("Context must not be null")
+
+        val flyway = SpringExtension.getApplicationContext(context)
+            .getBean(Flyway::class.java)
+        flyway.clean()
+        flyway.migrate()
+    }
+}
\ No newline at end of file
diff --git a/music-service/src/test/kotlin/com/michibaum/music_service/TestcontainersConfiguration.kt b/music-service/src/test/kotlin/com/michibaum/music_service/TestcontainersConfiguration.kt
index 4c025b92..d094536a 100644
--- a/music-service/src/test/kotlin/com/michibaum/music_service/TestcontainersConfiguration.kt
+++ b/music-service/src/test/kotlin/com/michibaum/music_service/TestcontainersConfiguration.kt
@@ -1,10 +1,12 @@
 package com.michibaum.music_service
 
+import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.context.annotation.Import
-import org.springframework.test.annotation.DirtiesContext
+import org.springframework.test.context.TestPropertySource
 
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+@ExtendWith(value = [FlywayClearDatabaseJunitExtension::class])
 @Import(value = [TestcontainersTestConfiguration::class])
+@TestPropertySource(properties = ["spring.flyway.clean-disabled=false"])
 annotation class TestcontainersConfiguration()
diff --git a/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/FlywayClearDatabaseJunitExtension.kt b/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/FlywayClearDatabaseJunitExtension.kt
new file mode 100644
index 00000000..4fc52d8f
--- /dev/null
+++ b/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/FlywayClearDatabaseJunitExtension.kt
@@ -0,0 +1,18 @@
+package com.michibaum.usermanagement_service
+
+import org.flywaydb.core.Flyway
+import org.junit.jupiter.api.extension.BeforeEachCallback
+import org.junit.jupiter.api.extension.ExtensionContext
+import org.springframework.test.context.junit.jupiter.SpringExtension
+
+
+class FlywayClearDatabaseJunitExtension: BeforeEachCallback {
+    override fun beforeEach(context: ExtensionContext?) {
+        if(context == null) throw IllegalArgumentException("Context must not be null")
+
+        val flyway = SpringExtension.getApplicationContext(context)
+            .getBean(Flyway::class.java)
+        flyway.clean()
+        flyway.migrate()
+    }
+}
\ No newline at end of file
diff --git a/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/TestcontainersConfiguration.kt b/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/TestcontainersConfiguration.kt
index 20481e01..0ae48562 100644
--- a/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/TestcontainersConfiguration.kt
+++ b/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/TestcontainersConfiguration.kt
@@ -1,10 +1,12 @@
 package com.michibaum.usermanagement_service
 
+import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.context.annotation.Import
-import org.springframework.test.annotation.DirtiesContext
+import org.springframework.test.context.TestPropertySource
 
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+@ExtendWith(value = [FlywayClearDatabaseJunitExtension::class])
 @Import(value = [TestcontainersTestConfiguration::class])
+@TestPropertySource(properties = ["spring.flyway.clean-disabled=false"])
 annotation class TestcontainersConfiguration()
diff --git a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts
index a6796d7c..c3bbf708 100644
--- a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts
+++ b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts
@@ -16,7 +16,7 @@ import {MultiSelect} from "primeng/multiselect";
 import {Button} from "primeng/button";
 import {InputText} from "primeng/inputtext";
 import {FaIconComponent} from "@fortawesome/angular-fontawesome";
-import {NgClass, NgIf} from "@angular/common";
+import {NgIf} from "@angular/common";
 import {PickList} from "primeng/picklist";
 import {LazyLoad} from "../../core/models/lazy-load.model";
 import {rxResource} from "@angular/core/rxjs-interop";
@@ -39,8 +39,7 @@ import {Textarea} from "primeng/textarea";
     PickList,
     FormsModule,
     EventIconPipe,
-    Textarea,
-    NgClass
+    Textarea
   ],
   templateUrl: './chess-update-event.component.html',
   styleUrl: './chess-update-event.component.scss'

From 292dd56a5495ce5b2f689927b4e508bf4a0391ee Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Tue, 31 Dec 2024 14:44:14 +0100
Subject: [PATCH 15/27] Add additional `info` properties to all application.yml
 files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enable `build`, `defaults`, `env`, `java`, `os`, `process`, and `ssl` under the `info` section across multiple services’ configuration files. This enhances visibility of system and build metadata in the various service configurations. Also updates the authentication manager to handle multiple authentications properly.
---
 .../src/main/resources/application.yml          | 17 ++++++++++++++++-
 .../src/test/resources/application.yml          | 17 ++++++++++++++++-
 .../ServletDelegateAuthenticationManager.kt     | 16 ++++++++++++----
 .../src/main/resources/application.yml          | 17 ++++++++++++++++-
 .../src/test/resources/application.yml          | 17 ++++++++++++++++-
 .../src/main/resources/application.yml          | 15 +++++++++++++++
 .../src/test/resources/application.yml          | 15 +++++++++++++++
 .../src/main/resources/application.yml          | 17 ++++++++++++++++-
 .../src/test/resources/application.yml          | 17 ++++++++++++++++-
 .../src/main/resources/application.yml          | 15 +++++++++++++++
 .../src/test/resources/application.yml          | 15 +++++++++++++++
 .../src/main/resources/application.yml          | 17 ++++++++++++++++-
 .../src/main/resources/application.yml          | 17 ++++++++++++++++-
 .../src/test/resources/application.yml          | 17 ++++++++++++++++-
 .../src/main/resources/application.yml          | 17 ++++++++++++++++-
 .../src/test/resources/application.yml          | 17 ++++++++++++++++-
 .../src/main/resources/application.yml          | 17 ++++++++++++++++-
 .../src/test/resources/application.yml          | 17 ++++++++++++++++-
 18 files changed, 280 insertions(+), 17 deletions(-)

diff --git a/admin-service/src/main/resources/application.yml b/admin-service/src/main/resources/application.yml
index a43f64fa..3ce2c9b0 100644
--- a/admin-service/src/main/resources/application.yml
+++ b/admin-service/src/main/resources/application.yml
@@ -72,4 +72,19 @@ management:
       enabled: true
   info:
     git:
-      mode: full
\ No newline at end of file
+      mode: full
+      enabled: true
+    build:
+      enabled: true
+    defaults:
+      enabled: true
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+    ssl:
+      enabled: true
\ No newline at end of file
diff --git a/admin-service/src/test/resources/application.yml b/admin-service/src/test/resources/application.yml
index 53906558..2a6849dc 100644
--- a/admin-service/src/test/resources/application.yml
+++ b/admin-service/src/test/resources/application.yml
@@ -69,4 +69,19 @@ management:
       enabled: true
   info:
     git:
-      mode: full
\ No newline at end of file
+      mode: full
+      enabled: true
+    build:
+      enabled: true
+    defaults:
+      enabled: true
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+    ssl:
+      enabled: true
\ No newline at end of file
diff --git a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ServletDelegateAuthenticationManager.kt b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ServletDelegateAuthenticationManager.kt
index 449a9e61..ef7ad319 100644
--- a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ServletDelegateAuthenticationManager.kt
+++ b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/ServletDelegateAuthenticationManager.kt
@@ -1,6 +1,7 @@
 package com.michibaum.authentication_library.security
 
 import org.springframework.security.authentication.AuthenticationManager
+import org.springframework.security.authentication.BadCredentialsException
 import org.springframework.security.core.Authentication
 import org.springframework.security.core.context.SecurityContextHolder
 
@@ -10,14 +11,21 @@ class ServletDelegateAuthenticationManager(private val authenticationManagers: L
             throw Exception("Empty authentication")
         }
 
+        val auths = mutableListOf<Authentication>()
         for(authManager in authenticationManagers){
             if(authManager.supports(authentication.javaClass)){
-                val auth =  authManager.authenticate(authentication) ?: throw Exception("Empty authentication")
-                SecurityContextHolder.getContext().authentication = auth
-                return auth
+                val auth = authManager.authenticate(authentication) ?: continue
+                auths.add(auth)
             }
         }
 
-        throw NoAuthenticationManagerException("No authentication Manager found for ${authentication::class}")
+        val authenticated = auths.filter { it.isAuthenticated }
+
+        if(authenticated.size > 1 || authenticated.isEmpty()) {
+            throw BadCredentialsException("More than one, or none authentication was authenticated.")
+        }
+
+        SecurityContextHolder.getContext().authentication = authenticated[0]
+        return authenticated[0]
     }
 }
\ No newline at end of file
diff --git a/authentication-service/src/main/resources/application.yml b/authentication-service/src/main/resources/application.yml
index 8b50a456..000d268a 100644
--- a/authentication-service/src/main/resources/application.yml
+++ b/authentication-service/src/main/resources/application.yml
@@ -65,4 +65,19 @@ management:
       enabled: true
   info:
     git:
-      mode: full
\ No newline at end of file
+      mode: full
+      enabled: true
+    build:
+      enabled: true
+    defaults:
+      enabled: true
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+    ssl:
+      enabled: true
\ No newline at end of file
diff --git a/authentication-service/src/test/resources/application.yml b/authentication-service/src/test/resources/application.yml
index 8fb605a2..ae264584 100644
--- a/authentication-service/src/test/resources/application.yml
+++ b/authentication-service/src/test/resources/application.yml
@@ -53,4 +53,19 @@ management:
       enabled: true
   info:
     git:
-      mode: full
\ No newline at end of file
+      mode: full
+      enabled: true
+    build:
+      enabled: true
+    defaults:
+      enabled: true
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+    ssl:
+      enabled: true
\ No newline at end of file
diff --git a/chess-service/src/main/resources/application.yml b/chess-service/src/main/resources/application.yml
index 188e2ba5..25f1984a 100644
--- a/chess-service/src/main/resources/application.yml
+++ b/chess-service/src/main/resources/application.yml
@@ -66,6 +66,21 @@ management:
   info:
     git:
       mode: full
+      enabled: true
+    build:
+      enabled: true
+    defaults:
+      enabled: true
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+    ssl:
+      enabled: true
 
 chess-apis:
   properties:
diff --git a/chess-service/src/test/resources/application.yml b/chess-service/src/test/resources/application.yml
index 5055a231..00c97da3 100644
--- a/chess-service/src/test/resources/application.yml
+++ b/chess-service/src/test/resources/application.yml
@@ -54,6 +54,21 @@ management:
   info:
     git:
       mode: full
+      enabled: true
+    build:
+      enabled: true
+    defaults:
+      enabled: true
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+    ssl:
+      enabled: true
 
 chess-apis:
   properties:
diff --git a/fitness-service/src/main/resources/application.yml b/fitness-service/src/main/resources/application.yml
index e47ec558..213b7dec 100644
--- a/fitness-service/src/main/resources/application.yml
+++ b/fitness-service/src/main/resources/application.yml
@@ -65,4 +65,19 @@ management:
       enabled: true
   info:
     git:
-      mode: full
\ No newline at end of file
+      mode: full
+      enabled: true
+    build:
+      enabled: true
+    defaults:
+      enabled: true
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+    ssl:
+      enabled: true
\ No newline at end of file
diff --git a/fitness-service/src/test/resources/application.yml b/fitness-service/src/test/resources/application.yml
index 30435f57..d48d373a 100644
--- a/fitness-service/src/test/resources/application.yml
+++ b/fitness-service/src/test/resources/application.yml
@@ -53,4 +53,19 @@ management:
       enabled: true
   info:
     git:
-      mode: full
\ No newline at end of file
+      mode: full
+      enabled: true
+    build:
+      enabled: true
+    defaults:
+      enabled: true
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+    ssl:
+      enabled: true
\ No newline at end of file
diff --git a/gateway-service/src/main/resources/application.yml b/gateway-service/src/main/resources/application.yml
index f95dec16..13e89c90 100644
--- a/gateway-service/src/main/resources/application.yml
+++ b/gateway-service/src/main/resources/application.yml
@@ -109,3 +109,18 @@ management:
   info:
     git:
       mode: full
+      enabled: true
+    build:
+      enabled: true
+    defaults:
+      enabled: true
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+    ssl:
+      enabled: true
\ No newline at end of file
diff --git a/gateway-service/src/test/resources/application.yml b/gateway-service/src/test/resources/application.yml
index a08b96e1..eab97c4f 100644
--- a/gateway-service/src/test/resources/application.yml
+++ b/gateway-service/src/test/resources/application.yml
@@ -64,3 +64,18 @@ management:
   info:
     git:
       mode: full
+      enabled: true
+    build:
+      enabled: true
+    defaults:
+      enabled: true
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+    ssl:
+      enabled: true
\ No newline at end of file
diff --git a/music-service/src/main/resources/application.yml b/music-service/src/main/resources/application.yml
index d9e39c91..78f08f98 100644
--- a/music-service/src/main/resources/application.yml
+++ b/music-service/src/main/resources/application.yml
@@ -65,4 +65,19 @@ management:
       enabled: true
   info:
     git:
-      mode: full
\ No newline at end of file
+      mode: full
+      enabled: true
+    build:
+      enabled: true
+    defaults:
+      enabled: true
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+    ssl:
+      enabled: true
\ No newline at end of file
diff --git a/registry-service/src/main/resources/application.yml b/registry-service/src/main/resources/application.yml
index 96683f3a..6744ba2e 100644
--- a/registry-service/src/main/resources/application.yml
+++ b/registry-service/src/main/resources/application.yml
@@ -56,4 +56,19 @@ management:
       enabled: true
   info:
     git:
-      mode: full
\ No newline at end of file
+      mode: full
+      enabled: true
+    build:
+      enabled: true
+    defaults:
+      enabled: true
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+    ssl:
+      enabled: true
\ No newline at end of file
diff --git a/registry-service/src/test/resources/application.yml b/registry-service/src/test/resources/application.yml
index c46b5016..20eccded 100644
--- a/registry-service/src/test/resources/application.yml
+++ b/registry-service/src/test/resources/application.yml
@@ -54,4 +54,19 @@ management:
       enabled: true
   info:
     git:
-      mode: full
\ No newline at end of file
+      mode: full
+      enabled: true
+    build:
+      enabled: true
+    defaults:
+      enabled: true
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+    ssl:
+      enabled: true
\ No newline at end of file
diff --git a/usermanagement-service/src/main/resources/application.yml b/usermanagement-service/src/main/resources/application.yml
index ba05c1df..49d5751d 100644
--- a/usermanagement-service/src/main/resources/application.yml
+++ b/usermanagement-service/src/main/resources/application.yml
@@ -65,4 +65,19 @@ management:
       enabled: true
   info:
     git:
-      mode: full
\ No newline at end of file
+      mode: full
+      enabled: true
+    build:
+      enabled: true
+    defaults:
+      enabled: true
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+    ssl:
+      enabled: true
\ No newline at end of file
diff --git a/usermanagement-service/src/test/resources/application.yml b/usermanagement-service/src/test/resources/application.yml
index 646d6542..ac7c9996 100644
--- a/usermanagement-service/src/test/resources/application.yml
+++ b/usermanagement-service/src/test/resources/application.yml
@@ -53,4 +53,19 @@ management:
       enabled: true
   info:
     git:
-      mode: full
\ No newline at end of file
+      mode: full
+      enabled: true
+    build:
+      enabled: true
+    defaults:
+      enabled: true
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+    ssl:
+      enabled: true
\ No newline at end of file
diff --git a/website-service/src/main/resources/application.yml b/website-service/src/main/resources/application.yml
index 65f18452..b1b65a2c 100644
--- a/website-service/src/main/resources/application.yml
+++ b/website-service/src/main/resources/application.yml
@@ -57,4 +57,19 @@ management:
       enabled: true
   info:
     git:
-      mode: full
\ No newline at end of file
+      mode: full
+      enabled: true
+    build:
+      enabled: true
+    defaults:
+      enabled: true
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+    ssl:
+      enabled: true
\ No newline at end of file
diff --git a/website-service/src/test/resources/application.yml b/website-service/src/test/resources/application.yml
index 4f5ea5d5..9d4c345b 100644
--- a/website-service/src/test/resources/application.yml
+++ b/website-service/src/test/resources/application.yml
@@ -55,4 +55,19 @@ management:
       enabled: true
   info:
     git:
-      mode: full
\ No newline at end of file
+      mode: full
+      enabled: true
+    build:
+      enabled: true
+    defaults:
+      enabled: true
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+    ssl:
+      enabled: true
\ No newline at end of file

From 6242947428c937d1b416fe8bb3b52768c81c2df5 Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Tue, 31 Dec 2024 15:44:22 +0100
Subject: [PATCH 16/27] Bugfix Revision
 8ca081aee62ea079c74266fe313b0736de2afcd7.

---
 .../security/SecurityBeansConfiguration.kt          | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityBeansConfiguration.kt b/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityBeansConfiguration.kt
index adc08d89..2b821bf7 100644
--- a/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityBeansConfiguration.kt
+++ b/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityBeansConfiguration.kt
@@ -1,6 +1,7 @@
 package com.michibaum.authentication_service.security
 
 import com.michibaum.authentication_library.AuthenticationClient
+import com.michibaum.authentication_library.PublicKeyDto
 import com.michibaum.authentication_library.security.ServletAuthenticationFilter
 import com.michibaum.authentication_library.security.ServletDelegateAuthenticationManager
 import com.michibaum.authentication_library.security.SpecificAuthenticationManager
@@ -10,9 +11,9 @@ import com.michibaum.authentication_library.security.basic.servlet.BasicAuthenti
 import com.michibaum.authentication_library.security.jwt.JwsValidator
 import com.michibaum.authentication_library.security.jwt.JwtAuthenticationManager
 import com.michibaum.authentication_library.security.jwt.servlet.JwtAuthenticationConverter
+import com.michibaum.authentication_service.authentication.AuthenticationService
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import org.springframework.context.annotation.Lazy
 import org.springframework.security.authentication.AuthenticationManager
 import org.springframework.security.web.authentication.AuthenticationConverter
 
@@ -25,8 +26,14 @@ class SecurityBeansConfiguration {
 
 
     @Bean
-    fun jwsValidator(@Lazy authenticationClient: AuthenticationClient): JwsValidator =
-        JwsValidator(authenticationClient)
+    fun jwsValidator(authenticationService: AuthenticationService): JwsValidator {
+        val authenticationClient = object: AuthenticationClient{
+            override fun publicKey(): PublicKeyDto {
+                return authenticationService.publicKey
+            }
+        }
+        return JwsValidator(authenticationClient)
+    }
 
     @Bean
     fun credentialsValidator(adminServiceCredentials: AdminServiceCredentials): CredentialsValidator =

From 46a9ac04c8ef46623db5ad5ca7c57a0496b52646 Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Wed, 1 Jan 2025 16:31:38 +0100
Subject: [PATCH 17/27] Remove auth cookie handling and introduce microservice
 overview

This update removes all dependencies and logic related to auth cookies, including their handling in interceptors, back-end configurations, and logout endpoints. Additionally, it introduces a microservice overview implementation with new components, services, and models for managing and displaying application statuses in the web interface.
---
 .../jwt/servlet/JwtAuthenticationConverter.kt |  5 ---
 .../AuthenticationController.kt               | 32 +----------------
 .../security/SecurityConfiguration.kt         |  8 -----
 .../AuthenticationGatewayFilterFactory.kt     |  6 ----
 website/src/app/app.config.ts                 |  2 +-
 .../interceptors/auth-cookie.interceptor.ts   | 15 --------
 .../src/app/core/models/admin/admin.model.ts  | 23 +++++++++++++
 .../src/app/core/services/admin.service.ts    | 21 ++++++++++++
 website/src/app/core/services/auth.service.ts |  3 --
 website/src/app/login/login.component.ts      |  1 +
 .../microservice-overview.component.html      |  1 +
 .../microservice-overview.component.ts        |  6 +++-
 .../ms-application.component.html             | 11 ++++++
 .../ms-application.component.scss             |  0
 .../ms-application.component.ts               | 25 ++++++++++++++
 .../ms-applications.component.html            | 12 +++++++
 .../ms-applications.component.scss            |  0
 .../ms-applications.component.ts              | 25 ++++++++++++++
 .../pipes/ms-status-icon.pipe.ts              | 34 +++++++++++++++++++
 .../pipes/ms-status-style.pipe.ts             | 33 ++++++++++++++++++
 20 files changed, 193 insertions(+), 70 deletions(-)
 delete mode 100644 website/src/app/core/interceptors/auth-cookie.interceptor.ts
 create mode 100644 website/src/app/core/models/admin/admin.model.ts
 create mode 100644 website/src/app/core/services/admin.service.ts
 create mode 100644 website/src/app/microservice-overview/ms-application/ms-application.component.html
 create mode 100644 website/src/app/microservice-overview/ms-application/ms-application.component.scss
 create mode 100644 website/src/app/microservice-overview/ms-application/ms-application.component.ts
 create mode 100644 website/src/app/microservice-overview/ms-applications/ms-applications.component.html
 create mode 100644 website/src/app/microservice-overview/ms-applications/ms-applications.component.scss
 create mode 100644 website/src/app/microservice-overview/ms-applications/ms-applications.component.ts
 create mode 100644 website/src/app/microservice-overview/pipes/ms-status-icon.pipe.ts
 create mode 100644 website/src/app/microservice-overview/pipes/ms-status-style.pipe.ts

diff --git a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/servlet/JwtAuthenticationConverter.kt b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/servlet/JwtAuthenticationConverter.kt
index d40ffe55..fd7b50e8 100644
--- a/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/servlet/JwtAuthenticationConverter.kt
+++ b/authentication-library/src/main/kotlin/com/michibaum/authentication_library/security/jwt/servlet/JwtAuthenticationConverter.kt
@@ -25,11 +25,6 @@ class JwtAuthenticationConverter: AuthenticationConverter {
         if(header != null && header.startsWith("Bearer ")) {
             return header.substring("Bearer ".length)
         }
-
-        val cookie = request.cookies?.firstOrNull { cookie -> cookie.name == "jwt" }?.value
-        if(!cookie.isNullOrBlank()) {
-            return cookie
-        }
         return null
     }
 
diff --git a/authentication-service/src/main/kotlin/com/michibaum/authentication_service/authentication/AuthenticationController.kt b/authentication-service/src/main/kotlin/com/michibaum/authentication_service/authentication/AuthenticationController.kt
index f3db16a1..8446f081 100644
--- a/authentication-service/src/main/kotlin/com/michibaum/authentication_service/authentication/AuthenticationController.kt
+++ b/authentication-service/src/main/kotlin/com/michibaum/authentication_service/authentication/AuthenticationController.kt
@@ -35,21 +35,8 @@ class AuthenticationController (
 
         val jws = authenticationService.generateJWS(userDetailsDto)!!
 
-        val cookie = ResponseCookie.from("jwt", jws)
-            .httpOnly(true)
-            .maxAge(Duration.ofHours(8))
-            .domain("michibaum.ch")
-            .secure(true)
-            .sameSite("Lax")
-            .build()
-
         val responseBody = AuthenticationResponse(authenticationDto.username, jws)
-        return ResponseEntity.ok()
-            .headers {
-                it.set(HttpHeaders.SET_COOKIE, cookie.toString())
-                it.set(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS, "true")
-            }
-            .body(responseBody)
+        return ResponseEntity.ok().body(responseBody)
     }
 
     @PostMapping(value = ["/api/register"])
@@ -73,23 +60,6 @@ class AuthenticationController (
         return ResponseEntity.status(HttpStatus.CONFLICT).body(responseBody)
     }
 
-    @PostMapping(value = ["/api/logout"])
-    fun logout(): ResponseEntity<Any> {
-        val cookie = ResponseCookie.from("jwt")
-            .maxAge(0)
-            .httpOnly(true)
-            .maxAge(Duration.ofHours(8))
-            .domain("michibaum.ch")
-            .secure(true)
-            .build()
-        return ResponseEntity.ok()
-            .headers {
-                it.set(HttpHeaders.SET_COOKIE, cookie.toString())
-                it.set(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS, "true")
-            }
-            .build()
-    }
-
     override fun publicKey(): PublicKeyDto {
         return authenticationService.publicKey
     }
diff --git a/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityConfiguration.kt b/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityConfiguration.kt
index 78d2140f..795a8fee 100644
--- a/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityConfiguration.kt
+++ b/authentication-service/src/main/kotlin/com/michibaum/authentication_service/security/SecurityConfiguration.kt
@@ -5,17 +5,10 @@ import com.michibaum.permission_library.Permissions
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity
-import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
-import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity
-import org.springframework.security.config.web.server.SecurityWebFiltersOrder
-import org.springframework.security.config.web.server.ServerHttpSecurity
-import org.springframework.security.config.web.server.ServerHttpSecurity.AuthorizeExchangeSpec
 import org.springframework.security.web.SecurityFilterChain
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
-import org.springframework.security.web.server.SecurityWebFilterChain
-import org.springframework.security.web.server.authentication.AuthenticationWebFilter
 
 
 @Configuration
@@ -34,7 +27,6 @@ class SecurityConfiguration {
                     .requestMatchers(
                         "/api/authenticate",
                         "/api/getAuthDetails",
-                        "/api/logout",
                         "/api/register"
                     ).permitAll()
                     .requestMatchers(
diff --git a/gateway-service/src/main/kotlin/com/michibaum/gatewayservice/AuthenticationGatewayFilterFactory.kt b/gateway-service/src/main/kotlin/com/michibaum/gatewayservice/AuthenticationGatewayFilterFactory.kt
index 29607db7..475e1d04 100644
--- a/gateway-service/src/main/kotlin/com/michibaum/gatewayservice/AuthenticationGatewayFilterFactory.kt
+++ b/gateway-service/src/main/kotlin/com/michibaum/gatewayservice/AuthenticationGatewayFilterFactory.kt
@@ -52,12 +52,6 @@ class AuthenticationGatewayFilterFactory(
             if(authHeader?.startsWith("Bearer ") == true)
             return authHeader.substring("Bearer ".length)
         }
-
-        val authCookie = serverWebExchange.request.cookies["jwt"]
-        val cookieExists = authCookie?.size == 1
-        if(cookieExists){
-            return authCookie?.get(0)?.value
-        }
         return null
     }
 
diff --git a/website/src/app/app.config.ts b/website/src/app/app.config.ts
index ea2ea37b..5ca6c981 100644
--- a/website/src/app/app.config.ts
+++ b/website/src/app/app.config.ts
@@ -70,7 +70,7 @@ export const appConfig: ApplicationConfig = {
     provideAppInitializer(() => {
         const initializerFn = (appInitializerFactory)(inject(TranslateService));
         return initializerFn();
-      }),
+    }),
     {
       provide : HTTP_INTERCEPTORS,
       useClass: AuthJwtInterceptor,
diff --git a/website/src/app/core/interceptors/auth-cookie.interceptor.ts b/website/src/app/core/interceptors/auth-cookie.interceptor.ts
deleted file mode 100644
index 7abe7ef5..00000000
--- a/website/src/app/core/interceptors/auth-cookie.interceptor.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import {Injectable} from "@angular/core";
-import {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from "@angular/common/http";
-import {Observable} from "rxjs";
-
-@Injectable()
-export class AuthCookieInterceptor implements HttpInterceptor{
-
-  intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
-    const modifiedRequest = req.clone({
-      withCredentials: true,
-    });
-    return next.handle(modifiedRequest);
-  }
-
-}
diff --git a/website/src/app/core/models/admin/admin.model.ts b/website/src/app/core/models/admin/admin.model.ts
new file mode 100644
index 00000000..49122e18
--- /dev/null
+++ b/website/src/app/core/models/admin/admin.model.ts
@@ -0,0 +1,23 @@
+export interface Application {
+  name: string
+  instances: Instance[]
+  status: Status
+}
+
+export interface Instance {
+  id: string
+  version: number
+  statusInfo: StatusInfo
+}
+
+export interface StatusInfo {
+  status: Status
+  details: any // TODO how
+}
+
+export enum Status {
+  UP = 'UP',
+  DOWN = 'DOWN',
+  OUT_OF_SERVICE = 'OUT_OF_SERVICE',
+  UNKNOWN = 'UNKNOWN'
+}
diff --git a/website/src/app/core/services/admin.service.ts b/website/src/app/core/services/admin.service.ts
new file mode 100644
index 00000000..02e52876
--- /dev/null
+++ b/website/src/app/core/services/admin.service.ts
@@ -0,0 +1,21 @@
+import {inject, Injectable} from "@angular/core";
+import {HttpClient} from "@angular/common/http";
+import {catchError, Observable} from "rxjs";
+import {environment} from "../../../environments/environment";
+import {HttpErrorHandler} from "../config/http-error-handler.service";
+import {UserInfoService} from "./user-info.service";
+import {Application} from "../models/admin/admin.model";
+
+@Injectable({providedIn: 'root'})
+export class AdminService {
+  private readonly http = inject(HttpClient);
+  private readonly httpErrorConfig = inject(HttpErrorHandler);
+  private readonly userInfoService = inject(UserInfoService);
+
+  applications(): Observable<Application[]> {
+    return this.http.get<Application[]>(environment.adminService + '/applications', {headers: {"Accept": "application/json"}})
+      .pipe(catchError(err => this.httpErrorConfig.handleError(err, this.userInfoService)));
+  }
+
+
+}
diff --git a/website/src/app/core/services/auth.service.ts b/website/src/app/core/services/auth.service.ts
index 395cdac9..72a8555b 100644
--- a/website/src/app/core/services/auth.service.ts
+++ b/website/src/app/core/services/auth.service.ts
@@ -37,9 +37,6 @@ export class AuthService {
 
   logout(){
     localStorage.removeItem('Authentication');
-    this.http.post(environment.authenticationService + '/logout', {})
-      .pipe(catchError(err => this.httpErrorConfig.handleError(err, this.userInfoService)))
-      .subscribe();
     this.logoutEmitter.next();
     this.router.home()
   }
diff --git a/website/src/app/login/login.component.ts b/website/src/app/login/login.component.ts
index ea3ca50b..74103879 100644
--- a/website/src/app/login/login.component.ts
+++ b/website/src/app/login/login.component.ts
@@ -62,6 +62,7 @@ export class LoginComponent implements OnInit{
     if(username == "" || password == "")
       return;
 
+    this.authService.logout();
     this.authService.login(username, password)
   }
 
diff --git a/website/src/app/microservice-overview/microservice-overview.component.html b/website/src/app/microservice-overview/microservice-overview.component.html
index e69de29b..c73ff582 100644
--- a/website/src/app/microservice-overview/microservice-overview.component.html
+++ b/website/src/app/microservice-overview/microservice-overview.component.html
@@ -0,0 +1 @@
+<app-ms-applications></app-ms-applications>
diff --git a/website/src/app/microservice-overview/microservice-overview.component.ts b/website/src/app/microservice-overview/microservice-overview.component.ts
index c4e0fedd..b8c10f65 100644
--- a/website/src/app/microservice-overview/microservice-overview.component.ts
+++ b/website/src/app/microservice-overview/microservice-overview.component.ts
@@ -1,16 +1,20 @@
 import {Component, inject, OnInit} from '@angular/core';
 import {HeaderService} from "../core/services/header.service";
 import {Sides} from "../core/config/sides";
+import {MsApplicationsComponent} from "./ms-applications/ms-applications.component";
 
 @Component({
   selector: 'app-microservice-overview',
-  imports: [],
+  imports: [
+    MsApplicationsComponent
+  ],
   templateUrl: './microservice-overview.component.html',
   styleUrl: './microservice-overview.component.scss'
 })
 export class MicroserviceOverviewComponent implements OnInit{
   private readonly headerService = inject(HeaderService);
 
+
   ngOnInit(): void {
     this.headerService.changeTitle(Sides.microservices.translationKey)
   }
diff --git a/website/src/app/microservice-overview/ms-application/ms-application.component.html b/website/src/app/microservice-overview/ms-application/ms-application.component.html
new file mode 100644
index 00000000..8bca82d0
--- /dev/null
+++ b/website/src/app/microservice-overview/ms-application/ms-application.component.html
@@ -0,0 +1,11 @@
+<p-card styleClass="h-full">
+  <ng-template #title>
+    {{application()?.name}}
+    <fa-icon [icon]="application()?.status | msStatusIcon" [style]="application()?.status | msStatusStyle"></fa-icon>
+  </ng-template>
+
+  <ng-container *ngFor="let instance of application()?.instances">
+    {{instance.id}}
+    <fa-icon [icon]="instance.statusInfo.status | msStatusIcon" [style]="instance.statusInfo.status | msStatusStyle"></fa-icon>
+  </ng-container>
+</p-card>
diff --git a/website/src/app/microservice-overview/ms-application/ms-application.component.scss b/website/src/app/microservice-overview/ms-application/ms-application.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/website/src/app/microservice-overview/ms-application/ms-application.component.ts b/website/src/app/microservice-overview/ms-application/ms-application.component.ts
new file mode 100644
index 00000000..a16a4a0f
--- /dev/null
+++ b/website/src/app/microservice-overview/ms-application/ms-application.component.ts
@@ -0,0 +1,25 @@
+import {Component, input, Input} from '@angular/core';
+import {Card} from "primeng/card";
+import {NgForOf} from "@angular/common";
+import {Application} from "../../core/models/admin/admin.model";
+import {MsStatusIconPipe} from "../pipes/ms-status-icon.pipe";
+import {FaIconComponent} from "@fortawesome/angular-fontawesome";
+import {EventIconColorPipe} from "../../core/pipes/event-icon-color.pipe";
+import {MsStatusStylePipe} from "../pipes/ms-status-style.pipe";
+
+@Component({
+  selector: 'app-ms-application',
+  imports: [
+    Card,
+    NgForOf,
+    MsStatusIconPipe,
+    FaIconComponent,
+    EventIconColorPipe,
+    MsStatusStylePipe
+  ],
+  templateUrl: './ms-application.component.html',
+  styleUrl: './ms-application.component.scss'
+})
+export class MsApplicationComponent {
+  application = input<Application>()
+}
diff --git a/website/src/app/microservice-overview/ms-applications/ms-applications.component.html b/website/src/app/microservice-overview/ms-applications/ms-applications.component.html
new file mode 100644
index 00000000..5b062ab0
--- /dev/null
+++ b/website/src/app/microservice-overview/ms-applications/ms-applications.component.html
@@ -0,0 +1,12 @@
+<div class="container mx-auto">
+  <div class="grid grid-cols-1 4k:grid-cols-6 xlScreen:grid-cols-5 lScreen:grid-cols-4 desktop:grid-cols-3 laptop:grid-cols-2 tablet:grid-cols-2 mobile:grid-cols-1 gap-4">
+
+
+    <ng-container *ngIf="applications.value() as applications2">
+      <ng-container *ngFor="let application of applications2">
+        <app-ms-application [application]="application"></app-ms-application>
+      </ng-container>
+    </ng-container>
+
+  </div>
+</div>
diff --git a/website/src/app/microservice-overview/ms-applications/ms-applications.component.scss b/website/src/app/microservice-overview/ms-applications/ms-applications.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/website/src/app/microservice-overview/ms-applications/ms-applications.component.ts b/website/src/app/microservice-overview/ms-applications/ms-applications.component.ts
new file mode 100644
index 00000000..724e96c4
--- /dev/null
+++ b/website/src/app/microservice-overview/ms-applications/ms-applications.component.ts
@@ -0,0 +1,25 @@
+import {Component, inject} from '@angular/core';
+import {Card} from "primeng/card";
+import {NgForOf, NgIf} from "@angular/common";
+import {AdminService} from "../../core/services/admin.service";
+import {rxResource} from "@angular/core/rxjs-interop";
+import {MsApplicationComponent} from "../ms-application/ms-application.component";
+
+@Component({
+  selector: 'app-ms-applications',
+  imports: [
+    Card,
+    NgForOf,
+    NgIf,
+    MsApplicationComponent
+  ],
+  templateUrl: './ms-applications.component.html',
+  styleUrl: './ms-applications.component.scss'
+})
+export class MsApplicationsComponent {
+  private readonly adminService = inject(AdminService);
+
+  applications = rxResource({
+    loader: () => this.adminService.applications()
+  })
+}
diff --git a/website/src/app/microservice-overview/pipes/ms-status-icon.pipe.ts b/website/src/app/microservice-overview/pipes/ms-status-icon.pipe.ts
new file mode 100644
index 00000000..6901d561
--- /dev/null
+++ b/website/src/app/microservice-overview/pipes/ms-status-icon.pipe.ts
@@ -0,0 +1,34 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import {IconDefinition} from "@fortawesome/angular-fontawesome";
+import {faCircleCheck, faCircleExclamation, faCircleQuestion, faCircleXmark} from "@fortawesome/free-solid-svg-icons";
+import {Status} from "../../core/models/admin/admin.model";
+
+@Pipe({
+  name: 'msStatusIcon'
+})
+export class MsStatusIconPipe implements PipeTransform {
+
+  transform(value: String | undefined, ...args: unknown[]): IconDefinition {
+    if (value === undefined) {
+      return faCircleQuestion
+    }
+
+    if (value === Status.UP) {
+      return faCircleCheck
+    }
+
+    if (value === Status.DOWN) {
+      return faCircleXmark
+    }
+
+    if (value === Status.UNKNOWN) {
+      return faCircleQuestion
+    }
+    if (value === Status.OUT_OF_SERVICE){
+      return faCircleExclamation
+    }
+
+    return faCircleQuestion
+  }
+
+}
diff --git a/website/src/app/microservice-overview/pipes/ms-status-style.pipe.ts b/website/src/app/microservice-overview/pipes/ms-status-style.pipe.ts
new file mode 100644
index 00000000..7472905c
--- /dev/null
+++ b/website/src/app/microservice-overview/pipes/ms-status-style.pipe.ts
@@ -0,0 +1,33 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import {Status} from "../../core/models/admin/admin.model";
+import {faCircleCheck, faCircleExclamation, faCircleQuestion, faCircleXmark} from "@fortawesome/free-solid-svg-icons";
+
+@Pipe({
+  name: 'msStatusStyle'
+})
+export class MsStatusStylePipe implements PipeTransform {
+
+  transform(value: String | undefined, ...args: unknown[]): String {
+    if (value === undefined) {
+      return "color: yellow"
+    }
+
+    if (value === Status.UP) {
+      return "color: green"
+    }
+
+    if (value === Status.DOWN) {
+      return "color: red"
+    }
+
+    if (value === Status.UNKNOWN) {
+      return "color: yellow"
+    }
+    if (value === Status.OUT_OF_SERVICE){
+      return "color: orange"
+    }
+
+    return "color: yellow"
+  }
+
+}

From bd5257a29507fb78aea4e320d59ec4594ea1eea2 Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Wed, 1 Jan 2025 16:38:55 +0100
Subject: [PATCH 18/27] Refactor security rules to enforce stricter access
 control

Replaced specific actuator request matchers with a global rule requiring ADMIN_SERVICE authority for all requests. This simplifies configuration and ensures consistent access control across the application.
---
 .../admin_service/security/SecurityConfiguration.kt        | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/admin-service/src/main/kotlin/com/michibaum/admin_service/security/SecurityConfiguration.kt b/admin-service/src/main/kotlin/com/michibaum/admin_service/security/SecurityConfiguration.kt
index e78c77de..98dc910b 100644
--- a/admin-service/src/main/kotlin/com/michibaum/admin_service/security/SecurityConfiguration.kt
+++ b/admin-service/src/main/kotlin/com/michibaum/admin_service/security/SecurityConfiguration.kt
@@ -23,11 +23,8 @@ class SecurityConfiguration {
     ): SecurityFilterChain {
         return http
             .authorizeHttpRequests {
-                it.requestMatchers(
-                    "/actuator",
-                    "/actuator/**"
-                ).hasAnyAuthority(Permissions.ADMIN_SERVICE.name)
-                .anyRequest().authenticated()
+                it.anyRequest()
+                    .hasAnyAuthority(Permissions.ADMIN_SERVICE.name)
             }
             .addFilterBefore(authenticationFilter, UsernamePasswordAuthenticationFilter::class.java)
             .httpBasic { httpBasicSpec -> httpBasicSpec.disable() }

From 0f6a97186bb52f1751015132bffc7699acfd0e4c Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Wed, 1 Jan 2025 23:42:04 +0100
Subject: [PATCH 19/27] Remove reactive security dependencies and refactor
 frontend

Reactive Spring Security classes and annotations were removed across services to streamline configurations. Frontend code was updated to enhance the application's structure and data visualization, including detailed accordion views for microservice statuses.
---
 .../app/event/EventController.kt              |   2 -
 .../chess_service/app/event/EventConverter.kt |   2 -
 .../security/SecurityConfiguration.kt         |  10 --
 .../app/person/PersonControllerIT.kt          |   2 +-
 docs/Writerside/topics/Authentication.md      |   3 +-
 .../security/SecurityConfiguration.kt         |   7 --
 .../FitbitOAuthControllerIT.kt                |   3 -
 .../security/SecurityConfiguration.kt         |   7 --
 .../security/SecurityConfiguration.kt         |   7 --
 .../usermanagement_service/ActuatorIT.kt      |   3 -
 .../chess-update-event-category.component.ts  |   2 +-
 .../src/app/core/models/admin/admin.model.ts  | 111 ++++++++++++++++--
 .../ms-application.component.html             |  12 ++
 .../ms-application.component.ts               |  11 +-
 14 files changed, 124 insertions(+), 58 deletions(-)

diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventController.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventController.kt
index 8eb3494a..0cb31ceb 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventController.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventController.kt
@@ -1,6 +1,5 @@
 package com.michibaum.chess_service.app.event
 
-import com.michibaum.authentication_library.security.jwt.JwtAuthentication
 import com.michibaum.chess_service.app.game.GameConverter
 import com.michibaum.chess_service.app.game.GameDto
 import com.michibaum.chess_service.app.game.GameService
@@ -9,7 +8,6 @@ import com.michibaum.chess_service.app.person.PersonDto
 import jakarta.validation.Valid
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
-import org.springframework.security.core.context.ReactiveSecurityContextHolder
 import org.springframework.transaction.annotation.Isolation
 import org.springframework.transaction.annotation.Propagation
 import org.springframework.transaction.annotation.Transactional
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt
index 4510fba8..5278b6dc 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt
@@ -1,12 +1,10 @@
 package com.michibaum.chess_service.app.event
 
 import com.michibaum.authentication_library.anyOf
-import com.michibaum.authentication_library.security.jwt.JwtAuthentication
 import com.michibaum.chess_service.app.eventcategory.EventCategoryConverter
 import com.michibaum.chess_service.app.person.PersonConverter
 import com.michibaum.chess_service.domain.Event
 import com.michibaum.permission_library.Permissions
-import org.springframework.security.core.context.ReactiveSecurityContextHolder
 import org.springframework.security.core.context.SecurityContextHolder
 import org.springframework.stereotype.Component
 
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityConfiguration.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityConfiguration.kt
index e117de9d..91671dcd 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityConfiguration.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/security/SecurityConfiguration.kt
@@ -5,21 +5,11 @@ import com.michibaum.permission_library.Permissions
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpMethod
-import org.springframework.security.authentication.AuthenticationManager
-import org.springframework.security.authentication.ReactiveAuthenticationManager
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity
-import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
-import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity
-import org.springframework.security.config.web.server.SecurityWebFiltersOrder
-import org.springframework.security.config.web.server.ServerHttpSecurity
-import org.springframework.security.config.web.server.ServerHttpSecurity.AuthorizeExchangeSpec
-import org.springframework.security.config.web.server.ServerHttpSecurity.http
 import org.springframework.security.web.SecurityFilterChain
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
-import org.springframework.security.web.server.SecurityWebFilterChain
-import org.springframework.security.web.server.authentication.AuthenticationWebFilter
 
 
 @Configuration
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/app/person/PersonControllerIT.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/app/person/PersonControllerIT.kt
index f2cc665c..6abc30e8 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/app/person/PersonControllerIT.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/app/person/PersonControllerIT.kt
@@ -16,7 +16,7 @@ import org.springframework.test.context.bean.override.mockito.MockitoBean
 import org.springframework.test.web.reactive.server.WebTestClient
 import java.util.*
 
-@AutoConfigureWebTestClient
+@AutoConfigureWebTestClient // TODO change to mockMvc
 @SpringBootTest
 @TestcontainersConfiguration
 class PersonControllerIT {
diff --git a/docs/Writerside/topics/Authentication.md b/docs/Writerside/topics/Authentication.md
index a19b15b3..ba2db4c7 100644
--- a/docs/Writerside/topics/Authentication.md
+++ b/docs/Writerside/topics/Authentication.md
@@ -3,5 +3,4 @@
 https://docs.spring.io/spring-security/reference/servlet/authentication/architecture.html
 
 
-https://docs.spring.io/spring-security/reference/servlet/index.html
-https://docs.spring.io/spring-security/reference/reactive/index.html
\ No newline at end of file
+https://docs.spring.io/spring-security/reference/servlet/index.html
\ No newline at end of file
diff --git a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/security/SecurityConfiguration.kt b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/security/SecurityConfiguration.kt
index 439b3286..45946c92 100644
--- a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/security/SecurityConfiguration.kt
+++ b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/security/SecurityConfiguration.kt
@@ -5,17 +5,10 @@ import com.michibaum.permission_library.Permissions
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity
-import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
-import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity
-import org.springframework.security.config.web.server.SecurityWebFiltersOrder
-import org.springframework.security.config.web.server.ServerHttpSecurity
-import org.springframework.security.config.web.server.ServerHttpSecurity.AuthorizeExchangeSpec
 import org.springframework.security.web.SecurityFilterChain
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
-import org.springframework.security.web.server.SecurityWebFilterChain
-import org.springframework.security.web.server.authentication.AuthenticationWebFilter
 
 
 @Configuration
diff --git a/fitness-service/src/test/kotlin/com/michibaum/fitness_service/FitbitOAuthControllerIT.kt b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/FitbitOAuthControllerIT.kt
index e9053fb5..8520295f 100644
--- a/fitness-service/src/test/kotlin/com/michibaum/fitness_service/FitbitOAuthControllerIT.kt
+++ b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/FitbitOAuthControllerIT.kt
@@ -8,12 +8,9 @@ import org.junit.jupiter.api.Test
 import org.mockito.Mockito.anyString
 import org.mockito.Mockito.`when`
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.annotation.DirtiesContext
 import org.springframework.test.context.bean.override.mockito.MockitoBean
-import org.springframework.test.web.reactive.server.WebTestClient
 import org.springframework.test.web.servlet.MockMvc
 import org.springframework.test.web.servlet.get
 
diff --git a/music-service/src/main/kotlin/com/michibaum/music_service/security/SecurityConfiguration.kt b/music-service/src/main/kotlin/com/michibaum/music_service/security/SecurityConfiguration.kt
index 174604f3..18a9ab8d 100644
--- a/music-service/src/main/kotlin/com/michibaum/music_service/security/SecurityConfiguration.kt
+++ b/music-service/src/main/kotlin/com/michibaum/music_service/security/SecurityConfiguration.kt
@@ -5,17 +5,10 @@ import com.michibaum.permission_library.Permissions
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity
-import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
-import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity
-import org.springframework.security.config.web.server.SecurityWebFiltersOrder
-import org.springframework.security.config.web.server.ServerHttpSecurity
-import org.springframework.security.config.web.server.ServerHttpSecurity.AuthorizeExchangeSpec
 import org.springframework.security.web.SecurityFilterChain
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
-import org.springframework.security.web.server.SecurityWebFilterChain
-import org.springframework.security.web.server.authentication.AuthenticationWebFilter
 
 
 @Configuration
diff --git a/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/security/SecurityConfiguration.kt b/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/security/SecurityConfiguration.kt
index 1aa3811c..dd2d9d73 100644
--- a/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/security/SecurityConfiguration.kt
+++ b/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/security/SecurityConfiguration.kt
@@ -6,17 +6,10 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpMethod.POST
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity
-import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
-import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity
-import org.springframework.security.config.web.server.SecurityWebFiltersOrder
-import org.springframework.security.config.web.server.ServerHttpSecurity
-import org.springframework.security.config.web.server.ServerHttpSecurity.AuthorizeExchangeSpec
 import org.springframework.security.web.SecurityFilterChain
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
-import org.springframework.security.web.server.SecurityWebFilterChain
-import org.springframework.security.web.server.authentication.AuthenticationWebFilter
 
 
 @Configuration
diff --git a/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/ActuatorIT.kt b/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/ActuatorIT.kt
index ff01e60c..b66e4446 100644
--- a/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/ActuatorIT.kt
+++ b/usermanagement-service/src/test/kotlin/com/michibaum/usermanagement_service/ActuatorIT.kt
@@ -1,13 +1,10 @@
 package com.michibaum.usermanagement_service
 
-import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.web.reactive.server.WebTestClient
 import org.springframework.test.web.servlet.MockMvc
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
diff --git a/website/src/app/chess-settings/chess-update-event-category/chess-update-event-category.component.ts b/website/src/app/chess-settings/chess-update-event-category/chess-update-event-category.component.ts
index 636bfd0a..e945e2ea 100644
--- a/website/src/app/chess-settings/chess-update-event-category/chess-update-event-category.component.ts
+++ b/website/src/app/chess-settings/chess-update-event-category/chess-update-event-category.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, inject, signal, computed, effect} from '@angular/core';
+import {Component, inject, signal} from '@angular/core';
 import {ChessService} from "../../core/services/chess.service";
 import {FieldsetModule} from "primeng/fieldset";
 import {SelectChessEventCategoryComponent} from "../select-chess-event-category/select-chess-event-category.component";
diff --git a/website/src/app/core/models/admin/admin.model.ts b/website/src/app/core/models/admin/admin.model.ts
index 49122e18..5eddf7d7 100644
--- a/website/src/app/core/models/admin/admin.model.ts
+++ b/website/src/app/core/models/admin/admin.model.ts
@@ -1,23 +1,112 @@
+export enum Status {
+  UP = 'UP',
+  DOWN = 'DOWN',
+  OUT_OF_SERVICE = 'OUT_OF_SERVICE',
+  UNKNOWN = 'UNKNOWN'
+}
+
 export interface Application {
   name: string
-  instances: Instance[]
+  buildVersion: string | null;
   status: Status
+  statusTimestamp: string;
+  instances: Instance[];
 }
 
 export interface Instance {
-  id: string
-  version: number
-  statusInfo: StatusInfo
+  id: string;
+  version: number;
+  registration: Registration;
+  registered: boolean;
+  statusInfo: StatusInfo;
+  statusTimestamp: string;
+  info: Info;
+  endpoints: Endpoint[];
+  buildVersion: string | null;
+  tags: Record<string, unknown>;
+}
+
+export interface Registration {
+  name: string;
+  managementUrl: string;
+  healthUrl: string;
+  serviceUrl: string;
+  source: string;
+  metadata: Record<string, string>;
 }
 
 export interface StatusInfo {
-  status: Status
-  details: any // TODO how
+  status: Status;
+  details: Record<string, StatusDetail | undefined>;
 }
 
-export enum Status {
-  UP = 'UP',
-  DOWN = 'DOWN',
-  OUT_OF_SERVICE = 'OUT_OF_SERVICE',
-  UNKNOWN = 'UNKNOWN'
+export interface StatusDetail {
+  status: Status;
+  description?: string;
+  details?: Record<string, unknown>;
+  components?: Record<string, StatusDetail>;
+}
+
+export interface Info {
+  java?: JavaInfo;
+  os?: OSInfo;
+  process?: ProcessInfo;
+  ssl?: SSLInfo;
+}
+
+export interface JavaInfo {
+  version: string;
+  vendor: VendorInfo;
+  runtime: RuntimeInfo;
+  jvm: JVMInfo;
+}
+
+export interface VendorInfo {
+  name: string;
+}
+
+export interface RuntimeInfo {
+  name: string;
+  version: string;
+}
+
+export interface JVMInfo {
+  name: string;
+  vendor: string;
+  version: string;
+}
+
+export interface OSInfo {
+  name: string;
+  version: string;
+  arch: string;
+}
+
+export interface ProcessInfo {
+  pid: number;
+  parentPid: number;
+  owner: string;
+  cpus: number;
+  memory: MemoryInfo;
+}
+
+export interface MemoryInfo {
+  heap: HeapInfo;
+  nonHeap: HeapInfo;
+}
+
+export interface HeapInfo {
+  max: number;
+  committed: number;
+  used: number;
+  init: number;
+}
+
+export interface SSLInfo {
+  bundles: unknown[];
+}
+
+export interface Endpoint {
+  id: string;
+  url: string;
 }
diff --git a/website/src/app/microservice-overview/ms-application/ms-application.component.html b/website/src/app/microservice-overview/ms-application/ms-application.component.html
index 8bca82d0..0890b6d8 100644
--- a/website/src/app/microservice-overview/ms-application/ms-application.component.html
+++ b/website/src/app/microservice-overview/ms-application/ms-application.component.html
@@ -7,5 +7,17 @@
   <ng-container *ngFor="let instance of application()?.instances">
     {{instance.id}}
     <fa-icon [icon]="instance.statusInfo.status | msStatusIcon" [style]="instance.statusInfo.status | msStatusStyle"></fa-icon>
+    <p-accordion [value]="0">
+      <ng-container *ngFor="let detail of instance.statusInfo.details | keyvalue; let i = index">
+        <p-accordion-panel [value]="i">
+          <p-accordion-header>{{ detail.key }} <fa-icon [icon]="detail.value?.status | msStatusIcon" [style]="detail.value?.status | msStatusStyle"></fa-icon></p-accordion-header>
+          <p-accordion-content>
+            <ng-container *ngFor="let detail2 of detail.value?.details ?? {} | keyvalue">
+              <p class="m-0">{{detail2.key}}: {{detail2.value}}</p>
+            </ng-container>
+          </p-accordion-content>
+        </p-accordion-panel>
+      </ng-container>
+    </p-accordion>
   </ng-container>
 </p-card>
diff --git a/website/src/app/microservice-overview/ms-application/ms-application.component.ts b/website/src/app/microservice-overview/ms-application/ms-application.component.ts
index a16a4a0f..5be7baf5 100644
--- a/website/src/app/microservice-overview/ms-application/ms-application.component.ts
+++ b/website/src/app/microservice-overview/ms-application/ms-application.component.ts
@@ -1,11 +1,12 @@
 import {Component, input, Input} from '@angular/core';
 import {Card} from "primeng/card";
-import {NgForOf} from "@angular/common";
+import {JsonPipe, KeyValuePipe, NgForOf} from "@angular/common";
 import {Application} from "../../core/models/admin/admin.model";
 import {MsStatusIconPipe} from "../pipes/ms-status-icon.pipe";
 import {FaIconComponent} from "@fortawesome/angular-fontawesome";
 import {EventIconColorPipe} from "../../core/pipes/event-icon-color.pipe";
 import {MsStatusStylePipe} from "../pipes/ms-status-style.pipe";
+import {Accordion, AccordionContent, AccordionHeader, AccordionPanel} from "primeng/accordion";
 
 @Component({
   selector: 'app-ms-application',
@@ -15,7 +16,13 @@ import {MsStatusStylePipe} from "../pipes/ms-status-style.pipe";
     MsStatusIconPipe,
     FaIconComponent,
     EventIconColorPipe,
-    MsStatusStylePipe
+    MsStatusStylePipe,
+    JsonPipe,
+    KeyValuePipe,
+    AccordionPanel,
+    AccordionHeader,
+    AccordionContent,
+    Accordion
   ],
   templateUrl: './ms-application.component.html',
   styleUrl: './ms-application.component.scss'

From 7987381cf9f0f053647b8dbd6e825be707831935 Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Wed, 1 Jan 2025 23:46:06 +0100
Subject: [PATCH 20/27] Refactor imports for improved consistency

Standardized import formatting across multiple files to align with the project style guide. Removed unused imports and optimized the organization within various components and services to improve readability and maintainability.
---
 .../authentication/AuthenticationController.kt      |  3 ---
 .../chess_service/app/account/AccountDto.kt         |  2 +-
 .../michibaum/chess_service/app/event/EventDto.kt   |  2 +-
 .../chess_service/app/event/EventService.kt         |  1 -
 .../app/eventcategory/EventCategoryDto.kt           |  2 +-
 .../app/eventcategory/EventCategoryRepository.kt    |  2 +-
 .../app/eventcategory/EventCategoryWithEventDto.kt  |  2 +-
 .../chess_service/app/person/PersonController.kt    |  4 ----
 .../chess_service/app/person/PersonService.kt       |  1 -
 .../chess_service/domain/PlayerProvider.kt          |  1 -
 .../fitbit/oauth/FitbitOAuthController.kt           |  1 -
 .../fitness_service/fitbit/oauth/FitbitOAuthImpl.kt |  1 -
 .../fitness_service/TestcontainersConfiguration.kt  |  4 ----
 .../spotify/api/user/SpotifyUserApiImpl.kt          |  1 -
 .../michibaum/usermanagement_service/Permission.kt  |  4 +++-
 .../usermanagement_service/PermissionRepository.kt  |  1 -
 .../com/michibaum/usermanagement_service/User.kt    |  1 -
 .../about-me-experience.component.spec.ts           |  4 ++--
 .../about-me-experience.component.ts                |  2 +-
 website/src/app/about-me/about-me.component.ts      |  2 +-
 website/src/app/app.component.ts                    |  2 +-
 website/src/app/app.config.ts                       |  2 +-
 website/src/app/app.routes.ts                       |  2 --
 .../chess-update-account.component.ts               |  2 +-
 .../chess-update-event-category.component.spec.ts   |  4 ++--
 .../chess-update-event.component.ts                 |  2 +-
 .../chess-update-game.component.ts                  |  2 +-
 .../chess-update-person.component.ts                |  2 +-
 .../select-chess-event-category.component.spec.ts   |  4 ++--
 .../select-chess-event.component.ts                 |  2 +-
 .../chess-event-games.component.ts                  |  6 +++---
 .../chess-event-participants.component.ts           |  5 ++---
 .../app/chess/chess-event/chess-event.component.ts  |  4 ++--
 .../chess-events-list.component.ts                  |  3 +--
 .../chess-navigation.component.spec.ts              |  4 ++--
 .../chess-navigation/chess-navigation.component.ts  | 13 ++++++++++---
 .../app/chess/chess-news/chess-news.component.ts    |  2 +-
 .../chess-recent-upcoming-events.component.spec.ts  |  4 ++--
 .../chess-recent-upcoming-events.component.ts       |  3 +--
 website/src/app/chess/chess.component.ts            |  2 +-
 website/src/app/core/config/language.config.ts      |  3 +--
 .../app/core/interceptors/auth-jwt.interceptor.ts   |  2 +-
 website/src/app/core/services/auth.service.ts       |  2 +-
 website/src/app/core/services/chess.service.ts      |  9 ++++++---
 website/src/app/core/services/fitness.service.ts    |  2 +-
 website/src/app/core/services/music.service.ts      |  2 +-
 website/src/app/core/services/permission.service.ts |  2 +-
 .../app/core/services/router-navigation.service.ts  |  2 +-
 .../fitness-login/fitness-login.component.ts        |  2 +-
 .../fitness-settings/fitness-settings.component.ts  |  2 +-
 .../fitness-profile/fitness-profile.component.ts    |  2 +-
 .../fitness-sleep/fitness-sleep.component.ts        |  2 +-
 .../sleep-stages-chart.component.ts                 |  2 +-
 .../fitness-weight/fitness-weight.component.ts      |  2 +-
 website/src/app/fitness/fitness.component.ts        |  2 +-
 website/src/app/header/header.component.ts          |  2 +-
 .../app/header/navigation/navigation.component.ts   |  2 +-
 .../app/home/home-card/home-card.component.spec.ts  |  4 ++--
 .../language-select/language-select.component.ts    |  2 +-
 website/src/app/login/login.component.ts            |  2 +-
 website/src/app/logout/logout.component.ts          |  2 +-
 .../ms-application/ms-application.component.ts      |  7 ++-----
 .../ms-applications/ms-applications.component.ts    |  2 --
 .../pipes/ms-status-icon.pipe.ts                    |  2 +-
 .../pipes/ms-status-style.pipe.ts                   |  3 +--
 .../music-login/music-login.component.ts            |  2 +-
 .../app/music-settings/music-settings.component.ts  |  2 +-
 website/src/app/music/music.component.ts            |  2 +-
 website/src/app/mytheme.ts                          |  2 +-
 website/src/app/register/register.component.ts      |  2 +-
 .../defer-placeholder.component.spec.ts             |  4 ++--
 71 files changed, 86 insertions(+), 105 deletions(-)

diff --git a/authentication-service/src/main/kotlin/com/michibaum/authentication_service/authentication/AuthenticationController.kt b/authentication-service/src/main/kotlin/com/michibaum/authentication_service/authentication/AuthenticationController.kt
index 8446f081..32eea55f 100644
--- a/authentication-service/src/main/kotlin/com/michibaum/authentication_service/authentication/AuthenticationController.kt
+++ b/authentication-service/src/main/kotlin/com/michibaum/authentication_service/authentication/AuthenticationController.kt
@@ -5,14 +5,11 @@ import com.michibaum.authentication_library.PublicKeyDto
 import com.michibaum.usermanagement_library.*
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Lazy
-import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpStatus
-import org.springframework.http.ResponseCookie
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RestController
-import java.time.Duration
 
 @RestController
 class AuthenticationController (
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/account/AccountDto.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/account/AccountDto.kt
index 330167c9..fae92fc5 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/account/AccountDto.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/account/AccountDto.kt
@@ -1,7 +1,7 @@
 package com.michibaum.chess_service.app.account
 
 import com.michibaum.chess_service.domain.ChessPlatform
-import java.util.UUID
+import java.util.*
 
 data class AccountDto(
     val id: UUID,
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventDto.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventDto.kt
index 173650a2..0d2226e3 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventDto.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventDto.kt
@@ -2,7 +2,7 @@ package com.michibaum.chess_service.app.event
 
 import com.michibaum.chess_service.app.eventcategory.EventCategoryDto
 import com.michibaum.chess_service.app.person.PersonDto
-import java.util.UUID
+import java.util.*
 
 data class EventDto(
     val id: UUID,
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventService.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventService.kt
index e0867649..4e6635b8 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventService.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventService.kt
@@ -1,7 +1,6 @@
 package com.michibaum.chess_service.app.event
 
 import com.michibaum.authentication_library.anyOf
-import com.michibaum.authentication_library.security.jwt.JwtAuthentication
 import com.michibaum.chess_service.app.eventcategory.EventCategoryService
 import com.michibaum.chess_service.app.person.PersonRepository
 import com.michibaum.chess_service.domain.Event
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryDto.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryDto.kt
index 8e5cc669..274480a0 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryDto.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryDto.kt
@@ -1,6 +1,6 @@
 package com.michibaum.chess_service.app.eventcategory
 
-import java.util.UUID
+import java.util.*
 
 data class EventCategoryDto(
     val id: UUID,
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryRepository.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryRepository.kt
index 925f1037..9c856569 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryRepository.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryRepository.kt
@@ -2,7 +2,7 @@ package com.michibaum.chess_service.app.eventcategory
 
 import com.michibaum.chess_service.domain.EventCategory
 import org.springframework.data.jpa.repository.JpaRepository
-import java.util.UUID
+import java.util.*
 
 interface EventCategoryRepository: JpaRepository<EventCategory, UUID> {
 }
\ No newline at end of file
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryWithEventDto.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryWithEventDto.kt
index adb45c79..7b0eb87e 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryWithEventDto.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryWithEventDto.kt
@@ -1,7 +1,7 @@
 package com.michibaum.chess_service.app.eventcategory
 
 import com.michibaum.chess_service.app.event.EventDto
-import java.util.UUID
+import java.util.*
 
 data class EventCategoryWithEventDto(
     val id: UUID,
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonController.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonController.kt
index fe6855cb..1a2aa43f 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonController.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonController.kt
@@ -1,16 +1,12 @@
 package com.michibaum.chess_service.app.person
 
 import com.michibaum.chess_service.apis.fide.FideApiService
-import com.michibaum.chess_service.app.FileImportResult
 import com.michibaum.chess_service.app.event.EventService
-import com.michibaum.chess_service.domain.Person
 import jakarta.validation.Valid
 import org.springframework.core.io.buffer.DataBuffer
 import org.springframework.core.io.buffer.DataBufferUtils
 import org.springframework.http.HttpStatus
-import org.springframework.http.MediaType
 import org.springframework.http.ResponseEntity
-import org.springframework.http.codec.multipart.FilePart
 import org.springframework.transaction.annotation.Isolation
 import org.springframework.transaction.annotation.Propagation
 import org.springframework.transaction.annotation.Transactional
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonService.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonService.kt
index 27704301..2e77f8f4 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonService.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/person/PersonService.kt
@@ -1,6 +1,5 @@
 package com.michibaum.chess_service.app.person
 
-import com.michibaum.chess_service.apis.dtos.FidePersonDto
 import com.michibaum.chess_service.domain.Account
 import com.michibaum.chess_service.domain.Person
 import org.springframework.stereotype.Service
diff --git a/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/PlayerProvider.kt b/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/PlayerProvider.kt
index 07af94c9..31a8587d 100644
--- a/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/PlayerProvider.kt
+++ b/chess-service/src/test/kotlin/com/michibaum/chess_service/domain/PlayerProvider.kt
@@ -1,7 +1,6 @@
 package com.michibaum.chess_service.domain
 
 import com.michibaum.chess_service.apis.dtos.PieceColor
-import java.util.*
 
 class PlayerProvider {
 
diff --git a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthController.kt b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthController.kt
index f391b070..dca3a55b 100644
--- a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthController.kt
+++ b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthController.kt
@@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 import org.springframework.web.client.RestClient
-import reactor.core.publisher.Mono
 import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
 import java.util.*
diff --git a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthImpl.kt b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthImpl.kt
index 495ae9d5..e9d987bf 100644
--- a/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthImpl.kt
+++ b/fitness-service/src/main/kotlin/com/michibaum/fitness_service/fitbit/oauth/FitbitOAuthImpl.kt
@@ -6,7 +6,6 @@ import org.springframework.http.HttpHeaders
 import org.springframework.http.MediaType
 import org.springframework.stereotype.Component
 import org.springframework.web.client.RestClient
-import reactor.core.publisher.Mono
 import java.time.Instant
 import java.util.*
 
diff --git a/fitness-service/src/test/kotlin/com/michibaum/fitness_service/TestcontainersConfiguration.kt b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/TestcontainersConfiguration.kt
index 7a54e8b2..5044200d 100644
--- a/fitness-service/src/test/kotlin/com/michibaum/fitness_service/TestcontainersConfiguration.kt
+++ b/fitness-service/src/test/kotlin/com/michibaum/fitness_service/TestcontainersConfiguration.kt
@@ -2,11 +2,7 @@ package com.michibaum.fitness_service
 
 import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.context.annotation.Import
-import org.springframework.test.annotation.DirtiesContext
-import org.springframework.test.annotation.DirtiesContext.ClassMode.*
 import org.springframework.test.context.TestPropertySource
-import kotlin.annotation.AnnotationRetention.*
-import kotlin.annotation.AnnotationTarget.*
 
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
diff --git a/music-service/src/main/kotlin/com/michibaum/music_service/spotify/api/user/SpotifyUserApiImpl.kt b/music-service/src/main/kotlin/com/michibaum/music_service/spotify/api/user/SpotifyUserApiImpl.kt
index cb0d0b93..0d386fb8 100644
--- a/music-service/src/main/kotlin/com/michibaum/music_service/spotify/api/user/SpotifyUserApiImpl.kt
+++ b/music-service/src/main/kotlin/com/michibaum/music_service/spotify/api/user/SpotifyUserApiImpl.kt
@@ -7,7 +7,6 @@ import com.michibaum.music_service.spotify.api.user.dtos.SpotifyUserDto
 import com.michibaum.music_service.spotify.api.user.dtos.TimeRange
 import com.michibaum.music_service.spotify.oauth.SpotifyOAuthCredentials
 import org.springframework.stereotype.Component
-import reactor.core.publisher.Mono
 
 @Component
 class SpotifyUserApiImpl: AbstractSpotifyApiClient(), SpotifyUserApi {
diff --git a/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/Permission.kt b/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/Permission.kt
index 12034d7b..6474a413 100644
--- a/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/Permission.kt
+++ b/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/Permission.kt
@@ -1,6 +1,8 @@
 package com.michibaum.usermanagement_service
 
-import jakarta.persistence.*
+import jakarta.persistence.Column
+import jakarta.persistence.Entity
+import jakarta.persistence.Id
 
 @Entity
 class Permission(
diff --git a/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/PermissionRepository.kt b/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/PermissionRepository.kt
index d295252c..91be13cf 100644
--- a/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/PermissionRepository.kt
+++ b/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/PermissionRepository.kt
@@ -1,7 +1,6 @@
 package com.michibaum.usermanagement_service
 
 import org.springframework.data.jpa.repository.JpaRepository
-import java.util.UUID
 
 interface PermissionRepository: JpaRepository<Permission, String> {
 }
\ No newline at end of file
diff --git a/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/User.kt b/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/User.kt
index 21a3c04c..3d0d2ab5 100644
--- a/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/User.kt
+++ b/usermanagement-service/src/main/kotlin/com/michibaum/usermanagement_service/User.kt
@@ -2,7 +2,6 @@ package com.michibaum.usermanagement_service
 
 import jakarta.persistence.*
 import jakarta.persistence.FetchType.EAGER
-import org.hibernate.annotations.UuidGenerator
 import java.util.*
 
 @Entity
diff --git a/website/src/app/about-me/about-me-experience/about-me-experience.component.spec.ts b/website/src/app/about-me/about-me-experience/about-me-experience.component.spec.ts
index 3bcecb56..a7b4b7aa 100644
--- a/website/src/app/about-me/about-me-experience/about-me-experience.component.spec.ts
+++ b/website/src/app/about-me/about-me-experience/about-me-experience.component.spec.ts
@@ -1,6 +1,6 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {ComponentFixture, TestBed} from '@angular/core/testing';
 
-import { AboutMeExperienceComponent } from './about-me-experience.component';
+import {AboutMeExperienceComponent} from './about-me-experience.component';
 
 describe('AboutMeExperienceComponent', () => {
   let component: AboutMeExperienceComponent;
diff --git a/website/src/app/about-me/about-me-experience/about-me-experience.component.ts b/website/src/app/about-me/about-me-experience/about-me-experience.component.ts
index 5f27a758..dc364465 100644
--- a/website/src/app/about-me/about-me-experience/about-me-experience.component.ts
+++ b/website/src/app/about-me/about-me-experience/about-me-experience.component.ts
@@ -1,4 +1,4 @@
-import {Component, Input, signal} from '@angular/core';
+import {Component, signal} from '@angular/core';
 import {Accordion, AccordionContent, AccordionHeader, AccordionPanel} from "primeng/accordion";
 import {TranslatePipe} from "@ngx-translate/core";
 import {TableModule} from "primeng/table";
diff --git a/website/src/app/about-me/about-me.component.ts b/website/src/app/about-me/about-me.component.ts
index 0ea2dd27..f177ad0c 100644
--- a/website/src/app/about-me/about-me.component.ts
+++ b/website/src/app/about-me/about-me.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, inject } from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {HeaderService} from "../core/services/header.service";
 import {Sides} from "../core/config/sides";
 import {CardModule} from "primeng/card";
diff --git a/website/src/app/app.component.ts b/website/src/app/app.component.ts
index ab99a7f5..65616732 100644
--- a/website/src/app/app.component.ts
+++ b/website/src/app/app.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, inject, OnDestroy} from '@angular/core';
+import {Component, inject, OnDestroy, OnInit} from '@angular/core';
 import {RouterOutlet} from '@angular/router';
 import {HeaderComponent} from "./header/header.component";
 import {LightDarkModeService} from "./core/services/light-dark-mode.service";
diff --git a/website/src/app/app.config.ts b/website/src/app/app.config.ts
index 5ca6c981..49f16cf8 100644
--- a/website/src/app/app.config.ts
+++ b/website/src/app/app.config.ts
@@ -1,4 +1,4 @@
-import { ApplicationConfig, isDevMode, inject, provideAppInitializer } from '@angular/core';
+import {ApplicationConfig, inject, isDevMode, provideAppInitializer} from '@angular/core';
 import {provideRouter} from '@angular/router';
 import {routes} from './app.routes';
 import {HTTP_INTERCEPTORS, HttpClient, provideHttpClient, withInterceptorsFromDi} from "@angular/common/http";
diff --git a/website/src/app/app.routes.ts b/website/src/app/app.routes.ts
index f12bcf78..9fe246da 100644
--- a/website/src/app/app.routes.ts
+++ b/website/src/app/app.routes.ts
@@ -1,8 +1,6 @@
 import {Routes} from '@angular/router';
-import {LoginComponent} from "./login/login.component";
 import {HomeComponent} from "./home/home.component";
 import {Sides} from "./core/config/sides";
-import {RegisterComponent} from "./register/register.component";
 import {Permissions} from "./core/config/permissions";
 import {isAuthenticatedGuard, isPermittedGuard} from "./core/guards/auth.guard";
 
diff --git a/website/src/app/chess-settings/chess-update-account/chess-update-account.component.ts b/website/src/app/chess-settings/chess-update-account/chess-update-account.component.ts
index 706397fa..1f62f9f7 100644
--- a/website/src/app/chess-settings/chess-update-account/chess-update-account.component.ts
+++ b/website/src/app/chess-settings/chess-update-account/chess-update-account.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, inject, signal} from '@angular/core';
+import {Component, inject, signal} from '@angular/core';
 import {FieldsetModule} from "primeng/fieldset";
 import {ChessService} from "../../core/services/chess.service";
 import {InputTextModule} from "primeng/inputtext";
diff --git a/website/src/app/chess-settings/chess-update-event-category/chess-update-event-category.component.spec.ts b/website/src/app/chess-settings/chess-update-event-category/chess-update-event-category.component.spec.ts
index 39b9fff2..0094f8b7 100644
--- a/website/src/app/chess-settings/chess-update-event-category/chess-update-event-category.component.spec.ts
+++ b/website/src/app/chess-settings/chess-update-event-category/chess-update-event-category.component.spec.ts
@@ -1,6 +1,6 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {ComponentFixture, TestBed} from '@angular/core/testing';
 
-import { ChessUpdateEventCategoryComponent } from './chess-update-event-category.component';
+import {ChessUpdateEventCategoryComponent} from './chess-update-event-category.component';
 
 describe('ChessUpdateEventCategoryComponent', () => {
   let component: ChessUpdateEventCategoryComponent;
diff --git a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts
index c3bbf708..bfde2598 100644
--- a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts
+++ b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, inject, signal} from '@angular/core';
+import {Component, inject, OnInit, signal} from '@angular/core';
 import {ChessService} from "../../core/services/chess.service";
 import {FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators} from "@angular/forms";
 import {
diff --git a/website/src/app/chess-settings/chess-update-game/chess-update-game.component.ts b/website/src/app/chess-settings/chess-update-game/chess-update-game.component.ts
index 77e052ff..bb907579 100644
--- a/website/src/app/chess-settings/chess-update-game/chess-update-game.component.ts
+++ b/website/src/app/chess-settings/chess-update-game/chess-update-game.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, inject, signal, computed} from '@angular/core';
+import {Component, computed, inject, signal} from '@angular/core';
 import {FieldsetModule} from "primeng/fieldset";
 import {ChessService} from "../../core/services/chess.service";
 import {Account, ChessEvent, Person} from "../../core/models/chess/chess.models";
diff --git a/website/src/app/chess-settings/chess-update-person/chess-update-person.component.ts b/website/src/app/chess-settings/chess-update-person/chess-update-person.component.ts
index 85a55c84..1ae30965 100644
--- a/website/src/app/chess-settings/chess-update-person/chess-update-person.component.ts
+++ b/website/src/app/chess-settings/chess-update-person/chess-update-person.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, inject, signal} from '@angular/core';
+import {Component, inject, OnInit, signal} from '@angular/core';
 import {DropdownModule} from "primeng/dropdown";
 import {DividerModule} from "primeng/divider";
 import {FieldsetModule} from "primeng/fieldset";
diff --git a/website/src/app/chess-settings/select-chess-event-category/select-chess-event-category.component.spec.ts b/website/src/app/chess-settings/select-chess-event-category/select-chess-event-category.component.spec.ts
index ab485234..0a650664 100644
--- a/website/src/app/chess-settings/select-chess-event-category/select-chess-event-category.component.spec.ts
+++ b/website/src/app/chess-settings/select-chess-event-category/select-chess-event-category.component.spec.ts
@@ -1,6 +1,6 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {ComponentFixture, TestBed} from '@angular/core/testing';
 
-import { SelectChessEventCategoryComponent } from './select-chess-event-category.component';
+import {SelectChessEventCategoryComponent} from './select-chess-event-category.component';
 
 describe('SelectChessEventCategoryComponent', () => {
   let component: SelectChessEventCategoryComponent;
diff --git a/website/src/app/chess-settings/select-chess-event/select-chess-event.component.ts b/website/src/app/chess-settings/select-chess-event/select-chess-event.component.ts
index 3017b43e..1b82e3ab 100644
--- a/website/src/app/chess-settings/select-chess-event/select-chess-event.component.ts
+++ b/website/src/app/chess-settings/select-chess-event/select-chess-event.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, input, output, inject, signal} from '@angular/core';
+import {Component, inject, input, OnInit, output, signal} from '@angular/core';
 import {TableLazyLoadEvent, TableModule} from "primeng/table";
 import {ChessEvent, ChessEventCategory, SearchChessEvent} from "../../core/models/chess/chess.models";
 import {InputTextModule} from "primeng/inputtext";
diff --git a/website/src/app/chess/chess-event/chess-event-games/chess-event-games.component.ts b/website/src/app/chess/chess-event/chess-event-games/chess-event-games.component.ts
index 74eca0a5..b82c7f98 100644
--- a/website/src/app/chess/chess-event/chess-event-games/chess-event-games.component.ts
+++ b/website/src/app/chess/chess-event/chess-event-games/chess-event-games.component.ts
@@ -1,8 +1,8 @@
-import {Component, OnChanges, SimpleChanges, input, output, inject, computed} from '@angular/core';
-import {ChessEvent, ChessGame} from "../../../core/models/chess/chess.models";
+import {Component, computed, inject, input, output} from '@angular/core';
+import {ChessEvent} from "../../../core/models/chess/chess.models";
 import {ChessService} from "../../../core/services/chess.service";
 import {rxResource} from "@angular/core/rxjs-interop";
-import { of } from 'rxjs';
+import {of} from 'rxjs';
 
 @Component({
   selector: 'app-chess-event-games',
diff --git a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts
index 897df899..00e2fe0e 100644
--- a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts
+++ b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts
@@ -1,12 +1,11 @@
-import {Component, OnChanges, SimpleChanges, input, inject, computed} from '@angular/core';
+import {Component, computed, inject, input} from '@angular/core';
 import {Button} from "primeng/button";
 import {CardModule} from "primeng/card";
 import {NgIf} from "@angular/common";
 import {TableModule} from "primeng/table";
 import {RouterNavigationService} from "../../../core/services/router-navigation.service";
-import {ChessService} from "../../../core/services/chess.service";
 import {TranslateModule} from "@ngx-translate/core";
-import {ChessEvent, Person} from "../../../core/models/chess/chess.models";
+import {ChessEvent} from "../../../core/models/chess/chess.models";
 
 @Component({
   selector: 'app-chess-event-participants',
diff --git a/website/src/app/chess/chess-event/chess-event.component.ts b/website/src/app/chess/chess-event/chess-event.component.ts
index 0552cddf..77da528a 100644
--- a/website/src/app/chess/chess-event/chess-event.component.ts
+++ b/website/src/app/chess/chess-event/chess-event.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, inject, computed, signal, Signal, WritableSignal, resource, OnDestroy} from '@angular/core';
+import {Component, computed, inject, OnDestroy, Signal, signal, WritableSignal} from '@angular/core';
 import {DomSanitizer, SafeResourceUrl} from "@angular/platform-browser";
 import {ActivatedRoute} from '@angular/router';
 import {ChessService} from "../../core/services/chess.service";
@@ -14,7 +14,7 @@ import {DividerModule} from "primeng/divider";
 import {Tab, TabList, TabPanel, TabPanels, Tabs} from "primeng/tabs";
 import {Avatar} from "primeng/avatar";
 import {rxResource} from "@angular/core/rxjs-interop";
-import {EMPTY, Observable} from "rxjs";
+import {EMPTY} from "rxjs";
 
 @Component({
   selector: 'app-chess-events',
diff --git a/website/src/app/chess/chess-events-list/chess-events-list.component.ts b/website/src/app/chess/chess-events-list/chess-events-list.component.ts
index 1c1a1a85..52b9992f 100644
--- a/website/src/app/chess/chess-events-list/chess-events-list.component.ts
+++ b/website/src/app/chess/chess-events-list/chess-events-list.component.ts
@@ -1,9 +1,8 @@
-import {Component, OnInit, inject, computed} from '@angular/core';
+import {Component, computed, inject} from '@angular/core';
 import {ChessService} from "../../core/services/chess.service";
 import {CardModule} from "primeng/card";
 import {NgForOf, NgIf} from "@angular/common";
 import {RouterLink} from "@angular/router";
-import {ChessEventCategoryWithEvents} from "../../core/models/chess/chess.models";
 import {TimelineModule} from "primeng/timeline";
 import {FaIconComponent} from "@fortawesome/angular-fontawesome";
 import {ScrollTopModule} from "primeng/scrolltop";
diff --git a/website/src/app/chess/chess-navigation/chess-navigation.component.spec.ts b/website/src/app/chess/chess-navigation/chess-navigation.component.spec.ts
index cc445170..2aaeefca 100644
--- a/website/src/app/chess/chess-navigation/chess-navigation.component.spec.ts
+++ b/website/src/app/chess/chess-navigation/chess-navigation.component.spec.ts
@@ -1,6 +1,6 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {ComponentFixture, TestBed} from '@angular/core/testing';
 
-import { ChessNavigationComponent } from './chess-navigation.component';
+import {ChessNavigationComponent} from './chess-navigation.component';
 
 describe('ChessNavigationComponent', () => {
   let component: ChessNavigationComponent;
diff --git a/website/src/app/chess/chess-navigation/chess-navigation.component.ts b/website/src/app/chess/chess-navigation/chess-navigation.component.ts
index 96c882d7..ea8b6a30 100644
--- a/website/src/app/chess/chess-navigation/chess-navigation.component.ts
+++ b/website/src/app/chess/chess-navigation/chess-navigation.component.ts
@@ -1,5 +1,12 @@
-import {Component, inject, computed} from '@angular/core';
-import {faAngleDown, faCalendarDays, faChessQueen, faGears, faHouse, faNewspaper} from "@fortawesome/free-solid-svg-icons";
+import {Component, computed, inject} from '@angular/core';
+import {
+  faAngleDown,
+  faCalendarDays,
+  faChessQueen,
+  faGears,
+  faHouse,
+  faNewspaper
+} from "@fortawesome/free-solid-svg-icons";
 import {Badge} from "primeng/badge";
 import {Divider} from "primeng/divider";
 import {FaIconComponent} from "@fortawesome/angular-fontawesome";
@@ -14,7 +21,7 @@ import {PermissionService} from "../../core/services/permission.service";
 import {MenuItem} from "primeng/api";
 import {Permissions} from "../../core/config/permissions";
 import {ChessEvent} from "../../core/models/chess/chess.models";
-import { EventIconPipe } from 'src/app/core/pipes/event-icon.pipe';
+import {EventIconPipe} from 'src/app/core/pipes/event-icon.pipe';
 import {EventIconColorPipe} from "../../core/pipes/event-icon-color.pipe";
 import {rxResource} from "@angular/core/rxjs-interop";
 
diff --git a/website/src/app/chess/chess-news/chess-news.component.ts b/website/src/app/chess/chess-news/chess-news.component.ts
index 7c42f3b1..7494831b 100644
--- a/website/src/app/chess/chess-news/chess-news.component.ts
+++ b/website/src/app/chess/chess-news/chess-news.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component} from '@angular/core';
 import {Message} from "primeng/message";
 
 @Component({
diff --git a/website/src/app/chess/chess-recent-upcoming-events/chess-recent-upcoming-events.component.spec.ts b/website/src/app/chess/chess-recent-upcoming-events/chess-recent-upcoming-events.component.spec.ts
index 724c68bc..8c05fd4a 100644
--- a/website/src/app/chess/chess-recent-upcoming-events/chess-recent-upcoming-events.component.spec.ts
+++ b/website/src/app/chess/chess-recent-upcoming-events/chess-recent-upcoming-events.component.spec.ts
@@ -1,6 +1,6 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {ComponentFixture, TestBed} from '@angular/core/testing';
 
-import { ChessRecentUpcomingEventsComponent } from './chess-recent-upcoming-events.component';
+import {ChessRecentUpcomingEventsComponent} from './chess-recent-upcoming-events.component';
 
 describe('ChessEventsRecentUpcomingComponent', () => {
   let component: ChessRecentUpcomingEventsComponent;
diff --git a/website/src/app/chess/chess-recent-upcoming-events/chess-recent-upcoming-events.component.ts b/website/src/app/chess/chess-recent-upcoming-events/chess-recent-upcoming-events.component.ts
index ca6ad2e8..569a2577 100644
--- a/website/src/app/chess/chess-recent-upcoming-events/chess-recent-upcoming-events.component.ts
+++ b/website/src/app/chess/chess-recent-upcoming-events/chess-recent-upcoming-events.component.ts
@@ -1,6 +1,5 @@
-import {Component, OnInit, inject, computed} from '@angular/core';
+import {Component, computed, inject} from '@angular/core';
 import {ChessService} from "../../core/services/chess.service";
-import {ChessEvent} from "../../core/models/chess/chess.models";
 import {FaIconComponent} from "@fortawesome/angular-fontawesome";
 import {PrimeTemplate} from "primeng/api";
 import {Timeline} from "primeng/timeline";
diff --git a/website/src/app/chess/chess.component.ts b/website/src/app/chess/chess.component.ts
index e205f0c4..4bf3b854 100644
--- a/website/src/app/chess/chess.component.ts
+++ b/website/src/app/chess/chess.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, inject } from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {SplitterModule} from "primeng/splitter";
 import {HeaderService} from "../core/services/header.service";
 import {Sides} from "../core/config/sides";
diff --git a/website/src/app/core/config/language.config.ts b/website/src/app/core/config/language.config.ts
index d49f122b..86434754 100644
--- a/website/src/app/core/config/language.config.ts
+++ b/website/src/app/core/config/language.config.ts
@@ -1,8 +1,7 @@
-import { Injectable, inject } from '@angular/core';
+import {inject, Injectable} from '@angular/core';
 import {TranslateService} from '@ngx-translate/core';
 import {Language} from '../models/language.model';
 import {Subject} from "rxjs";
-import {PrimeNG} from "primeng/config";
 
 export const languages: Language[] = [
   {
diff --git a/website/src/app/core/interceptors/auth-jwt.interceptor.ts b/website/src/app/core/interceptors/auth-jwt.interceptor.ts
index 9f1e46c2..c25e8021 100644
--- a/website/src/app/core/interceptors/auth-jwt.interceptor.ts
+++ b/website/src/app/core/interceptors/auth-jwt.interceptor.ts
@@ -1,4 +1,4 @@
-import { Injectable, inject } from "@angular/core";
+import {inject, Injectable} from "@angular/core";
 import {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from "@angular/common/http";
 import {Observable} from "rxjs";
 import {AuthService} from "../services/auth.service";
diff --git a/website/src/app/core/services/auth.service.ts b/website/src/app/core/services/auth.service.ts
index 72a8555b..d5923236 100644
--- a/website/src/app/core/services/auth.service.ts
+++ b/website/src/app/core/services/auth.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, inject } from "@angular/core";
+import {inject, Injectable} from "@angular/core";
 import {HttpClient} from "@angular/common/http";
 import {Authentication, AuthenticationResponse, Register, RegisterResponse} from "../models/authentication.model";
 import {environment} from "../../../environments/environment";
diff --git a/website/src/app/core/services/chess.service.ts b/website/src/app/core/services/chess.service.ts
index 1fba2681..3e80ed74 100644
--- a/website/src/app/core/services/chess.service.ts
+++ b/website/src/app/core/services/chess.service.ts
@@ -1,14 +1,17 @@
-import { Injectable, inject } from "@angular/core";
+import {inject, Injectable} from "@angular/core";
 import {HttpClient} from "@angular/common/http";
 import {
   Account,
   ChessEvent,
-  ChessEventCategory, ChessEventCategoryWithEvents,
+  ChessEventCategory,
+  ChessEventCategoryWithEvents,
   ChessGame,
   Person,
   SearchChessEvent,
   SearchPerson,
-  WriteChessEvent, WriteChessEventCategory, WritePerson
+  WriteChessEvent,
+  WriteChessEventCategory,
+  WritePerson
 } from "../models/chess/chess.models";
 import {catchError, Observable} from "rxjs";
 import {environment} from "../../../environments/environment";
diff --git a/website/src/app/core/services/fitness.service.ts b/website/src/app/core/services/fitness.service.ts
index b171c79d..c44b4e4f 100644
--- a/website/src/app/core/services/fitness.service.ts
+++ b/website/src/app/core/services/fitness.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, inject } from "@angular/core";
+import {inject, Injectable} from "@angular/core";
 import {HttpClient} from "@angular/common/http";
 import {catchError, Observable} from "rxjs";
 import {environment} from "../../../environments/environment";
diff --git a/website/src/app/core/services/music.service.ts b/website/src/app/core/services/music.service.ts
index c979b6b3..2e16b46f 100644
--- a/website/src/app/core/services/music.service.ts
+++ b/website/src/app/core/services/music.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, inject } from "@angular/core";
+import {inject, Injectable} from "@angular/core";
 import {HttpClient} from "@angular/common/http";
 import {HttpErrorHandler} from "../config/http-error-handler.service";
 import {UserInfoService} from "./user-info.service";
diff --git a/website/src/app/core/services/permission.service.ts b/website/src/app/core/services/permission.service.ts
index 048c2921..dd76ff88 100644
--- a/website/src/app/core/services/permission.service.ts
+++ b/website/src/app/core/services/permission.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, inject } from "@angular/core";
+import {inject, Injectable} from "@angular/core";
 import {AuthService} from "./auth.service";
 import {jwtDecode} from "jwt-decode";
 import {JwtPayload} from "../models/jwtPayload.model";
diff --git a/website/src/app/core/services/router-navigation.service.ts b/website/src/app/core/services/router-navigation.service.ts
index 813eaf71..aaa24865 100644
--- a/website/src/app/core/services/router-navigation.service.ts
+++ b/website/src/app/core/services/router-navigation.service.ts
@@ -1,5 +1,5 @@
 import {Router} from '@angular/router';
-import { Injectable, inject } from '@angular/core';
+import {inject, Injectable} from '@angular/core';
 
 @Injectable({
   providedIn: 'root'
diff --git a/website/src/app/fitness-settings/fitness-login/fitness-login.component.ts b/website/src/app/fitness-settings/fitness-login/fitness-login.component.ts
index e53583d8..cae2b14c 100644
--- a/website/src/app/fitness-settings/fitness-login/fitness-login.component.ts
+++ b/website/src/app/fitness-settings/fitness-login/fitness-login.component.ts
@@ -1,4 +1,4 @@
-import { Component, inject } from '@angular/core';
+import {Component, inject} from '@angular/core';
 import {Button} from "primeng/button";
 import {FitnessService} from "../../core/services/fitness.service";
 import {RouterNavigationService} from "../../core/services/router-navigation.service";
diff --git a/website/src/app/fitness-settings/fitness-settings.component.ts b/website/src/app/fitness-settings/fitness-settings.component.ts
index e369d4e3..393351bb 100644
--- a/website/src/app/fitness-settings/fitness-settings.component.ts
+++ b/website/src/app/fitness-settings/fitness-settings.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, inject } from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {HeaderService} from "../core/services/header.service";
 import {Sides} from "../core/config/sides";
 import {FitnessLoginComponent} from "./fitness-login/fitness-login.component";
diff --git a/website/src/app/fitness/fitness-profile/fitness-profile.component.ts b/website/src/app/fitness/fitness-profile/fitness-profile.component.ts
index 6796d09e..d419d76f 100644
--- a/website/src/app/fitness/fitness-profile/fitness-profile.component.ts
+++ b/website/src/app/fitness/fitness-profile/fitness-profile.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, inject } from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {FitnessService} from "../../core/services/fitness.service";
 import {Profile} from "../../core/models/fitness/profile.model";
 import {NgIf} from "@angular/common";
diff --git a/website/src/app/fitness/fitness-sleep/fitness-sleep.component.ts b/website/src/app/fitness/fitness-sleep/fitness-sleep.component.ts
index ee5613be..c22c0eb5 100644
--- a/website/src/app/fitness/fitness-sleep/fitness-sleep.component.ts
+++ b/website/src/app/fitness/fitness-sleep/fitness-sleep.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, inject } from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {FitnessService} from "../../core/services/fitness.service";
 import {Sleep} from "../../core/models/fitness/sleep.model";
 import {SleepStagesChartComponent} from "./sleep-stages-chart/sleep-stages-chart.component";
diff --git a/website/src/app/fitness/fitness-sleep/sleep-stages-chart/sleep-stages-chart.component.ts b/website/src/app/fitness/fitness-sleep/sleep-stages-chart/sleep-stages-chart.component.ts
index e9add4cd..4678944a 100644
--- a/website/src/app/fitness/fitness-sleep/sleep-stages-chart/sleep-stages-chart.component.ts
+++ b/website/src/app/fitness/fitness-sleep/sleep-stages-chart/sleep-stages-chart.component.ts
@@ -1,4 +1,4 @@
-import { Component, ElementRef, OnChanges, SimpleChanges, input, viewChild, inject } from '@angular/core';
+import {Component, ElementRef, inject, input, OnChanges, SimpleChanges, viewChild} from '@angular/core';
 import {SleepStage} from "../../../core/models/fitness/sleep.model";
 import * as d3 from "d3";
 
diff --git a/website/src/app/fitness/fitness-weight/fitness-weight.component.ts b/website/src/app/fitness/fitness-weight/fitness-weight.component.ts
index a4b55334..5f280ce7 100644
--- a/website/src/app/fitness/fitness-weight/fitness-weight.component.ts
+++ b/website/src/app/fitness/fitness-weight/fitness-weight.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, inject } from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {Weight} from "../../core/models/fitness/weight.model";
 import {FitnessService} from "../../core/services/fitness.service";
 import {ChartModule} from "primeng/chart";
diff --git a/website/src/app/fitness/fitness.component.ts b/website/src/app/fitness/fitness.component.ts
index 6e9745c0..5dc8649d 100644
--- a/website/src/app/fitness/fitness.component.ts
+++ b/website/src/app/fitness/fitness.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, inject } from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {HeaderService} from "../core/services/header.service";
 import {Sides} from "../core/config/sides";
 import {FitnessWeightComponent} from "./fitness-weight/fitness-weight.component";
diff --git a/website/src/app/header/header.component.ts b/website/src/app/header/header.component.ts
index 580605bc..7a40c39d 100644
--- a/website/src/app/header/header.component.ts
+++ b/website/src/app/header/header.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, inject, OnDestroy, signal} from '@angular/core';
+import {Component, inject, OnDestroy, signal} from '@angular/core';
 import {NavigationComponent} from "./navigation/navigation.component";
 import {TranslateModule, TranslateService} from "@ngx-translate/core";
 import {DropdownModule} from "primeng/dropdown";
diff --git a/website/src/app/header/navigation/navigation.component.ts b/website/src/app/header/navigation/navigation.component.ts
index b587180e..108d8537 100644
--- a/website/src/app/header/navigation/navigation.component.ts
+++ b/website/src/app/header/navigation/navigation.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, inject, signal, computed, OnDestroy} from '@angular/core';
+import {Component, inject, OnDestroy, OnInit, signal} from '@angular/core';
 import {MenubarModule} from "primeng/menubar";
 import {MenuItem} from "primeng/api";
 import {TranslateModule} from "@ngx-translate/core";
diff --git a/website/src/app/home/home-card/home-card.component.spec.ts b/website/src/app/home/home-card/home-card.component.spec.ts
index 33c01f41..b2ede2a6 100644
--- a/website/src/app/home/home-card/home-card.component.spec.ts
+++ b/website/src/app/home/home-card/home-card.component.spec.ts
@@ -1,6 +1,6 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {ComponentFixture, TestBed} from '@angular/core/testing';
 
-import { HomeCardComponent } from './home-card.component';
+import {HomeCardComponent} from './home-card.component';
 
 describe('HomeCardComponent', () => {
   let component: HomeCardComponent;
diff --git a/website/src/app/language-select/language-select.component.ts b/website/src/app/language-select/language-select.component.ts
index c656e69f..517027de 100644
--- a/website/src/app/language-select/language-select.component.ts
+++ b/website/src/app/language-select/language-select.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, inject, signal} from '@angular/core';
+import {Component, inject, OnInit, signal} from '@angular/core';
 import {LanguageConfig} from "../core/config/language.config";
 import {TranslateModule} from "@ngx-translate/core";
 import {DropdownModule} from "primeng/dropdown";
diff --git a/website/src/app/login/login.component.ts b/website/src/app/login/login.component.ts
index 74103879..fb4684ef 100644
--- a/website/src/app/login/login.component.ts
+++ b/website/src/app/login/login.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, inject, signal} from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators} from "@angular/forms";
 import {Button} from "primeng/button";
 import {InputTextModule} from "primeng/inputtext";
diff --git a/website/src/app/logout/logout.component.ts b/website/src/app/logout/logout.component.ts
index b2b89c3e..4d0b2c7f 100644
--- a/website/src/app/logout/logout.component.ts
+++ b/website/src/app/logout/logout.component.ts
@@ -1,4 +1,4 @@
-import {Component, inject, signal, OnDestroy} from '@angular/core';
+import {Component, inject, OnDestroy, signal} from '@angular/core';
 import {faArrowRightFromBracket} from "@fortawesome/free-solid-svg-icons";
 import {FaIconComponent} from "@fortawesome/angular-fontawesome";
 import {AuthService} from "../core/services/auth.service";
diff --git a/website/src/app/microservice-overview/ms-application/ms-application.component.ts b/website/src/app/microservice-overview/ms-application/ms-application.component.ts
index 5be7baf5..3b66aeaf 100644
--- a/website/src/app/microservice-overview/ms-application/ms-application.component.ts
+++ b/website/src/app/microservice-overview/ms-application/ms-application.component.ts
@@ -1,10 +1,9 @@
-import {Component, input, Input} from '@angular/core';
+import {Component, input} from '@angular/core';
 import {Card} from "primeng/card";
-import {JsonPipe, KeyValuePipe, NgForOf} from "@angular/common";
+import {KeyValuePipe, NgForOf} from "@angular/common";
 import {Application} from "../../core/models/admin/admin.model";
 import {MsStatusIconPipe} from "../pipes/ms-status-icon.pipe";
 import {FaIconComponent} from "@fortawesome/angular-fontawesome";
-import {EventIconColorPipe} from "../../core/pipes/event-icon-color.pipe";
 import {MsStatusStylePipe} from "../pipes/ms-status-style.pipe";
 import {Accordion, AccordionContent, AccordionHeader, AccordionPanel} from "primeng/accordion";
 
@@ -15,9 +14,7 @@ import {Accordion, AccordionContent, AccordionHeader, AccordionPanel} from "prim
     NgForOf,
     MsStatusIconPipe,
     FaIconComponent,
-    EventIconColorPipe,
     MsStatusStylePipe,
-    JsonPipe,
     KeyValuePipe,
     AccordionPanel,
     AccordionHeader,
diff --git a/website/src/app/microservice-overview/ms-applications/ms-applications.component.ts b/website/src/app/microservice-overview/ms-applications/ms-applications.component.ts
index 724e96c4..fb9e3139 100644
--- a/website/src/app/microservice-overview/ms-applications/ms-applications.component.ts
+++ b/website/src/app/microservice-overview/ms-applications/ms-applications.component.ts
@@ -1,5 +1,4 @@
 import {Component, inject} from '@angular/core';
-import {Card} from "primeng/card";
 import {NgForOf, NgIf} from "@angular/common";
 import {AdminService} from "../../core/services/admin.service";
 import {rxResource} from "@angular/core/rxjs-interop";
@@ -8,7 +7,6 @@ import {MsApplicationComponent} from "../ms-application/ms-application.component
 @Component({
   selector: 'app-ms-applications',
   imports: [
-    Card,
     NgForOf,
     NgIf,
     MsApplicationComponent
diff --git a/website/src/app/microservice-overview/pipes/ms-status-icon.pipe.ts b/website/src/app/microservice-overview/pipes/ms-status-icon.pipe.ts
index 6901d561..27828bc4 100644
--- a/website/src/app/microservice-overview/pipes/ms-status-icon.pipe.ts
+++ b/website/src/app/microservice-overview/pipes/ms-status-icon.pipe.ts
@@ -1,4 +1,4 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {Pipe, PipeTransform} from '@angular/core';
 import {IconDefinition} from "@fortawesome/angular-fontawesome";
 import {faCircleCheck, faCircleExclamation, faCircleQuestion, faCircleXmark} from "@fortawesome/free-solid-svg-icons";
 import {Status} from "../../core/models/admin/admin.model";
diff --git a/website/src/app/microservice-overview/pipes/ms-status-style.pipe.ts b/website/src/app/microservice-overview/pipes/ms-status-style.pipe.ts
index 7472905c..1d2ca443 100644
--- a/website/src/app/microservice-overview/pipes/ms-status-style.pipe.ts
+++ b/website/src/app/microservice-overview/pipes/ms-status-style.pipe.ts
@@ -1,6 +1,5 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {Pipe, PipeTransform} from '@angular/core';
 import {Status} from "../../core/models/admin/admin.model";
-import {faCircleCheck, faCircleExclamation, faCircleQuestion, faCircleXmark} from "@fortawesome/free-solid-svg-icons";
 
 @Pipe({
   name: 'msStatusStyle'
diff --git a/website/src/app/music-settings/music-login/music-login.component.ts b/website/src/app/music-settings/music-login/music-login.component.ts
index dade2747..23332ddb 100644
--- a/website/src/app/music-settings/music-login/music-login.component.ts
+++ b/website/src/app/music-settings/music-login/music-login.component.ts
@@ -1,4 +1,4 @@
-import { Component, inject } from '@angular/core';
+import {Component, inject} from '@angular/core';
 import {Button} from "primeng/button";
 import {RouterNavigationService} from "../../core/services/router-navigation.service";
 import {MusicService} from "../../core/services/music.service";
diff --git a/website/src/app/music-settings/music-settings.component.ts b/website/src/app/music-settings/music-settings.component.ts
index 30822e27..13cbe8e1 100644
--- a/website/src/app/music-settings/music-settings.component.ts
+++ b/website/src/app/music-settings/music-settings.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, inject } from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {HeaderService} from "../core/services/header.service";
 import {Sides} from "../core/config/sides";
 import {MusicLoginComponent} from "./music-login/music-login.component";
diff --git a/website/src/app/music/music.component.ts b/website/src/app/music/music.component.ts
index 525c8d45..e8d067f3 100644
--- a/website/src/app/music/music.component.ts
+++ b/website/src/app/music/music.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, inject } from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {HeaderService} from "../core/services/header.service";
 import {Sides} from '../core/config/sides';
 
diff --git a/website/src/app/mytheme.ts b/website/src/app/mytheme.ts
index e8c5e52d..11d9d107 100644
--- a/website/src/app/mytheme.ts
+++ b/website/src/app/mytheme.ts
@@ -1,5 +1,5 @@
 import Lara from "@primeng/themes/lara";
-import { definePreset } from "@primeng/themes";
+import {definePreset} from "@primeng/themes";
 
 export const MyPreset = definePreset(Lara, {
   semantic: {
diff --git a/website/src/app/register/register.component.ts b/website/src/app/register/register.component.ts
index 2403db51..52365767 100644
--- a/website/src/app/register/register.component.ts
+++ b/website/src/app/register/register.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, inject} from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {Button} from "primeng/button";
 import {CardModule} from "primeng/card";
 import {FloatLabelModule} from "primeng/floatlabel";
diff --git a/website/src/app/shared/defer-placeholder/defer-placeholder.component.spec.ts b/website/src/app/shared/defer-placeholder/defer-placeholder.component.spec.ts
index e2c121a0..4311ea38 100644
--- a/website/src/app/shared/defer-placeholder/defer-placeholder.component.spec.ts
+++ b/website/src/app/shared/defer-placeholder/defer-placeholder.component.spec.ts
@@ -1,6 +1,6 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {ComponentFixture, TestBed} from '@angular/core/testing';
 
-import { DeferPlaceholderComponent } from './defer-placeholder.component';
+import {DeferPlaceholderComponent} from './defer-placeholder.component';
 
 describe('DeferPlaceholderComponent', () => {
   let component: DeferPlaceholderComponent;

From fabfb740a27cd4fed7633928c7acc9c6e4b1524d Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Thu, 2 Jan 2025 17:21:37 +0100
Subject: [PATCH 21/27] Add Testcontainers documentation and update SonarQube
 workflow

Added a new topic on using Testcontainers in integration tests to address limitations with h2 and better replicate production environments. Updated SonarQube workflow with a note on potential Testcontainers Cloud usage, though no explicit changes to the workflow yet.
---
 .github/workflows/sonarqube.yml                     | 1 +
 docs/Writerside/s.tree                              | 1 +
 docs/Writerside/topics/2024-12-30-testcontainers.md | 8 ++++++++
 3 files changed, 10 insertions(+)
 create mode 100644 docs/Writerside/topics/2024-12-30-testcontainers.md

diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
index ba7f51cd..d68b33a4 100644
--- a/.github/workflows/sonarqube.yml
+++ b/.github/workflows/sonarqube.yml
@@ -20,6 +20,7 @@ jobs:
           distribution: 'zulu'
           java-version: '21'
           cache: 'maven'
+      # TODO maybe step to use Testcontainers Cloud but github actions env has docker already therefore no explicit docker installation is needed
       - name: Build and analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
diff --git a/docs/Writerside/s.tree b/docs/Writerside/s.tree
index 57c231d4..74737bb3 100644
--- a/docs/Writerside/s.tree
+++ b/docs/Writerside/s.tree
@@ -41,6 +41,7 @@
     </toc-element>
     <toc-element topic="Maven.md"/>
     <toc-element topic="Decisions.md">
+        <toc-element topic="2024-12-30-testcontainers.md"/>
         <toc-element topic="2024-12-24_Documentation.md"/>
     </toc-element>
 </instance-profile>
\ No newline at end of file
diff --git a/docs/Writerside/topics/2024-12-30-testcontainers.md b/docs/Writerside/topics/2024-12-30-testcontainers.md
new file mode 100644
index 00000000..09b368bd
--- /dev/null
+++ b/docs/Writerside/topics/2024-12-30-testcontainers.md
@@ -0,0 +1,8 @@
+# 2024-12-30 Testcontainers
+
+Testing with h2 gives many problems like naming tables because of reserved keywords and flyways schema.
+It also doesn't really represent the prod environment with mariadb. Therefore, the decision is made to use testcontainers.
+This really hurts the performance of integration tests. The best solution I found is  to spin up a container for a testclass (default)
+and before every test do a `flyway.clean()` & `flyway.migrate()` with a junit extensions. This ensures the database is in perfect condition for the test.
+The disadvantage is that a test takes about 1 Second which is waaaayy to much even for an integration test. But I think this issue is for future me :)
+Maybe the solution is to write less integration tests xD
\ No newline at end of file

From fab357c232e69260c7365f463b95c0f88b37ca71 Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Thu, 2 Jan 2025 17:22:24 +0100
Subject: [PATCH 22/27] Refactor participant handling to use rxResource

Replaced manual participant management logic with reactive `rxResource` for better efficiency and maintainability. Simplified participant data flow in multiple components and updated binding in HTML templates. Removed redundant `participants` property from backend DTOs.
---
 .../chess_service/app/event/EventConverter.kt |  2 -
 .../chess_service/app/event/EventDto.kt       |  1 -
 .../chess-update-event.component.html         |  4 +-
 .../chess-update-event.component.ts           | 45 +++++++++----------
 .../chess-update-game.component.html          |  4 +-
 .../chess-update-game.component.ts            | 11 ++++-
 .../chess-event-games.component.ts            |  8 ++--
 .../chess-event-participants.component.html   |  4 +-
 .../chess-event-participants.component.ts     | 16 ++++++-
 .../chess-event/chess-event.component.ts      |  5 ++-
 .../src/app/core/models/chess/chess.models.ts |  1 -
 11 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt
index 5278b6dc..2462ae35 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt
@@ -10,7 +10,6 @@ import org.springframework.stereotype.Component
 
 @Component
 class EventConverter(
-    private val personConverter: PersonConverter,
     private val eventCategoryConverter: EventCategoryConverter
 ) {
 
@@ -25,7 +24,6 @@ class EventConverter(
             dateTo = event.dateTo.toString(),
             internalComment = getInternalComment(event.internalComment),
             categories = event.categories.map { eventCategoryConverter.toDto(it) },
-            participants = event.participants.map { personConverter.convert(it) }
         )
     }
 
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventDto.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventDto.kt
index 0d2226e3..de21783d 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventDto.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventDto.kt
@@ -14,5 +14,4 @@ data class EventDto(
     val dateTo: String? = null,
     val internalComment: String = "",
     val categories: List<EventCategoryDto> = mutableListOf(),
-    val participants: List<PersonDto> = mutableListOf(),
 )
\ No newline at end of file
diff --git a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html
index 8ee1139c..14d3435c 100644
--- a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html
+++ b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html
@@ -58,8 +58,8 @@
 
       <p-fieldset legend="Event Players" styleClass="h-full">
         <p-pickList
-          [source]="personsToSelect"
-          [target]="participants"
+          [source]="personsToSelectS()"
+          [target]="participantsS()"
           [dragdrop]="true"
           [responsive]="true"
           filterBy="firstname,lastname,fideId"
diff --git a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts
index bfde2598..c13377cb 100644
--- a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts
+++ b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts
@@ -1,4 +1,4 @@
-import {Component, inject, OnInit, signal} from '@angular/core';
+import {Component, computed, inject, OnInit, signal} from '@angular/core';
 import {ChessService} from "../../core/services/chess.service";
 import {FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators} from "@angular/forms";
 import {
@@ -22,6 +22,7 @@ import {LazyLoad} from "../../core/models/lazy-load.model";
 import {rxResource} from "@angular/core/rxjs-interop";
 import {EventIconPipe} from "../../core/pipes/gender-icon.pipe";
 import {Textarea} from "primeng/textarea";
+import {of} from "rxjs";
 
 @Component({
   selector: 'app-chess-update-event',
@@ -50,14 +51,28 @@ export class ChessUpdateEventComponent implements OnInit{
 
   events = signal<ChessEvent[]>([])
   selectedEvent = signal<ChessEvent | undefined>(undefined)
+  selectedParticipants = rxResource({
+    request: () => ({eventId: this.selectedEvent()?.id}),
+    loader: (params) => {
+      const eventId = params.request.eventId
+      if (eventId == undefined)
+        return of([])
+      return this.chessService.eventParticipants(eventId)
+    }
+  })
 
   categories = rxResource({
     loader: () => this.chessService.eventCategories(),
   })
 
-  allPersons: Person[] = [];
-  personsToSelect: Person[] = [];
-  participants: Person[] = [];
+  allPersonsS = signal<Person[]>([])
+  participantsS = computed(() => {
+    return this.selectedParticipants.value() ?? []
+  })
+  personsToSelectS = computed(() => {
+    const eventParticipants = this.selectedParticipants.value() ?? [];
+    return this.allPersonsS().filter(person => !eventParticipants?.some(participant => participant.id == person.id))
+  })
 
   formGroup: FormGroup = new FormGroup({
     id: new FormControl<string | null>({
@@ -102,31 +117,15 @@ export class ChessUpdateEventComponent implements OnInit{
 
   ngOnInit(): void {
     this.chessService.persons().subscribe(persons => {
-      this.allPersons = [...persons];
-      this.resetParticipantsSelect()
+      this.allPersonsS.set(persons)
     })
   }
 
   onEventSelect(event: ChessEvent | undefined){
     this.selectedEvent.set(event);
-    this.resetParticipantsSelect()
     this.patchForm()
   }
 
-  private resetParticipantsSelect(){
-    this.personsToSelect = [...[]]
-    this.participants = [...[]]
-    let selectedEvent = this.selectedEvent();
-    if(selectedEvent){
-      const eventParticipants = selectedEvent.participants as Person[];
-      this.participants = [...eventParticipants];
-      const notParticipating = this.allPersons.filter(person => !eventParticipants?.some(participant => participant.id == person.id))
-      this.personsToSelect = [...notParticipating]
-    } else {
-      this.personsToSelect = [...this.allPersons]
-      this.participants = [...[]]
-    }
-  }
 
   patchForm(){
     const selectedEvent = this.selectedEvent();
@@ -156,7 +155,6 @@ export class ChessUpdateEventComponent implements OnInit{
       embedUrl: selectedEvent.embedUrl ?? '',
       categories: selectedEvent.categories ?? [],
     });
-    this.resetParticipantsSelect()
   }
 
   save() {
@@ -176,7 +174,7 @@ export class ChessUpdateEventComponent implements OnInit{
       embedUrl: this.formGroup.controls['embedUrl'].value,
       internalComment: this.formGroup.controls['internalComment'].value,
       categoryIds: (this.formGroup.controls['categories'].value as ChessEventCategory[]).map(value => value.id),
-      participantsIds: this.participants.map(value => value.id)
+      participantsIds: this.participantsS().map(value => value.id)
     };
 
     const id = this.formGroup.controls['id'].value ?? ""
@@ -205,7 +203,6 @@ export class ChessUpdateEventComponent implements OnInit{
   clear() {
     this.formGroup.reset();
     this.selectedEvent.set(undefined);
-    this.resetParticipantsSelect();
   }
 
   confirmDelete() {
diff --git a/website/src/app/chess-settings/chess-update-game/chess-update-game.component.html b/website/src/app/chess-settings/chess-update-game/chess-update-game.component.html
index 3255e712..37638669 100644
--- a/website/src/app/chess-settings/chess-update-game/chess-update-game.component.html
+++ b/website/src/app/chess-settings/chess-update-game/chess-update-game.component.html
@@ -5,8 +5,8 @@
       <app-select-chess-event [events]="events.value() ?? []" (selectedEventEmitter)="onEventSelect($event)"></app-select-chess-event>
     </p-fieldset>
 
-    <p-fieldset legend="Select Persons" [toggleable]="true" *ngIf="persons().length !== 0">
-      <app-select-chess-person [persons]="persons()" (selectedPersonsEmitter)="onPersonsSelect($event)"></app-select-chess-person>
+    <p-fieldset legend="Select Persons" [toggleable]="true" *ngIf="persons.value()?.length !== 0 && persons.value() as _persons">
+      <app-select-chess-person [persons]="_persons" (selectedPersonsEmitter)="onPersonsSelect($event)"></app-select-chess-person>
     </p-fieldset>
 
     <p-fieldset [toggleable]="true" *ngIf="selectedPersons().length == 2">
diff --git a/website/src/app/chess-settings/chess-update-game/chess-update-game.component.ts b/website/src/app/chess-settings/chess-update-game/chess-update-game.component.ts
index bb907579..b52da118 100644
--- a/website/src/app/chess-settings/chess-update-game/chess-update-game.component.ts
+++ b/website/src/app/chess-settings/chess-update-game/chess-update-game.component.ts
@@ -14,6 +14,7 @@ import {CardModule} from "primeng/card";
 import {SelectChessEventComponent} from "../select-chess-event/select-chess-event.component";
 import {SelectChessPersonComponent} from "../select-chess-person/select-chess-person.component";
 import {rxResource} from "@angular/core/rxjs-interop";
+import {of} from "rxjs";
 
 @Component({
   selector: 'app-chess-update-game',
@@ -42,7 +43,15 @@ export class ChessUpdateGameComponent {
   })
   selectedEvent = signal<ChessEvent | undefined>(undefined)
 
-  persons = computed(() => this.selectedEvent()?.participants ?? [])
+  persons = rxResource({
+    request: () => ({eventId: this.selectedEvent()?.id}),
+    loader: (params) => {
+      const eventId = params.request.eventId
+      if(eventId == undefined)
+        return of([])
+      return this.chessService.eventParticipants(eventId)
+    }
+  })
   selectedPersons = signal<Person[]>([]);
 
   accounts = computed(() => this.selectedPersons().flatMap(value => value.accounts))
diff --git a/website/src/app/chess/chess-event/chess-event-games/chess-event-games.component.ts b/website/src/app/chess/chess-event/chess-event-games/chess-event-games.component.ts
index b82c7f98..923487c6 100644
--- a/website/src/app/chess/chess-event/chess-event-games/chess-event-games.component.ts
+++ b/website/src/app/chess/chess-event/chess-event-games/chess-event-games.component.ts
@@ -15,12 +15,12 @@ export class ChessEventGamesComponent {
 
   readonly event = input<ChessEvent>();
   games = rxResource({
-    request: () => ({event: this.event()}),
+    request: () => ({eventId: this.event()?.id}),
     loader: (params) => {
-      let event = this.event();
-      if(event == undefined || event.id == undefined)
+      let eventId = params.request.eventId;
+      if(eventId == undefined)
         return of([])
-      return this.chessService.eventGames(event.id)
+      return this.chessService.eventGames(eventId)
     }
   })
   computedHaveContent = computed(() => {
diff --git a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html
index cb607f51..b098ee27 100644
--- a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html
+++ b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html
@@ -1,8 +1,8 @@
-<p-card *ngIf="participants().length != 0">
+<p-card *ngIf="participants.value()?.length !== 0 && participants.value() as _participants">
   <ng-template #header></ng-template>
   <ng-template #title>{{'chess.event.participants' | translate}}</ng-template>
 
-  <p-table stripedRows *ngIf="participants().length != 0" [value]="participants()">
+  <p-table stripedRows [value]="_participants">
     <ng-template #header>
       <tr>
         <th>{{'chess.event.participant.firstname' | translate}}</th>
diff --git a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts
index 00e2fe0e..17a91d97 100644
--- a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts
+++ b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts
@@ -6,6 +6,9 @@ import {TableModule} from "primeng/table";
 import {RouterNavigationService} from "../../../core/services/router-navigation.service";
 import {TranslateModule} from "@ngx-translate/core";
 import {ChessEvent} from "../../../core/models/chess/chess.models";
+import {rxResource} from "@angular/core/rxjs-interop";
+import {of} from "rxjs";
+import {ChessService} from "../../../core/services/chess.service";
 
 @Component({
   selector: 'app-chess-event-participants',
@@ -23,7 +26,18 @@ export class ChessEventParticipantsComponent {
   private readonly navigationService = inject(RouterNavigationService);
 
   readonly event = input<ChessEvent>();
-  protected readonly participants = computed(() => this.event()?.participants ?? [])
+  protected readonly participants = rxResource({
+    request: () => ({eventId: this.event()?.id}),
+    loader: (params) => {
+      let eventId = params.request.eventId;
+      if(eventId == undefined)
+        return of([])
+      return this.chessService.eventParticipants(eventId)
+    }
+  })
+
+  constructor(private readonly chessService: ChessService) {
+  }
 
   openFide(fideId: string) {
     this.navigationService.open("https://ratings.fide.com/profile/" + fideId)
diff --git a/website/src/app/chess/chess-event/chess-event.component.ts b/website/src/app/chess/chess-event/chess-event.component.ts
index 77da528a..31e6d939 100644
--- a/website/src/app/chess/chess-event/chess-event.component.ts
+++ b/website/src/app/chess/chess-event/chess-event.component.ts
@@ -48,9 +48,10 @@ export class ChessEventComponent implements OnDestroy {
   event = rxResource({
     request: () => ({id: this.eventId()}),
     loader: (param) => {
-      if(param.request.id == undefined)
+      let id = param.request.id;
+      if(id == undefined)
         return EMPTY
-      return this.chessService.event(param.request.id)
+      return this.chessService.event(id)
     }
   })
   embedUrl: Signal<SafeResourceUrl | undefined> = computed(() => {
diff --git a/website/src/app/core/models/chess/chess.models.ts b/website/src/app/core/models/chess/chess.models.ts
index 98fae7fc..eb76b2e6 100644
--- a/website/src/app/core/models/chess/chess.models.ts
+++ b/website/src/app/core/models/chess/chess.models.ts
@@ -60,7 +60,6 @@ export interface ChessEvent {
   dateTo: string | undefined;
   internalComment: string;
   categories: ChessEventCategory[];
-  participants: Person[];
 }
 
 export interface WriteChessEvent {

From 37d559f738995ab76295fa90bc6441046b950f2b Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Thu, 2 Jan 2025 18:55:26 +0100
Subject: [PATCH 23/27] Add ChessPlatform support to events and update account
 links

This commit integrates the ChessPlatform attribute into events, ensuring it is persisted, validated, and exposed across both the backend and frontend layers. It also replaces FIDE-specific links with dynamic account URLs based on the platform (e.g., Chess.com, Lichess). These changes enhance platform-specific functionality and improve user experience.
---
 .../chess_service/app/account/AccountConverter.kt   | 11 ++++++++++-
 .../chess_service/app/event/EventConverter.kt       |  1 +
 .../michibaum/chess_service/app/event/EventDto.kt   |  2 ++
 .../chess_service/app/event/EventService.kt         |  2 ++
 .../chess_service/app/event/WriteEventDto.kt        |  5 +++++
 .../com/michibaum/chess_service/domain/Event.kt     |  4 ++++
 .../chess-update-event.component.html               |  2 ++
 .../chess-event-participants.component.html         |  4 ++--
 .../chess-event-participants.component.ts           | 13 ++++++++++---
 .../chess/chess-event/chess-event.component.html    | 10 +++++-----
 website/src/app/core/models/chess/chess.models.ts   |  1 +
 website/src/assets/i18n/de.json                     |  4 ++--
 website/src/assets/i18n/en.json                     |  4 ++--
 13 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/account/AccountConverter.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/account/AccountConverter.kt
index afd171f0..e2819899 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/account/AccountConverter.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/account/AccountConverter.kt
@@ -1,6 +1,7 @@
 package com.michibaum.chess_service.app.account
 
 import com.michibaum.chess_service.domain.Account
+import com.michibaum.chess_service.domain.ChessPlatform
 import org.springframework.stereotype.Component
 
 @Component
@@ -11,8 +12,16 @@ class AccountConverter {
             id = account.idOrThrow(),
             username = account.username,
             platform = account.platform,
-            url = "", // TODO create url
+            url = url(account),
         )
     }
+    fun url(account: Account): String {
+        return when (account.platform) {
+            ChessPlatform.CHESSCOM -> "https://www.chess.com/member/${account.username}"
+            ChessPlatform.LICHESS -> "https://lichess.org/@/${account.platformId}"
+            ChessPlatform.FIDE -> "https://ratings.fide.com/profile/${account.platformId}"
+            ChessPlatform.FREESTYLE -> "https://www.freestyle-chess-players-club.com/"
+        }
+    }
 
 }
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt
index 2462ae35..35b35b6a 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventConverter.kt
@@ -23,6 +23,7 @@ class EventConverter(
             dateFrom = event.dateFrom.toString(),
             dateTo = event.dateTo.toString(),
             internalComment = getInternalComment(event.internalComment),
+            platform = event.platform,
             categories = event.categories.map { eventCategoryConverter.toDto(it) },
         )
     }
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventDto.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventDto.kt
index de21783d..0b13ed87 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventDto.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventDto.kt
@@ -2,6 +2,7 @@ package com.michibaum.chess_service.app.event
 
 import com.michibaum.chess_service.app.eventcategory.EventCategoryDto
 import com.michibaum.chess_service.app.person.PersonDto
+import com.michibaum.chess_service.domain.ChessPlatform
 import java.util.*
 
 data class EventDto(
@@ -13,5 +14,6 @@ data class EventDto(
     val dateFrom: String? = null,
     val dateTo: String? = null,
     val internalComment: String = "",
+    val platform: ChessPlatform,
     val categories: List<EventCategoryDto> = mutableListOf(),
 )
\ No newline at end of file
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventService.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventService.kt
index 4e6635b8..f0b4b64f 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventService.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/EventService.kt
@@ -50,6 +50,7 @@ class EventService(
             dateFrom = LocalDate.parse(dto.dateFrom),
             dateTo = LocalDate.parse(dto.dateTo),
             internalComment = internalComment,
+            platform = dto.platform,
             categories = categories,
             participants = participants
         )
@@ -74,6 +75,7 @@ class EventService(
             dateFrom = LocalDate.parse(dto.dateFrom),
             dateTo = LocalDate.parse(dto.dateTo),
             internalComment = internalComment,
+            platform = dto.platform,
             categories = categories,
             participants = participants,
             id = event.id
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/WriteEventDto.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/WriteEventDto.kt
index 5604a3d0..e8c03fd2 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/WriteEventDto.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/event/WriteEventDto.kt
@@ -1,6 +1,8 @@
 package com.michibaum.chess_service.app.event
 
+import com.michibaum.chess_service.domain.ChessPlatform
 import jakarta.validation.constraints.NotEmpty
+import jakarta.validation.constraints.NotNull
 import jakarta.validation.constraints.Pattern
 
 class WriteEventDto(
@@ -23,6 +25,9 @@ class WriteEventDto(
 
     val internalComment: String = "",
 
+    @NotNull
+    val platform: ChessPlatform,
+
     val categoryIds: List<String> = mutableListOf(),
 
     val participantsIds: List<String> = mutableListOf()
diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/Event.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/Event.kt
index df8670b1..4d680295 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/Event.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/domain/Event.kt
@@ -30,6 +30,10 @@ class Event(
     @Column(nullable = false, columnDefinition = "TEXT")
     val internalComment: String,
 
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    val platform: ChessPlatform,
+
     @ManyToMany(fetch = FetchType.LAZY, targetEntity = EventCategory::class)
     @JoinTable(name = "EVENT_CATEGORY_MAPPING", joinColumns = [JoinColumn(name = "event_id")], inverseJoinColumns = [JoinColumn(name = "category_id")])
     val categories: Set<EventCategory> = setOf(),
diff --git a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html
index 14d3435c..cb33bed3 100644
--- a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html
+++ b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html
@@ -48,6 +48,8 @@
             <label for="internalComment">Internal Comment</label>
           </p-floatlabel>
 
+          <!-- TODO platform -->
+
           <p-floatlabel variant="in" class="w-full">
             <p-multiSelect id="category" [options]="categories.value()" optionLabel="title" formControlName="categories" styleClass="w-full"/>
             <label for="category">Categories</label>
diff --git a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html
index b098ee27..e6d8c8ce 100644
--- a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html
+++ b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html
@@ -9,7 +9,7 @@
         <th>{{'chess.event.participant.lastname' | translate}}</th>
         <th>{{'chess.event.federation' | translate}}</th>
         <th>{{'chess.event.birthday' | translate}}</th>
-        <th>{{'chess.event.fide' | translate}}</th>
+        <th>{{'chess.event.account' | translate}}</th>
       </tr>
     </ng-template>
     <ng-template #body let-participant>
@@ -18,7 +18,7 @@
         <td>{{ participant.lastname }}</td>
         <td>{{ participant.federation }}</td>
         <td>{{ participant.birthday }}</td>
-        <td><p-button *ngIf="participant.fideId" label="{{'chess.event.fide-website' | translate}}" (onClick)="openFide(participant.fideId)" /></td>
+        <td><p-button *ngIf="personsPlatformAccount(participant) as account" label="{{'chess.event.open-account' | translate}}" (onClick)="openAccount(account)" /></td>
       </tr>
     </ng-template>
   </p-table>
diff --git a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts
index 17a91d97..27019dbd 100644
--- a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts
+++ b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts
@@ -5,7 +5,7 @@ import {NgIf} from "@angular/common";
 import {TableModule} from "primeng/table";
 import {RouterNavigationService} from "../../../core/services/router-navigation.service";
 import {TranslateModule} from "@ngx-translate/core";
-import {ChessEvent} from "../../../core/models/chess/chess.models";
+import {Account, ChessEvent, ChessPlatform, Person} from "../../../core/models/chess/chess.models";
 import {rxResource} from "@angular/core/rxjs-interop";
 import {of} from "rxjs";
 import {ChessService} from "../../../core/services/chess.service";
@@ -39,8 +39,15 @@ export class ChessEventParticipantsComponent {
   constructor(private readonly chessService: ChessService) {
   }
 
-  openFide(fideId: string) {
-    this.navigationService.open("https://ratings.fide.com/profile/" + fideId)
+  openAccount(account: Account) {
+    this.navigationService.open(account.url)
   }
 
+  personsPlatformAccount(participant: Person) {
+    const eventPlatform = this.event()?.platform
+    if(eventPlatform == undefined)
+      return undefined
+    const accounts = participant.accounts.filter(value => value.platform == eventPlatform)
+    return accounts[0]
+  }
 }
diff --git a/website/src/app/chess/chess-event/chess-event.component.html b/website/src/app/chess/chess-event/chess-event.component.html
index 34f8f7a2..01b2a73d 100644
--- a/website/src/app/chess/chess-event/chess-event.component.html
+++ b/website/src/app/chess/chess-event/chess-event.component.html
@@ -21,11 +21,11 @@
 
           <div class="grid grid-cols-1 4k:grid-cols-4 xlScreen:grid-cols-3 lScreen:grid-cols-3 desktop:grid-cols-3 laptop:grid-cols-1 tablet:grid-cols-1 mobile:grid-cols-1 gap-4">
 
-            <div *ngIf="event.value()" class="4k:col-span-1 xlScreen:col-span-1 lScreen:col-span-1 desktop:col-span-1 laptop:col-span-1 tablet:col-span-1 mobile:col-span-1">
-              <p-card [header]="event.value()?.title" [subheader]="categories()" styleClass="h-full">
-                <p *ngIf="event.value()?.location"><strong>{{'chess.event.location' | translate}}: </strong>{{ event.value()?.location }}</p>
-                <p *ngIf="event.value()?.dateFrom"><strong>{{'chess.event.date-from' | translate}}: </strong>{{ event.value()?.dateFrom }}</p>
-                <p *ngIf="event.value()?.dateTo"><strong>{{'chess.event.date-to' | translate}}: </strong>{{ event.value()?.dateTo }}</p>
+            <div *ngIf="event.value() as _event" class="4k:col-span-1 xlScreen:col-span-1 lScreen:col-span-1 desktop:col-span-1 laptop:col-span-1 tablet:col-span-1 mobile:col-span-1">
+              <p-card [header]="_event.title" [subheader]="categories()" styleClass="h-full">
+                <p *ngIf="_event.location"><strong>{{'chess.event.location' | translate}}: </strong>{{ _event.location }}</p>
+                <p *ngIf="_event.dateFrom"><strong>{{'chess.event.date-from' | translate}}: </strong>{{ _event.dateFrom }}</p>
+                <p *ngIf="_event.dateTo"><strong>{{'chess.event.date-to' | translate}}: </strong>{{ _event.dateTo }}</p>
               </p-card>
             </div>
 
diff --git a/website/src/app/core/models/chess/chess.models.ts b/website/src/app/core/models/chess/chess.models.ts
index eb76b2e6..e09dbec0 100644
--- a/website/src/app/core/models/chess/chess.models.ts
+++ b/website/src/app/core/models/chess/chess.models.ts
@@ -59,6 +59,7 @@ export interface ChessEvent {
   dateFrom: string | undefined;
   dateTo: string | undefined;
   internalComment: string;
+  platform: ChessPlatform;
   categories: ChessEventCategory[];
 }
 
diff --git a/website/src/assets/i18n/de.json b/website/src/assets/i18n/de.json
index cdfb9ecd..1135ae56 100644
--- a/website/src/assets/i18n/de.json
+++ b/website/src/assets/i18n/de.json
@@ -25,16 +25,16 @@
       "size": "Anz."
     },
     "event": {
+      "account": "Account",
       "birthday": "Geburtstag",
       "chess-com": "Chess.com",
       "date-from": "Von",
       "date-to": "Bis",
       "details": "Details",
       "federation": "Verband",
-      "fide": "Fide",
-      "fide-website": "Fide Webseite",
       "games": "Partien",
       "location": "Standort",
+      "open-account": "Account öffnen",
       "open-official-website": "Offizielle Webseite öffnen",
       "participant": {
         "firstname": "Vorname",
diff --git a/website/src/assets/i18n/en.json b/website/src/assets/i18n/en.json
index 297c4688..031f2b84 100644
--- a/website/src/assets/i18n/en.json
+++ b/website/src/assets/i18n/en.json
@@ -25,16 +25,16 @@
       "size": "Size"
     },
     "event": {
+      "account": "account",
       "birthday": "Birthday",
       "chess-com": "Chess.com",
       "date-from": "From",
       "date-to": "Until",
       "details": "Details",
       "federation": "Federation",
-      "fide": "Fide",
-      "fide-website": "Fide Website",
       "games": "Games",
       "location": "Location",
+      "open-account": "Open account",
       "open-official-website": "Open official website",
       "participant": {
         "firstname": "Firstname",

From b176f63e5205ed58b592ed5a45e704084a1250ee Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Fri, 3 Jan 2025 01:28:11 +0100
Subject: [PATCH 24/27] Add platform support to chess events and simplify event
 loading

Introduce a `platform` field to chess events with validation in forms and UI integration. Simplify event management by replacing lazy loading with direct event fetching. Removed unused or redundant code for cleaner implementation.
---
 .../chess-update-event.component.html         |  8 ++-
 .../chess-update-event.component.ts           | 50 +++++++++++--------
 .../select-chess-event.component.html         | 12 +----
 .../select-chess-event.component.ts           | 36 ++-----------
 .../src/app/core/models/chess/chess.models.ts |  1 +
 5 files changed, 42 insertions(+), 65 deletions(-)

diff --git a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html
index cb33bed3..7ce40032 100644
--- a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html
+++ b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html
@@ -2,7 +2,7 @@
   <div class="grid grid-cols-1 gap-4">
 
     <p-fieldset legend="Event Select" [toggleable]="true">
-      <app-select-chess-event [events]="events()" (selectedEventEmitter)="onEventSelect($event)" (lazyLoadEventEmitter)="lazyLoadEvents($event)"></app-select-chess-event>
+      <app-select-chess-event [events]="events()" (selectedEventEmitter)="onEventSelect($event)"></app-select-chess-event>
     </p-fieldset>
 
     <div class="grid grid-cols-1 4k:grid-cols-2 xlScreen:grid-cols-2 lScreen:grid-cols-2 desktop:grid-cols-2 laptop:grid-cols-1 tablet:grid-cols-1 mobile:grid-cols-1 gap-4">
@@ -43,12 +43,16 @@
             <input class="w-full" pInputText id="embedUrl" formControlName="embedUrl" autocomplete="off" />
             <label for="embedUrl">Embed Url</label>
           </p-floatlabel>
+
           <p-floatlabel variant="in" class="mb-2">
             <textarea pTextarea id="internalComment" rows="5" formControlName="internalComment" class="w-full"></textarea>
             <label for="internalComment">Internal Comment</label>
           </p-floatlabel>
 
-          <!-- TODO platform -->
+          <p-floatlabel variant="in" class="mb-2">
+            <p-select id="platform" formControlName="platform" [options]="platforms" styleClass="w-full" variant="filled" />
+            <label for="platform">Platform</label>
+          </p-floatlabel>
 
           <p-floatlabel variant="in" class="w-full">
             <p-multiSelect id="category" [options]="categories.value()" optionLabel="title" formControlName="categories" styleClass="w-full"/>
diff --git a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts
index c13377cb..1120ca8c 100644
--- a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts
+++ b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.ts
@@ -3,9 +3,8 @@ import {ChessService} from "../../core/services/chess.service";
 import {FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators} from "@angular/forms";
 import {
   ChessEvent,
-  ChessEventCategory,
+  ChessEventCategory, ChessPlatform,
   Person,
-  SearchChessEvent,
   WriteChessEvent
 } from "../../core/models/chess/chess.models";
 import {Fieldset} from "primeng/fieldset";
@@ -18,11 +17,11 @@ import {InputText} from "primeng/inputtext";
 import {FaIconComponent} from "@fortawesome/angular-fontawesome";
 import {NgIf} from "@angular/common";
 import {PickList} from "primeng/picklist";
-import {LazyLoad} from "../../core/models/lazy-load.model";
 import {rxResource} from "@angular/core/rxjs-interop";
 import {EventIconPipe} from "../../core/pipes/gender-icon.pipe";
 import {Textarea} from "primeng/textarea";
 import {of} from "rxjs";
+import {Select} from "primeng/select";
 
 @Component({
   selector: 'app-chess-update-event',
@@ -40,7 +39,8 @@ import {of} from "rxjs";
     PickList,
     FormsModule,
     EventIconPipe,
-    Textarea
+    Textarea,
+    Select
   ],
   templateUrl: './chess-update-event.component.html',
   styleUrl: './chess-update-event.component.scss'
@@ -74,6 +74,13 @@ export class ChessUpdateEventComponent implements OnInit{
     return this.allPersonsS().filter(person => !eventParticipants?.some(participant => participant.id == person.id))
   })
 
+  platforms = [
+    ChessPlatform.FIDE,
+    ChessPlatform.CHESSCOM,
+    ChessPlatform.FREESTYLE,
+    ChessPlatform.LICHESS
+  ]
+
   formGroup: FormGroup = new FormGroup({
     id: new FormControl<string | null>({
       value: '',
@@ -106,6 +113,15 @@ export class ChessUpdateEventComponent implements OnInit{
     url: new FormControl<string | null>(null),
     embedUrl: new FormControl<string | null>(null),
     internalComment: new FormControl<string>(''),
+    platform: new FormControl<ChessPlatform | null>(
+      {
+        value: null,
+        disabled: false
+      }, [
+        Validators.required,
+        Validators.nullValidator
+      ]
+    ),
     categories: new FormControl<ChessEventCategory[]>({
       value: [],
       disabled: false
@@ -119,6 +135,13 @@ export class ChessUpdateEventComponent implements OnInit{
     this.chessService.persons().subscribe(persons => {
       this.allPersonsS.set(persons)
     })
+    this.loadEvents()
+  }
+
+  loadEvents() {
+    this.chessService.events().subscribe(events => {
+      this.events.set(events)
+    })
   }
 
   onEventSelect(event: ChessEvent | undefined){
@@ -152,6 +175,7 @@ export class ChessUpdateEventComponent implements OnInit{
       dateTo: dateTo ?? null,
       url: selectedEvent.url ?? '',
       internalComment: selectedEvent.internalComment ?? '',
+      platform: selectedEvent.platform ?? null,
       embedUrl: selectedEvent.embedUrl ?? '',
       categories: selectedEvent.categories ?? [],
     });
@@ -173,6 +197,7 @@ export class ChessUpdateEventComponent implements OnInit{
       url: this.formGroup.controls['url'].value,
       embedUrl: this.formGroup.controls['embedUrl'].value,
       internalComment: this.formGroup.controls['internalComment'].value,
+      platform: this.formGroup.controls['platform'].value,
       categoryIds: (this.formGroup.controls['categories'].value as ChessEventCategory[]).map(value => value.id),
       participantsIds: this.participantsS().map(value => value.id)
     };
@@ -180,13 +205,7 @@ export class ChessUpdateEventComponent implements OnInit{
     const id = this.formGroup.controls['id'].value ?? ""
     this.chessService.saveEvent(id, event).subscribe(newEvent => {
       this.clear()
-      let isNewEvent = !this.events().some(old => old.id === newEvent.id);
-      if (isNewEvent){
-        this.events.update(value => [...value, newEvent])
-      } else {
-        const newEvents = this.events().map(old => old.id === newEvent.id ? newEvent : old);
-        this.events.set(newEvents)
-      }
+      this.loadEvents()
     })
   }
 
@@ -209,13 +228,4 @@ export class ChessUpdateEventComponent implements OnInit{
 
   }
 
-  lazyLoadEvents(lazyLoad: LazyLoad<SearchChessEvent>) {
-    this.chessService.searchEvents(lazyLoad.data).subscribe(newEvents => {
-      const filtered = newEvents.filter(event => this.events().every(oldEvent => oldEvent.id !== event.id))
-      if(filtered.length != 0){
-        this.events.update(value => [...value, ...filtered])
-      }
-    })
-  }
-
 }
diff --git a/website/src/app/chess-settings/select-chess-event/select-chess-event.component.html b/website/src/app/chess-settings/select-chess-event/select-chess-event.component.html
index 3ef2d32b..871f318a 100644
--- a/website/src/app/chess-settings/select-chess-event/select-chess-event.component.html
+++ b/website/src/app/chess-settings/select-chess-event/select-chess-event.component.html
@@ -5,20 +5,14 @@
   selectionMode="single"
   (onRowSelect)="onSelectionChange()"
   (onRowUnselect)="onSelectionChange()"
-  [scrollable]="true"
-  scrollHeight="400px"
-  [rows]="pageSize"
-  [virtualScroll]="true"
-  [virtualScrollItemSize]="virtualPageSize"
-  [lazy]="true"
-  (onLazyLoad)="lazyLoad($event)"
+  [paginator]="true"
+  [rows]="10"
 >
   <ng-template #header>
     <tr>
       <th>Title</th>
       <th>Category</th>
       <th>Location</th>
-      <th>Nr. of Participants</th>
       <th>From</th>
       <th>To</th>
       <th>Url</th>
@@ -58,7 +52,6 @@
       </th>
       <th></th>
       <th></th>
-      <th></th>
       <th>
         <p-columnFilter
           type="boolean"
@@ -87,7 +80,6 @@
         </ng-container>
       </td>
       <td>{{ event.location }}</td>
-      <td>{{ event.participants.length }}</td>
       <td>{{ event.dateFrom }}</td>
       <td>{{ event.dateTo }}</td>
       <td><fa-icon [icon]="getIcon(event.url)" [style]="getColor(event.url)"></fa-icon></td>
diff --git a/website/src/app/chess-settings/select-chess-event/select-chess-event.component.ts b/website/src/app/chess-settings/select-chess-event/select-chess-event.component.ts
index 1b82e3ab..68dab158 100644
--- a/website/src/app/chess-settings/select-chess-event/select-chess-event.component.ts
+++ b/website/src/app/chess-settings/select-chess-event/select-chess-event.component.ts
@@ -1,14 +1,13 @@
 import {Component, inject, input, OnInit, output, signal} from '@angular/core';
-import {TableLazyLoadEvent, TableModule} from "primeng/table";
-import {ChessEvent, ChessEventCategory, SearchChessEvent} from "../../core/models/chess/chess.models";
+import {TableModule} from "primeng/table";
+import {ChessEvent, ChessEventCategory} from "../../core/models/chess/chess.models";
 import {InputTextModule} from "primeng/inputtext";
 import {FormsModule} from "@angular/forms";
 import {FaIconComponent} from "@fortawesome/angular-fontawesome";
 import {faCheck, faXmark} from "@fortawesome/free-solid-svg-icons";
 import {NgForOf} from "@angular/common";
 import {ConfirmDialogModule} from "primeng/confirmdialog";
-import {FilterMetadata, FilterService, SelectItem} from "primeng/api";
-import {LazyLoad} from "../../core/models/lazy-load.model";
+import {FilterService, SelectItem} from "primeng/api";
 
 @Component({
   selector: 'app-select-chess-event',
@@ -28,10 +27,6 @@ export class SelectChessEventComponent implements OnInit{
 
   readonly events = input<ChessEvent[]>([]);
   readonly selectedEventEmitter = output<ChessEvent | undefined>();
-  readonly lazyLoadEventEmitter = output<LazyLoad<SearchChessEvent>>();
-
-  pageSize = 100 // TODO https://github.com/primefaces/primeng/issues/17106
-  virtualPageSize = this.pageSize/2
 
   selectedEvent = signal<ChessEvent | undefined>(undefined);
 
@@ -83,29 +78,4 @@ export class SelectChessEventComponent implements OnInit{
     return "color: green"
   }
 
-  lazyLoad($event: TableLazyLoadEvent) {
-    console.log($event)
-
-    const last = $event.last // TODO maybe first + rows??? What happens when filter?
-    if(last == undefined){
-      return
-    }
-
-    const data: SearchChessEvent = {
-      title: ($event.filters?.['title'] as FilterMetadata)?.value ?? '',
-      category: ($event.filters?.['categories'] as FilterMetadata)?.value ?? '',
-      location: ($event.filters?.['location'] as FilterMetadata)?.value ?? '',
-      url: ($event.filters?.['url'] as FilterMetadata)?.value ?? '',
-      embedUrl: ($event.filters?.['url'] as FilterMetadata)?.value ?? '',
-      pageNumber: Math.round(last / this.pageSize),
-      pageSize: this.pageSize,
-    }
-
-    const lazyLoad: LazyLoad<SearchChessEvent> = {
-      data: data,
-      event: $event
-    }
-    this.lazyLoadEventEmitter.emit(lazyLoad)
-  }
-
 }
diff --git a/website/src/app/core/models/chess/chess.models.ts b/website/src/app/core/models/chess/chess.models.ts
index e09dbec0..54c7713b 100644
--- a/website/src/app/core/models/chess/chess.models.ts
+++ b/website/src/app/core/models/chess/chess.models.ts
@@ -71,6 +71,7 @@ export interface WriteChessEvent {
   url: string | undefined;
   embedUrl: string | undefined;
   internalComment: string;
+  platform: ChessPlatform;
   categoryIds: string[];
   participantsIds: string[];
 }

From b2a10b164e2ffe72f8ce6a3be40a73ead2c9a67f Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Fri, 3 Jan 2025 02:33:09 +0100
Subject: [PATCH 25/27] Refactor participants display to use player cards.

Replaced the participant table with a grid of reusable player card components for improved readability and modularity. Introduced a new `ChessPlayerCardComponent` to encapsulate player details and actions. Adjusted associated logic and templates to support this change.
---
 .../chess-event-participants.component.html   | 29 +++++------------
 .../chess-event-participants.component.ts     | 30 +++++++----------
 .../chess-player-card.component.html          | 14 ++++++++
 .../chess-player-card.component.scss          |  0
 .../chess-player-card.component.ts            | 32 +++++++++++++++++++
 website/src/assets/i18n/de.json               |  6 ++++
 website/src/assets/i18n/en.json               |  8 ++++-
 7 files changed, 78 insertions(+), 41 deletions(-)
 create mode 100644 website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.html
 create mode 100644 website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.scss
 create mode 100644 website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.ts

diff --git a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html
index e6d8c8ce..3ddd1cc5 100644
--- a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html
+++ b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html
@@ -1,25 +1,12 @@
 <p-card *ngIf="participants.value()?.length !== 0 && participants.value() as _participants">
-  <ng-template #header></ng-template>
   <ng-template #title>{{'chess.event.participants' | translate}}</ng-template>
 
-  <p-table stripedRows [value]="_participants">
-    <ng-template #header>
-      <tr>
-        <th>{{'chess.event.participant.firstname' | translate}}</th>
-        <th>{{'chess.event.participant.lastname' | translate}}</th>
-        <th>{{'chess.event.federation' | translate}}</th>
-        <th>{{'chess.event.birthday' | translate}}</th>
-        <th>{{'chess.event.account' | translate}}</th>
-      </tr>
-    </ng-template>
-    <ng-template #body let-participant>
-      <tr>
-        <td>{{ participant.firstname }}</td>
-        <td>{{ participant.lastname }}</td>
-        <td>{{ participant.federation }}</td>
-        <td>{{ participant.birthday }}</td>
-        <td><p-button *ngIf="personsPlatformAccount(participant) as account" label="{{'chess.event.open-account' | translate}}" (onClick)="openAccount(account)" /></td>
-      </tr>
-    </ng-template>
-  </p-table>
+  <div class="grid grid-cols-1 4k:grid-cols-5 xlScreen:grid-cols-4 lScreen:grid-cols-3 desktop:grid-cols-3 laptop:grid-cols-3 tablet:grid-cols-2 mobile:grid-cols-1 gap-4">
+    <app-chess-player-card
+      *ngFor="let participant of _participants"
+      [player]="participant"
+      [accounts]="personsPlatformAccount(participant)"
+    ></app-chess-player-card>
+  </div>
+
 </p-card>
diff --git a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts
index 27019dbd..b450d046 100644
--- a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts
+++ b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts
@@ -1,29 +1,29 @@
-import {Component, computed, inject, input} from '@angular/core';
-import {Button} from "primeng/button";
+import {Component, inject, input} from '@angular/core';
 import {CardModule} from "primeng/card";
-import {NgIf} from "@angular/common";
+import {NgForOf, NgIf} from "@angular/common";
 import {TableModule} from "primeng/table";
-import {RouterNavigationService} from "../../../core/services/router-navigation.service";
 import {TranslateModule} from "@ngx-translate/core";
-import {Account, ChessEvent, ChessPlatform, Person} from "../../../core/models/chess/chess.models";
+import {Account, ChessEvent, Person} from "../../../core/models/chess/chess.models";
 import {rxResource} from "@angular/core/rxjs-interop";
 import {of} from "rxjs";
 import {ChessService} from "../../../core/services/chess.service";
+import {ChessPlayerCardComponent} from "../chess-player-card/chess-player-card.component";
 
 @Component({
   selector: 'app-chess-event-participants',
   imports: [
-    Button,
     CardModule,
     NgIf,
     TableModule,
-    TranslateModule
+    TranslateModule,
+    NgForOf,
+    ChessPlayerCardComponent
   ],
   templateUrl: './chess-event-participants.component.html',
   styleUrl: './chess-event-participants.component.scss'
 })
 export class ChessEventParticipantsComponent {
-  private readonly navigationService = inject(RouterNavigationService);
+  private readonly chessService = inject(ChessService);
 
   readonly event = input<ChessEvent>();
   protected readonly participants = rxResource({
@@ -36,18 +36,10 @@ export class ChessEventParticipantsComponent {
     }
   })
 
-  constructor(private readonly chessService: ChessService) {
-  }
-
-  openAccount(account: Account) {
-    this.navigationService.open(account.url)
-  }
-
-  personsPlatformAccount(participant: Person) {
+  personsPlatformAccount(participant: Person): Account[] {
     const eventPlatform = this.event()?.platform
     if(eventPlatform == undefined)
-      return undefined
-    const accounts = participant.accounts.filter(value => value.platform == eventPlatform)
-    return accounts[0]
+      return []
+    return participant.accounts.filter(value => value.platform == eventPlatform)
   }
 }
diff --git a/website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.html b/website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.html
new file mode 100644
index 00000000..977be446
--- /dev/null
+++ b/website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.html
@@ -0,0 +1,14 @@
+<p-card styleClass="h-full">
+
+  <ng-template #title>{{player()?.firstname}} {{player()?.lastname}}</ng-template>
+
+  <p *ngIf="player()?.federation as federation"><strong>{{'chess.event.federation' | translate}}: </strong>{{ federation }}</p>
+  <p *ngIf="player()?.birthday as birthday"><strong>{{'chess.event.birthday' | translate}}: </strong>{{ birthday }}</p>
+
+  <ng-template #footer *ngIf="accounts() as _accounts">
+    <div class="flex gap-4 mt-1" *ngIf="_accounts.length > 0">
+      <p-button *ngFor="let account of _accounts" label="{{'chess.platform.'+account.platform | translate}}" (onClick)="openAccount(account)" class="w-full" styleClass="w-full"/>
+    </div>
+  </ng-template>
+
+</p-card>
diff --git a/website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.scss b/website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.ts b/website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.ts
new file mode 100644
index 00000000..89e52df9
--- /dev/null
+++ b/website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.ts
@@ -0,0 +1,32 @@
+import {Component, inject, input} from '@angular/core';
+import {Card} from "primeng/card";
+import {Button} from "primeng/button";
+import {Account, Person} from "../../../core/models/chess/chess.models";
+import {TranslatePipe} from "@ngx-translate/core";
+import {NgForOf, NgIf} from "@angular/common";
+import {RouterNavigationService} from "../../../core/services/router-navigation.service";
+
+@Component({
+  selector: 'app-chess-player-card',
+  imports: [
+    Card,
+    Button,
+    TranslatePipe,
+    NgIf,
+    NgForOf
+  ],
+  templateUrl: './chess-player-card.component.html',
+  styleUrl: './chess-player-card.component.scss'
+})
+export class ChessPlayerCardComponent {
+  private readonly navigationService = inject(RouterNavigationService);
+
+  player = input<Person>()
+  accounts = input<Account[]>();
+
+  openAccount(account: Account) {
+    this.navigationService.open(account.url)
+  }
+
+  protected readonly length = length;
+}
diff --git a/website/src/assets/i18n/de.json b/website/src/assets/i18n/de.json
index 1135ae56..d9bc5905 100644
--- a/website/src/assets/i18n/de.json
+++ b/website/src/assets/i18n/de.json
@@ -56,6 +56,12 @@
       "player-analysis": "Player Analysis",
       "settings": "Einstellungen"
     },
+    "platform": {
+      "CHESSCOM": "Chess.com",
+      "FIDE": "Fide",
+      "FREESTYLE": "Freestyle",
+      "LICHESS": "Lichess"
+    },
     "player": {
       "firstname": "Vorname",
       "lastname": "Nachname",
diff --git a/website/src/assets/i18n/en.json b/website/src/assets/i18n/en.json
index 031f2b84..f3a01ed5 100644
--- a/website/src/assets/i18n/en.json
+++ b/website/src/assets/i18n/en.json
@@ -25,7 +25,7 @@
       "size": "Size"
     },
     "event": {
-      "account": "account",
+      "account": "Account",
       "birthday": "Birthday",
       "chess-com": "Chess.com",
       "date-from": "From",
@@ -56,6 +56,12 @@
       "player-analysis": "Player Analysis",
       "settings": "Settings"
     },
+    "platform": {
+      "CHESSCOM": "Chess.com",
+      "FIDE": "Fide",
+      "FREESTYLE": "Freestyle",
+      "LICHESS": "Lichess"
+    },
     "player": {
       "firstname": "Firstname",
       "lastname": "Lastname",

From 1ce1344103f0b95cd56580d16c7bdb59d6cb25e3 Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Fri, 3 Jan 2025 15:30:04 +0100
Subject: [PATCH 26/27] Add gender-based icons and participant sorting

Introduced gender icons in various components using the refactored `EventIconPipe`. Added sorting functionality for chess event participants by different attributes such as firstname, lastname, federation, and birthday. Updated templates and styling to accommodate these changes.
---
 .../chess-update-event.component.html         |  2 +-
 .../chess-update-game.component.html          |  4 --
 .../select-chess-person.component.html        |  7 +--
 .../select-chess-person.component.ts          |  4 +-
 .../chess-event-participants.component.html   | 18 +++++-
 .../chess-event-participants.component.ts     | 59 +++++++++++++++++--
 .../chess-event/chess-event.component.html    | 27 +++++----
 .../chess-player-card.component.html          |  7 ++-
 .../chess-player-card.component.ts            |  6 +-
 .../src/app/core/pipes/gender-icon.pipe.ts    |  6 +-
 website/src/assets/i18n/de.json               |  2 +
 website/src/assets/i18n/en.json               |  2 +
 12 files changed, 108 insertions(+), 36 deletions(-)

diff --git a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html
index 7ce40032..35815d08 100644
--- a/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html
+++ b/website/src/app/chess-settings/chess-update-event/chess-update-event.component.html
@@ -79,7 +79,7 @@
           <ng-template let-person #item>
             <div class="flex flex-wrap p-1 items-center gap-4 w-full">
               <div class="flex-1 flex flex-col">
-                <span class="font-bold">{{ person.firstname }} {{person.lastname}} <fa-icon [icon]="person | genderIcon"></fa-icon></span>
+                <span class="font-bold">{{ person.firstname }} {{person.lastname}} <fa-icon *ngIf="person?.gender as gender" [icon]="gender | genderIcon"></fa-icon></span>
                 <div class="contents gap-2" *ngIf="person.fideId || person.birthday">
                   <span *ngIf="person.fideId">Fide ID: {{ person.fideId }}</span>
                   <span *ngIf="person.birthday">Birthday: {{ person.birthday }}</span>
diff --git a/website/src/app/chess-settings/chess-update-game/chess-update-game.component.html b/website/src/app/chess-settings/chess-update-game/chess-update-game.component.html
index 37638669..46fbb83e 100644
--- a/website/src/app/chess-settings/chess-update-game/chess-update-game.component.html
+++ b/website/src/app/chess-settings/chess-update-game/chess-update-game.component.html
@@ -35,16 +35,12 @@
         </ng-template>
         <ng-template #header>
           <tr>
-            <th style="width: 4rem"></th>
             <th>Username</th>
             <th>Platform</th>
           </tr>
         </ng-template>
         <ng-template #body let-account let-rowIndex="rowIndex">
           <tr [pSelectableRow]="account" [pSelectableRowIndex]="rowIndex">
-            <td>
-              <p-tableCheckbox [value]="account" disabled="true"/>
-            </td>
             <td>{{ account.username }}</td>
             <td>{{ account.platform }}</td>
           </tr>
diff --git a/website/src/app/chess-settings/select-chess-person/select-chess-person.component.html b/website/src/app/chess-settings/select-chess-person/select-chess-person.component.html
index 28aa3454..54c49ec4 100644
--- a/website/src/app/chess-settings/select-chess-person/select-chess-person.component.html
+++ b/website/src/app/chess-settings/select-chess-person/select-chess-person.component.html
@@ -10,7 +10,6 @@
 >
   <ng-template #header>
     <tr>
-      <th style="width: 4rem"></th>
       <th>Firstname</th>
       <th>Lastname</th>
       <th>Fide Id</th>
@@ -19,7 +18,6 @@
       <th>Gender</th>
     </tr>
     <tr>
-      <th></th>
       <th>
         <p-columnFilter
           type="text"
@@ -66,15 +64,12 @@
   </ng-template>
   <ng-template #body let-person let-rowIndex="rowIndex">
     <tr [pSelectableRow]="person" [pSelectableRowIndex]="rowIndex">
-      <td>
-        <p-tableCheckbox [value]="person" disabled="true"/>
-      </td>
       <td>{{ person.firstname }}</td>
       <td>{{ person.lastname }}</td>
       <td>{{ person.fideId }}</td>
       <td>{{ person.federation }}</td>
       <td>{{ person.birthday }}</td>
-      <td><fa-icon [icon]="person | genderIcon"></fa-icon></td>
+      <td><fa-icon *ngIf="person?.gender as gender" [icon]="gender | genderIcon"></fa-icon></td>
     </tr>
   </ng-template>
 </p-table>
diff --git a/website/src/app/chess-settings/select-chess-person/select-chess-person.component.ts b/website/src/app/chess-settings/select-chess-person/select-chess-person.component.ts
index 8237fa53..7226b0bc 100644
--- a/website/src/app/chess-settings/select-chess-person/select-chess-person.component.ts
+++ b/website/src/app/chess-settings/select-chess-person/select-chess-person.component.ts
@@ -5,6 +5,7 @@ import {PaginatorModule} from "primeng/paginator";
 import {TableModule} from "primeng/table";
 import {FaIconComponent} from "@fortawesome/angular-fontawesome";
 import {EventIconPipe} from "../../core/pipes/gender-icon.pipe";
+import {NgIf} from "@angular/common";
 
 @Component({
   selector: 'app-select-chess-person',
@@ -13,7 +14,8 @@ import {EventIconPipe} from "../../core/pipes/gender-icon.pipe";
     PaginatorModule,
     TableModule,
     FaIconComponent,
-    EventIconPipe
+    EventIconPipe,
+    NgIf
   ],
   templateUrl: './select-chess-person.component.html',
   styleUrl: './select-chess-person.component.scss'
diff --git a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html
index 3ddd1cc5..146107d2 100644
--- a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html
+++ b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html
@@ -1,9 +1,23 @@
-<p-card *ngIf="participants.value()?.length !== 0 && participants.value() as _participants">
+<p-card *ngIf="participants.value()?.length !== 0">
   <ng-template #title>{{'chess.event.participants' | translate}}</ng-template>
+  <ng-template #subtitle>
+    <p-fieldset [toggleable]="true" [collapsed]="true">
+      <ng-template #header>
+        <p class="text-sm">{{'chess.event.sort' | translate}}</p>
+      </ng-template>
+      <div class="flex flex-wrap gap-4">
+        <div *ngFor="let sortOption of sortOptions" class="field-checkbox cursor-pointer">
+          <p-radioButton [inputId]="sortOption.value" name="category" [value]="sortOption.value" [(ngModel)]="selectedSort" size="small"></p-radioButton>
+          <label [for]="sortOption.value" class="ml-2 cursor-pointer">{{ sortOption.name }}</label>
+        </div>
+      </div>
+    </p-fieldset>
+
+  </ng-template>
 
   <div class="grid grid-cols-1 4k:grid-cols-5 xlScreen:grid-cols-4 lScreen:grid-cols-3 desktop:grid-cols-3 laptop:grid-cols-3 tablet:grid-cols-2 mobile:grid-cols-1 gap-4">
     <app-chess-player-card
-      *ngFor="let participant of _participants"
+      *ngFor="let participant of sortedParticipants()"
       [player]="participant"
       [accounts]="personsPlatformAccount(participant)"
     ></app-chess-player-card>
diff --git a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts
index b450d046..7c16cdb3 100644
--- a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts
+++ b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts
@@ -1,23 +1,29 @@
-import {Component, inject, input} from '@angular/core';
+import {Component, computed, effect, inject, input, signal} from '@angular/core';
 import {CardModule} from "primeng/card";
 import {NgForOf, NgIf} from "@angular/common";
-import {TableModule} from "primeng/table";
 import {TranslateModule} from "@ngx-translate/core";
 import {Account, ChessEvent, Person} from "../../../core/models/chess/chess.models";
 import {rxResource} from "@angular/core/rxjs-interop";
 import {of} from "rxjs";
 import {ChessService} from "../../../core/services/chess.service";
 import {ChessPlayerCardComponent} from "../chess-player-card/chess-player-card.component";
+import {SelectButton} from "primeng/selectbutton";
+import {FormsModule} from "@angular/forms";
+import {RadioButton} from "primeng/radiobutton";
+import {Fieldset} from "primeng/fieldset";
 
 @Component({
   selector: 'app-chess-event-participants',
   imports: [
     CardModule,
     NgIf,
-    TableModule,
     TranslateModule,
     NgForOf,
-    ChessPlayerCardComponent
+    ChessPlayerCardComponent,
+    SelectButton,
+    FormsModule,
+    RadioButton,
+    Fieldset
   ],
   templateUrl: './chess-event-participants.component.html',
   styleUrl: './chess-event-participants.component.scss'
@@ -36,10 +42,55 @@ export class ChessEventParticipantsComponent {
     }
   })
 
+  sortedParticipants = computed(() => {
+    const _participants = this.participants.value() ?? []
+    const sortBy = this.selectedSort()
+    return this.sortParticipants(_participants, sortBy)
+  })
+
+  sortOptions: SortBy[] = [
+    {name: 'Firstname', value: SortByValue.firstname},
+    {name: 'Lastname', value: SortByValue.lastname},
+    {name: 'Federation', value: SortByValue.federation},
+    {name: 'Birthday', value: SortByValue.birthday}
+  ];
+  selectedSort = signal<SortByValue>(SortByValue.lastname);
+
   personsPlatformAccount(participant: Person): Account[] {
     const eventPlatform = this.event()?.platform
     if(eventPlatform == undefined)
       return []
     return participant.accounts.filter(value => value.platform == eventPlatform)
   }
+
+  sortParticipants(_participants: Person[], value: SortByValue) {
+    switch (value) {
+      case SortByValue.federation:
+        return _participants.sort((a, b) => (a.federation || '').localeCompare(b.federation || ''))
+      case SortByValue.firstname:
+        return _participants.sort((a, b) => a.firstname.localeCompare(b.firstname))
+      case SortByValue.lastname:
+        return _participants.sort((a, b) => a.lastname.localeCompare(b.lastname))
+      case SortByValue.birthday:
+        return _participants.sort((a, b) => {
+          const dateA = a.birthday ? new Date(a.birthday).getTime() : 0;
+          const dateB = b.birthday ? new Date(b.birthday).getTime() : 0;
+          return dateB - dateA;
+        })
+      default:
+        return _participants;
+    }
+  }
+
+}
+
+interface SortBy {
+  name: string;
+  value: SortByValue;
+}
+enum SortByValue {
+  firstname = 'firstname',
+  lastname = 'lastname',
+  federation = 'federation',
+  birthday = 'birthday'
 }
diff --git a/website/src/app/chess/chess-event/chess-event.component.html b/website/src/app/chess/chess-event/chess-event.component.html
index 01b2a73d..9d61c725 100644
--- a/website/src/app/chess/chess-event/chess-event.component.html
+++ b/website/src/app/chess/chess-event/chess-event.component.html
@@ -17,15 +17,23 @@
     <p-tabpanels>
       <p-tabpanel value="0">
 
-        <p-card>
-
           <div class="grid grid-cols-1 4k:grid-cols-4 xlScreen:grid-cols-3 lScreen:grid-cols-3 desktop:grid-cols-3 laptop:grid-cols-1 tablet:grid-cols-1 mobile:grid-cols-1 gap-4">
 
             <div *ngIf="event.value() as _event" class="4k:col-span-1 xlScreen:col-span-1 lScreen:col-span-1 desktop:col-span-1 laptop:col-span-1 tablet:col-span-1 mobile:col-span-1">
-              <p-card [header]="_event.title" [subheader]="categories()" styleClass="h-full">
-                <p *ngIf="_event.location"><strong>{{'chess.event.location' | translate}}: </strong>{{ _event.location }}</p>
-                <p *ngIf="_event.dateFrom"><strong>{{'chess.event.date-from' | translate}}: </strong>{{ _event.dateFrom }}</p>
-                <p *ngIf="_event.dateTo"><strong>{{'chess.event.date-to' | translate}}: </strong>{{ _event.dateTo }}</p>
+              <p-card>
+                <ng-template #title>{{_event.title}}</ng-template>
+                <ng-template #subtitle>{{categories()}}</ng-template>
+
+                <p *ngIf="_event.platform as platform"><strong>{{'chess.event.organizer' | translate}}: </strong>{{'chess.platform.' + platform | translate}}</p>
+                <p *ngIf="_event.location as location"><strong>{{'chess.event.location' | translate}}: </strong>{{ location }}</p>
+                <p *ngIf="_event.dateFrom as dateFrom"><strong>{{'chess.event.date-from' | translate}}: </strong>{{ dateFrom }}</p>
+                <p *ngIf="_event.dateTo as dateTo"><strong>{{'chess.event.date-to' | translate}}: </strong>{{ dateTo }}</p>
+
+                <ng-template #footer>
+                  <div *ngIf="event.value()?.url && event.value()?.url !== ''" >
+                    <p-button [label]="'chess.event.open-official-website' | translate" class="w-full" styleClass="w-full" (onClick)="openEvent()" />
+                  </div>
+                </ng-template>
               </p-card>
             </div>
 
@@ -37,13 +45,6 @@
           </div>
 
 
-          <ng-template #footer>
-            <div *ngIf="event.value()?.url && event.value()?.url !== ''" >
-              <p-button [label]="'chess.event.open-official-website' | translate" class="w-full" styleClass="w-full" (onClick)="openEvent()" />
-            </div>
-          </ng-template>
-        </p-card>
-
       </p-tabpanel>
       <p-tabpanel value="1">
 
diff --git a/website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.html b/website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.html
index 977be446..f678b7a2 100644
--- a/website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.html
+++ b/website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.html
@@ -1,6 +1,11 @@
 <p-card styleClass="h-full">
 
-  <ng-template #title>{{player()?.firstname}} {{player()?.lastname}}</ng-template>
+  <ng-template #title>
+    {{player()?.firstname}} {{player()?.lastname}}
+    <ng-container *ngIf="player()?.gender as gender">
+      <fa-icon [icon]="gender | genderIcon" class="text-slate-500"></fa-icon>
+    </ng-container>
+  </ng-template>
 
   <p *ngIf="player()?.federation as federation"><strong>{{'chess.event.federation' | translate}}: </strong>{{ federation }}</p>
   <p *ngIf="player()?.birthday as birthday"><strong>{{'chess.event.birthday' | translate}}: </strong>{{ birthday }}</p>
diff --git a/website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.ts b/website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.ts
index 89e52df9..59679a31 100644
--- a/website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.ts
+++ b/website/src/app/chess/chess-event/chess-player-card/chess-player-card.component.ts
@@ -5,6 +5,8 @@ import {Account, Person} from "../../../core/models/chess/chess.models";
 import {TranslatePipe} from "@ngx-translate/core";
 import {NgForOf, NgIf} from "@angular/common";
 import {RouterNavigationService} from "../../../core/services/router-navigation.service";
+import {EventIconPipe} from "../../../core/pipes/gender-icon.pipe";
+import {FaIconComponent} from "@fortawesome/angular-fontawesome";
 
 @Component({
   selector: 'app-chess-player-card',
@@ -13,7 +15,9 @@ import {RouterNavigationService} from "../../../core/services/router-navigation.
     Button,
     TranslatePipe,
     NgIf,
-    NgForOf
+    NgForOf,
+    EventIconPipe,
+    FaIconComponent
   ],
   templateUrl: './chess-player-card.component.html',
   styleUrl: './chess-player-card.component.scss'
diff --git a/website/src/app/core/pipes/gender-icon.pipe.ts b/website/src/app/core/pipes/gender-icon.pipe.ts
index 23cfee04..867f1f90 100644
--- a/website/src/app/core/pipes/gender-icon.pipe.ts
+++ b/website/src/app/core/pipes/gender-icon.pipe.ts
@@ -8,10 +8,10 @@ import {faMars, faVenus, faVenusMars} from "@fortawesome/free-solid-svg-icons";
 })
 export class EventIconPipe implements PipeTransform {
 
-  transform(person: Person): IconDefinition {
-    if(person.gender == Gender.MALE)
+  transform(gender: Gender): IconDefinition {
+    if(gender == Gender.MALE)
       return faMars
-    if (person.gender == Gender.FEMALE)
+    if (gender == Gender.FEMALE)
       return faVenus
     return faVenusMars;
   }
diff --git a/website/src/assets/i18n/de.json b/website/src/assets/i18n/de.json
index d9bc5905..c9343391 100644
--- a/website/src/assets/i18n/de.json
+++ b/website/src/assets/i18n/de.json
@@ -36,11 +36,13 @@
       "location": "Standort",
       "open-account": "Account öffnen",
       "open-official-website": "Offizielle Webseite öffnen",
+      "organizer": "Veranstalter",
       "participant": {
         "firstname": "Vorname",
         "lastname": "Nachname"
       },
       "participants": "Teilnehmer",
+      "sort": "Sortieren",
       "title": "Titel"
     },
     "home": {
diff --git a/website/src/assets/i18n/en.json b/website/src/assets/i18n/en.json
index f3a01ed5..dedba57c 100644
--- a/website/src/assets/i18n/en.json
+++ b/website/src/assets/i18n/en.json
@@ -36,11 +36,13 @@
       "location": "Location",
       "open-account": "Open account",
       "open-official-website": "Open official website",
+      "organizer": "Organizer",
       "participant": {
         "firstname": "Firstname",
         "lastname": "Lastname"
       },
       "participants": "Participants",
+      "sort": "Sort",
       "title": "Title"
     },
     "home": {

From a4c64db9f79ecfd4c2ed9fbabefcd2fa12f1ec94 Mon Sep 17 00:00:00 2001
From: Michael Baumberger <michael_baumberger@gmx.ch>
Date: Fri, 3 Jan 2025 15:50:49 +0100
Subject: [PATCH 27/27] Bugfix & Refactor sorting translation keys and remove
 unused auth param.

Updated sorting options to use localized translation keys for better i18n support. Adjusted the backend API by removing an unnecessary `principal` parameter in the `getEventCategoriesWithEvents` method. Also restructured JSON files for sorting translations and added missing entries.
---
 .../app/eventcategory/EventCategoryController.kt       |  2 +-
 .../chess-event-participants.component.html            |  4 ++--
 .../chess-event-participants.component.ts              |  8 ++++----
 website/src/assets/i18n/de.json                        | 10 +++++++++-
 website/src/assets/i18n/en.json                        | 10 +++++++++-
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryController.kt b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryController.kt
index 15b0cf2e..65d3492c 100644
--- a/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryController.kt
+++ b/chess-service/src/main/kotlin/com/michibaum/chess_service/app/eventcategory/EventCategoryController.kt
@@ -30,7 +30,7 @@ class EventCategoryController(
 
     @Transactional(propagation = Propagation.REQUIRED, readOnly = true, isolation = Isolation.REPEATABLE_READ)
     @GetMapping("/api/event-categories/with-events")
-    fun getEventCategoriesWithEvents(principal: JwtAuthentication): ResponseEntity<List<EventCategoryWithEventDto>> {
+    fun getEventCategoriesWithEvents(): ResponseEntity<List<EventCategoryWithEventDto>> {
         val dtos = service.getAll().map { category ->
             val eventDtos = eventService.findByCategoryId(category.idOrThrow()).map { event -> eventConverter.toDto(event) }
             converter.toDto(category, eventDtos)
diff --git a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html
index 146107d2..d12c3cb8 100644
--- a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html
+++ b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.html
@@ -3,12 +3,12 @@
   <ng-template #subtitle>
     <p-fieldset [toggleable]="true" [collapsed]="true">
       <ng-template #header>
-        <p class="text-sm">{{'chess.event.sort' | translate}}</p>
+        <p class="text-sm">{{'general.sort' | translate}}</p>
       </ng-template>
       <div class="flex flex-wrap gap-4">
         <div *ngFor="let sortOption of sortOptions" class="field-checkbox cursor-pointer">
           <p-radioButton [inputId]="sortOption.value" name="category" [value]="sortOption.value" [(ngModel)]="selectedSort" size="small"></p-radioButton>
-          <label [for]="sortOption.value" class="ml-2 cursor-pointer">{{ sortOption.name }}</label>
+          <label [for]="sortOption.value" class="ml-2 cursor-pointer">{{ sortOption.name | translate }}</label>
         </div>
       </div>
     </p-fieldset>
diff --git a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts
index 7c16cdb3..82f4d58d 100644
--- a/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts
+++ b/website/src/app/chess/chess-event/chess-event-participants/chess-event-participants.component.ts
@@ -49,10 +49,10 @@ export class ChessEventParticipantsComponent {
   })
 
   sortOptions: SortBy[] = [
-    {name: 'Firstname', value: SortByValue.firstname},
-    {name: 'Lastname', value: SortByValue.lastname},
-    {name: 'Federation', value: SortByValue.federation},
-    {name: 'Birthday', value: SortByValue.birthday}
+    {name: 'chess.event.sort.firstname', value: SortByValue.firstname},
+    {name: 'chess.event.sort.lastname', value: SortByValue.lastname},
+    {name: 'chess.event.sort.federation', value: SortByValue.federation},
+    {name: 'chess.event.sort.birthday', value: SortByValue.birthday}
   ];
   selectedSort = signal<SortByValue>(SortByValue.lastname);
 
diff --git a/website/src/assets/i18n/de.json b/website/src/assets/i18n/de.json
index c9343391..671a298f 100644
--- a/website/src/assets/i18n/de.json
+++ b/website/src/assets/i18n/de.json
@@ -42,7 +42,12 @@
         "lastname": "Nachname"
       },
       "participants": "Teilnehmer",
-      "sort": "Sortieren",
+      "sort": {
+        "birthday": "Geburtstag",
+        "federation": "Verband",
+        "firstname": "Vorname",
+        "lastname": "Nachname"
+      },
       "title": "Titel"
     },
     "home": {
@@ -89,6 +94,9 @@
   "fitness-settings": {
     "title": "Fitness Einstellungen"
   },
+  "general": {
+    "sort": "Sortieren"
+  },
   "home": {
     "about-me": {
       "button": "Zu über mich",
diff --git a/website/src/assets/i18n/en.json b/website/src/assets/i18n/en.json
index dedba57c..4a30bb4a 100644
--- a/website/src/assets/i18n/en.json
+++ b/website/src/assets/i18n/en.json
@@ -42,7 +42,12 @@
         "lastname": "Lastname"
       },
       "participants": "Participants",
-      "sort": "Sort",
+      "sort": {
+        "birthday": "Birthday",
+        "federation": "Federation",
+        "firstname": "Firstname",
+        "lastname": "Lastname"
+      },
       "title": "Title"
     },
     "home": {
@@ -89,6 +94,9 @@
   "fitness-settings": {
     "title": "Fitness Settings"
   },
+  "general": {
+    "sort": "Sort"
+  },
   "home": {
     "about-me": {
       "button": "Go to about me",