From f226b4c8b2496d673743965eac1bba6bcf716987 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Thu, 12 May 2022 20:49:12 +0200
Subject: [PATCH 1/2] Add robot CI

---
 .github/workflows/build.yml |  2 +-
 .github/workflows/robot.yml | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/robot.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5fa0b972..a42ed529 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -54,7 +54,7 @@ jobs:
           LIBPATH: ${{env.LIBPATH}};C:\Program Files\FFmpeg\lib
           CFLAGS: -I/usr/local/include
           LDFLAGS: -L/usr/local/lib
-        run: dotnet publish -r ${{matrix.runtime}} -c Release -o dist ${{env.PROJECT}}
+        run: dotnet publish -r ${{matrix.runtime}} --self-contained -c Release -o dist ${{env.PROJECT}}
       - name: Compression output
         shell: bash
         run: |
diff --git a/.github/workflows/robot.yml b/.github/workflows/robot.yml
new file mode 100644
index 00000000..0fe10f6d
--- /dev/null
+++ b/.github/workflows/robot.yml
@@ -0,0 +1,33 @@
+name: RobotTests
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Build the app
+        run: docker-compose build
+
+      - name: Start the service
+        run: docker-compose up -d
+
+      - name: Perform healthchecks
+        run: |
+          docker-compose ps -a
+          wget --retry-connrefused http://localhost:5000 # /healthcheck
+
+      - name: Run robot tests
+        run: |
+          pip install -r tests/robot/requirements.txt
+          robot -d out tests/robot/
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: results
+          path: out
+

From 6db43bb19a50d4add4fa301df913b27eb2cb4da7 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Thu, 12 May 2022 20:49:26 +0200
Subject: [PATCH 2/2] Allow "USER" instead of "USER ID" in the configuration

---
 docker-compose.yml              |  2 +-
 src/Kyoo.Database/Extensions.cs | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 313392e8..08b3ba99 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - BASICS__PUBLICURL=http://localhost:5000
       - DATABASE__ENABLED=postgres
       - DATABASE__CONFIGURATIONS__POSTGRES__SERVER=postgres
-      - DATABASE__CONFIGURATIONS__POSTGRES__USER ID=kyoo
+      - DATABASE__CONFIGURATIONS__POSTGRES__USER=kyoo
       - DATABASE__CONFIGURATIONS__POSTGRES__PASSWORD=kyooPassword
       - TVDB__APIKEY=${TVDB__APIKEY}
       - THEMOVIEDB__APIKEY=${THEMOVIEDB__APIKEY}
diff --git a/src/Kyoo.Database/Extensions.cs b/src/Kyoo.Database/Extensions.cs
index 93afb00c..8c205caa 100644
--- a/src/Kyoo.Database/Extensions.cs
+++ b/src/Kyoo.Database/Extensions.cs
@@ -34,10 +34,21 @@ namespace Kyoo.Database
 		/// <returns>A parsed connection string</returns>
 		public static string GetDatabaseConnection(this IConfiguration config, string database)
 		{
+			static string ToDbProperty(string key)
+			{
+				return key switch
+				{
+					"USER" => "USER ID",
+					_ => key
+				};
+			}
+
 			DbConnectionStringBuilder builder = new();
 			IConfigurationSection section = config.GetSection("database:configurations").GetSection(database);
 			foreach (IConfigurationSection child in section.GetChildren())
-				builder[child.Key] = child.Value;
+			{
+				builder[ToDbProperty(child.Key)] = child.Value;
+			}
 			return builder.ConnectionString;
 		}