From 395d5a89b232f60b68a71e7c7ac641284c1b2d12 Mon Sep 17 00:00:00 2001
From: ig <ig ig@devnullmail.com>
Date: Wed, 5 Jul 2023 14:31:53 +0200
Subject: [PATCH] Change S3 keys format; add correct S3 key for
 SalimaxPrototype

---
 csharp/App/Backend/Controller.cs              |   6 ++++--
 csharp/App/Backend/DataTypes/Installation.cs  |   6 ++----
 .../Backend/DataTypes/Methods/Installation.cs |   2 +-
 csharp/App/Backend/db.sqlite                  | Bin 540672 -> 540672 bytes
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/csharp/App/Backend/Controller.cs b/csharp/App/Backend/Controller.cs
index 2c54fd319..ca7deabb2 100644
--- a/csharp/App/Backend/Controller.cs
+++ b/csharp/App/Backend/Controller.cs
@@ -5,7 +5,7 @@ using InnovEnergy.App.Backend.Relations;
 using InnovEnergy.Lib.Utils;
 using Microsoft.AspNetCore.Mvc;
 
-namespace InnovEnergy.App.Backend.Controllers;
+namespace InnovEnergy.App.Backend;
 
 using Token = String;
 
@@ -81,7 +81,9 @@ public class Controller : ControllerBase
         if (installation is null || !user.HasAccessTo(installation))
             return Unauthorized();
     
-        return installation.FillOrderNumbers().HideParentIfUserHasNoAccessToParent(user);
+        return installation
+              .FillOrderNumbers()
+              .HideParentIfUserHasNoAccessToParent(user);
     }
     
     [HttpGet(nameof(GetUsersWithDirectAccessToInstallation))]
diff --git a/csharp/App/Backend/DataTypes/Installation.cs b/csharp/App/Backend/DataTypes/Installation.cs
index 4a01de8dc..66fa98341 100644
--- a/csharp/App/Backend/DataTypes/Installation.cs
+++ b/csharp/App/Backend/DataTypes/Installation.cs
@@ -15,8 +15,6 @@ public class Installation : TreeNode
     public Double Lat  { get; set; }
     public Double Long { get; set; }
 
-    public String S3Bucket { get; set; } = "";
-    public String S3KeySecret    { get; set; } = "";
-
-
+    public String S3Url       { get; set; } = "";
+    public String S3KeySecret { get; set; } = "";
 }
\ No newline at end of file
diff --git a/csharp/App/Backend/DataTypes/Methods/Installation.cs b/csharp/App/Backend/DataTypes/Methods/Installation.cs
index f3c89995d..efbbf221a 100644
--- a/csharp/App/Backend/DataTypes/Methods/Installation.cs
+++ b/csharp/App/Backend/DataTypes/Methods/Installation.cs
@@ -142,7 +142,7 @@ public static class ExoCmd
                                                     + " -O text")
             .ExecuteBufferedAsync();
 
-        return   preParse.StandardOutput.Split("\t")[2] + ";" + preParse.StandardOutput.Split("\t")[3];
+        return $"{preParse.StandardOutput.Split("\t")[2]};{preParse.StandardOutput.Split("\t")[3]}";
     }
 
     public static async void RevokeKey(this Installation installation)
diff --git a/csharp/App/Backend/db.sqlite b/csharp/App/Backend/db.sqlite
index b553a59036466d5f3c87ac9d2b548a3dbde7127c..48f4df21f777348630c05fc75e94b0c88f85bb4d 100644
GIT binary patch
delta 191
zcmZo@P;6*WoFL5@Fj2;tHGo0Sd&0()rSln`Hghe==VUxHxoYJJ!Nx*H0eN0Qe|>g#
zT?SnyhUCfSs|qDDN=gcft@QPa6LT{2a}#q@GmA3w(o^#$CteYDbB*vfF*8ZDOiME}
zN=r#gG%+wwOf)w!vM@EZPBZc@aSr!0arJO3EGhFa%FZuIsq{1`Hx16pO7RE_aCCG@
lNp>;L%(iGYUEOZFnh}VZfS4JGS%8=oh}pKAu4X?y1prj!Km`B*

delta 169
zcmZo@P;6*WoFL8UH&Mo!)sI0hUTR~?()o<4o4FR`b26@<T($DV<cTY%#QS78TRKG<
z2Sp@#mwWiS7^j&ghUO<4XO_E0_$OH;nOhi`C0Zt0T3RF-CMPB*n;52;8(XK8xOrDr
zCKVNg<m7v0yIXj<=jG-b1e%7pWM}4vW;z?kn|hWNW*P>jHk+<)H(kvL#7scU48$xz
P%nHP8+f7%qpPm8$JqkMZ