From 7bbace5cb270dbcff63a9696511e5574b8383adb Mon Sep 17 00:00:00 2001
From: Christian Kauer <c.kauer@krah-gruppe.de>
Date: Thu, 28 Dec 2023 15:11:18 +0100
Subject: [PATCH] dev

---
 GameData.UnitTests/UnitTest1.cs          |  4 ++--
 GameData/ApiClient.cs                    | 14 ++++++++++----
 GameData/Repository/ExpenseRepository.cs |  7 +++----
 GameHandler/GameService.cs               |  8 ++++----
 GameModel/Settings/AppSettings.cs        |  2 ++
 KoogleCli/Program.cs                     |  2 +-
 KoogleCli/appsettings.json               |  3 ++-
 7 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/GameData.UnitTests/UnitTest1.cs b/GameData.UnitTests/UnitTest1.cs
index edc82e8..06ff236 100644
--- a/GameData.UnitTests/UnitTest1.cs
+++ b/GameData.UnitTests/UnitTest1.cs
@@ -14,8 +14,8 @@ namespace GameData.UnitTests
         [Test]
         public void Test1()
         {
-            var client = new ExpenseRepository(null);
-            var test = client.GetAll();
+            //var client = new ExpenseRepository(null, null, null);
+            //var test = client.GetAll();
         }
     }
 }
\ No newline at end of file
diff --git a/GameData/ApiClient.cs b/GameData/ApiClient.cs
index 9629a36..472f30e 100644
--- a/GameData/ApiClient.cs
+++ b/GameData/ApiClient.cs
@@ -1,4 +1,5 @@
 using GameData.Repository;
+using GameModel.Settings;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -19,10 +20,14 @@ namespace GameData
         }
 
         private readonly HttpClient client;
-        private readonly string _apiKey = "9wIqngBjwR_l2f89D0EEAN1ldrcXUl6c";
-        private readonly string Api = "https://directus.straso.com/";
-        public ApiClient()
+
+        private readonly AppSettings _appSettings;
+        private readonly string Api;
+
+        public ApiClient(AppSettings appSettings)
         {
+            _appSettings = appSettings;
+
             client = new HttpClient
             {
                 Timeout = TimeSpan.FromMinutes(1)
@@ -33,10 +38,11 @@ namespace GameData
                     .Add(new MediaTypeWithQualityHeaderValue("application/json"));
 
             client.DefaultRequestHeaders
-                    .Authorization = new AuthenticationHeaderValue("Bearer", _apiKey);
+                    .Authorization = new AuthenticationHeaderValue("Bearer", _appSettings.ApiToken);
 
             //client.DefaultRequestHeaders.Add("Api-AppInfo", "KrahApp;" + Assembly.GetExecutingAssembly().GetName().Version.ToString());
 
+            Api = _appSettings.ApiBaseUrl;
             if (!Api.EndsWith("/"))
             {
                 Api += "/";
diff --git a/GameData/Repository/ExpenseRepository.cs b/GameData/Repository/ExpenseRepository.cs
index 41c0e5f..9b03134 100644
--- a/GameData/Repository/ExpenseRepository.cs
+++ b/GameData/Repository/ExpenseRepository.cs
@@ -14,14 +14,13 @@ namespace GameData.Repository
     {
         readonly ILogger<ExpenseRepository> _log;
         private ApiClient _client;
-        private AppSettings _appSettings;
+        
         string Url => "items/expense";
 
-        public ExpenseRepository(ILogger<ExpenseRepository> log, AppSettings appSettings)
+        public ExpenseRepository(ILogger<ExpenseRepository> log, ApiClient apiClient)
         {
-            _appSettings = appSettings;
             _log = log;
-            _client = new ApiClient();
+            _client = apiClient;
 
             _log?.LogWarning("TESTWARN");
         }
diff --git a/GameHandler/GameService.cs b/GameHandler/GameService.cs
index c8379f6..b629a30 100644
--- a/GameHandler/GameService.cs
+++ b/GameHandler/GameService.cs
@@ -21,7 +21,7 @@ namespace GameHandler
 {
     public class GameService
     {
-        private IContainer _container { get; set; }
+        private IContainer _rootContainer { get; set; }
         private bool _isStarted = false;
         private ILifetimeScope _scope;
         private IGameHandler _gh;
@@ -32,9 +32,9 @@ namespace GameHandler
 
         private IExpenseRepository _expenseRepository { get => _scope.Resolve<IExpenseRepository>(); }
 
-        public GameService(IContainer container =null)
+        public GameService(IContainer rootContainer = null)
         {
-            _container = container;
+            _rootContainer = rootContainer;
         }
 
         public string ThrowModeName
@@ -64,7 +64,7 @@ namespace GameHandler
             }
             _isStarted = true;
 
-            _scope = _container?.BeginLifetimeScope();
+            _scope = _rootContainer?.BeginLifetimeScope();
             _gh = this.GetGameHandler(gameName);
             var gm = _gh.InitGameModel(playerIds, gameSettings);
 
diff --git a/GameModel/Settings/AppSettings.cs b/GameModel/Settings/AppSettings.cs
index 6e2b24f..aaf6b6d 100644
--- a/GameModel/Settings/AppSettings.cs
+++ b/GameModel/Settings/AppSettings.cs
@@ -9,5 +9,7 @@ namespace GameModel.Settings
     public class AppSettings
     {
         public string ApiToken { get; set; }
+
+        public string ApiBaseUrl { get; set; }  
     }
 }
diff --git a/KoogleCli/Program.cs b/KoogleCli/Program.cs
index 4589338..2c9f4c9 100644
--- a/KoogleCli/Program.cs
+++ b/KoogleCli/Program.cs
@@ -48,11 +48,11 @@ Autofac.IContainer Register()
 {
     var builder = new ContainerBuilder();
 
-    //builder.Populate(serviceCollection);
     RegisterAppsettings(builder);
 
     RegisterLogging(builder);
 
+    builder.RegisterType<ApiClient>();
     builder.RegisterType<ExpenseRepository>().As<IExpenseRepository>();
     return builder.Build();
 }
diff --git a/KoogleCli/appsettings.json b/KoogleCli/appsettings.json
index e2eb482..392d362 100644
--- a/KoogleCli/appsettings.json
+++ b/KoogleCli/appsettings.json
@@ -1,5 +1,6 @@
 {
   "AppSettings": {
-    "ApiToken": "LT9iPa1EuaaRB0h2VL45fVPLLK7Rt0wb"
+    "ApiToken": "LT9iPa1EuaaRB0h2VL45fVPLLK7Rt0wb",
+    "ApiBaseUrl": "https://directus.straso.com/"
   }
 }