Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk

csharp/App/Backend/Controllers/Controller.cs

@@ -1,14 +1,14 @@
 using System.Net;
 using System.Text;
-using Innovenergy.Backend.Database;
-using Innovenergy.Backend.Model;
-using Innovenergy.Backend.Model.Relations;
-using Innovenergy.Backend.Utils;
+using InnovEnergy.App.Backend.Database;
+using InnovEnergy.App.Backend.Model;
+using InnovEnergy.App.Backend.Model.Relations;
+using InnovEnergy.App.Backend.Utils;
 using InnovEnergy.Lib.Utils;
 using Microsoft.AspNetCore.Mvc;
 using HttpContextAccessor = Microsoft.AspNetCore.Http.HttpContextAccessor;
 
-namespace Innovenergy.Backend.Controllers;
+namespace InnovEnergy.App.Backend.Controllers;
 
 [ApiController]
 [Route("api/")]
@@ -174,8 +174,7 @@ public class Controller
         using var db = Db.Connect();
 
         var folders = db
-                     .GetDirectlyAccessibleFolders(caller) 
-                     .Do(f => f.ParentId = 0) // ReSharper disable once AccessToDisposedClosure
+                     .GetDirectlyAccessibleFolders(caller)  // ReSharper disable once AccessToDisposedClosure
                      .Select(f => PopulateChildren(db, f));
         
         var installations = db.GetDirectlyAccessibleInstallations(caller);
@@ -185,6 +184,25 @@ public class Controller
               .ToList(); // important!
     }
 
+    [Returns<TreeNode[]>]  // assuming swagger knows about arrays but not lists (JSON)
+    [Returns(HttpStatusCode.Unauthorized)]
+    [HttpGet($"{nameof(GetAllFoldersAndInstallations)}/")]
+    public Object GetAllFoldersAndInstallations()
+    {
+        var caller = GetCaller();
+        if (caller == null)
+            return new HttpResponseMessage(HttpStatusCode.Unauthorized);
+
+        using var db = Db.Connect();
+
+        var folders       = db.GetAllAccessibleFolders(caller) as IEnumerable<TreeNode>;
+        var installations = db.GetAllAccessibleInstallations(caller);
+        
+        return folders
+              .Concat(installations)
+              .ToList();  // important!
+    }
+    
     private static Folder PopulateChildren(Db db, Folder folder, HashSet<Int64>? hs = null)
     {
         // TODO: remove cycle detector

csharp/App/Backend/Controllers/Credentials.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace Innovenergy.Backend.Controllers;
+namespace InnovEnergy.App.Backend.Controllers;
 
 [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public record Credentials(String Username, String Password);

csharp/App/Backend/Controllers/ReturnsAttribute.cs

@@ -1,7 +1,7 @@
 using System.Net;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Innovenergy.Backend.Controllers;
+namespace InnovEnergy.App.Backend.Controllers;
 
 public class ReturnsAttribute : ProducesResponseTypeAttribute
 {

csharp/App/Backend/Database/Db.cs

@@ -1,11 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
-using Innovenergy.Backend.Model;
-using Innovenergy.Backend.Model.Relations;
-using Innovenergy.Backend.Utils;
+using InnovEnergy.App.Backend.Model;
+using InnovEnergy.App.Backend.Model.Relations;
+using InnovEnergy.App.Backend.Utils;
 using InnovEnergy.Lib.Utils;
 using SQLite;
 
-namespace Innovenergy.Backend.Database;
+namespace InnovEnergy.App.Backend.Database;
 
 public partial class Db : IDisposable
 {
@@ -97,8 +97,6 @@ public partial class Db : IDisposable
         return direct.Concat(fromFolders);
     }
     
-
-    
   
     public IEnumerable<Folder> GetAllAccessibleFolders(User user)
     {
@@ -113,7 +111,8 @@ public partial class Db : IDisposable
               .Where(r => r.UserId == user.Id)
               .Select(r => r.InstallationId)
               .Select(GetInstallationById)
-              .NotNull();
+              .NotNull()
+              .Do(i => i.ParentId = 0);  // hide inaccessible parents from calling user
     }
     
     public IEnumerable<Folder> GetDirectlyAccessibleFolders(User user)
@@ -122,7 +121,8 @@ public partial class Db : IDisposable
               .Where(r => r.UserId == user.Id)
               .Select(r => r.FolderId)
               .Select(GetFolderById)
-              .NotNull();
+              .NotNull()
+              .Do(i => i.ParentId = 0);  // hide inaccessible parents from calling user;
     }
     
     public Result AddToAccessibleInstallations(Int64 userId, Int64 updatedInstallationId)

csharp/App/Backend/Database/Fake.cs

@@ -1,6 +1,6 @@
-using Innovenergy.Backend.Model.Relations;
+using InnovEnergy.App.Backend.Model.Relations;
 
-namespace Innovenergy.Backend.Database;
+namespace InnovEnergy.App.Backend.Database;
 
 public partial class Db
 {

csharp/App/Backend/Database/Folder.cs

@@ -1,9 +1,9 @@
-using Innovenergy.Backend.Model;
-using Innovenergy.Backend.Utils;
+using InnovEnergy.App.Backend.Model;
+using InnovEnergy.App.Backend.Utils;
 using InnovEnergy.Lib.Utils;
 using SQLite;
 
-namespace Innovenergy.Backend.Database;
+namespace InnovEnergy.App.Backend.Database;
 
 public partial class Db
 {

csharp/App/Backend/Database/Installation.cs

@@ -1,8 +1,8 @@
-using Innovenergy.Backend.Model;
-using Innovenergy.Backend.Utils;
+using InnovEnergy.App.Backend.Model;
+using InnovEnergy.App.Backend.Utils;
 using SQLite;
 
-namespace Innovenergy.Backend.Database;
+namespace InnovEnergy.App.Backend.Database;
 
 public partial class Db
 {

csharp/App/Backend/Database/User.cs

@@ -2,18 +2,17 @@ using System.Diagnostics.CodeAnalysis;
 using System.Net.Mail;
 using System.Security.Cryptography;
 using System.Text;
-using System.Text.Json;
 using System.Text.Json.Nodes;
 using Flurl.Http;
-using Innovenergy.Backend.Model;
-using Innovenergy.Backend.Utils;
+using InnovEnergy.App.Backend.Model;
+using InnovEnergy.App.Backend.Utils;
 using InnovEnergy.Lib.Utils;
 using SQLite;
 
 #pragma warning disable CS0472
 #pragma warning disable CS8602
 
-namespace Innovenergy.Backend.Database;
+namespace InnovEnergy.App.Backend.Database;
 
 public partial class Db
 {

csharp/App/Backend/Database/User2Folder.cs

@@ -1,7 +1,7 @@
-using Innovenergy.Backend.Model.Relations;
+using InnovEnergy.App.Backend.Model.Relations;
 using SQLite;
 
-namespace Innovenergy.Backend.Database;
+namespace InnovEnergy.App.Backend.Database;
 
 public partial class Db
 {

csharp/App/Backend/Database/User2Installation.cs

@@ -1,7 +1,7 @@
-using Innovenergy.Backend.Model.Relations;
+using InnovEnergy.App.Backend.Model.Relations;
 using SQLite;
 
-namespace Innovenergy.Backend.Database;
+namespace InnovEnergy.App.Backend.Database;
 
 public partial class Db
 {

csharp/App/Backend/HeaderFilter.cs

@@ -1,7 +1,7 @@
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace Innovenergy.Backend;
+namespace InnovEnergy.App.Backend;
 
 /// <summary>
 /// This is for convenient testing! Todo throw me out?

csharp/App/Backend/Model/Folder.cs

@@ -1,4 +1,4 @@
-namespace Innovenergy.Backend.Model;
+namespace InnovEnergy.App.Backend.Model;
 
 public class Folder : TreeNode
 {

csharp/App/Backend/Model/Installation.cs

@@ -1,4 +1,4 @@
-namespace Innovenergy.Backend.Model;
+namespace InnovEnergy.App.Backend.Model;
 
 
 public class Installation : TreeNode

csharp/App/Backend/Model/Relations/Relation.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using SQLite;
 
-namespace Innovenergy.Backend.Model.Relations;
+namespace InnovEnergy.App.Backend.Model.Relations;
 
 public abstract class Relation<L,R>
 {

csharp/App/Backend/Model/Relations/Session.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace Innovenergy.Backend.Model.Relations;
+namespace InnovEnergy.App.Backend.Model.Relations;
 
 public class Session : Relation<String, Int64>
 {

csharp/App/Backend/Model/Relations/User2Folder.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace Innovenergy.Backend.Model.Relations;
+namespace InnovEnergy.App.Backend.Model.Relations;
 
 internal class User2Folder : Relation<Int64, Int64>
 {

csharp/App/Backend/Model/Relations/User2Installation.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace Innovenergy.Backend.Model.Relations;
+namespace InnovEnergy.App.Backend.Model.Relations;
 
 internal class User2Installation : Relation<Int64, Int64>
 {

csharp/App/Backend/Model/TreeNode.Equality.cs

@@ -1,12 +1,13 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace Innovenergy.Backend.Model;
+namespace InnovEnergy.App.Backend.Model;
 
 public abstract partial class TreeNode
 {
+    // Note: Only consider Id, but not ParentId for TreeNode equality checks
     protected Boolean Equals(TreeNode other)
     {
-        return Id == other.Id && ParentId == other.ParentId;
+        return Id == other.Id;
     }
 
     public override Boolean Equals(Object? obj)
@@ -17,8 +18,5 @@ public abstract partial class TreeNode
     }
 
     [SuppressMessage("ReSharper", "NonReadonlyMemberInGetHashCode")]
-    public override Int32 GetHashCode()
-    {
-        return HashCode.Combine(Id, ParentId);
-    }
+    public override Int32 GetHashCode() => Id.GetHashCode();
 }

csharp/App/Backend/Model/TreeNode.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace Innovenergy.Backend.Model;
+namespace InnovEnergy.App.Backend.Model;
 
 public abstract partial class TreeNode
 {

csharp/App/Backend/Model/User.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace Innovenergy.Backend.Model;
+namespace InnovEnergy.App.Backend.Model;
 
 public class User : TreeNode
 {

csharp/App/Backend/Program.cs

@@ -1,7 +1,7 @@
-using Innovenergy.Backend.Database;
+using InnovEnergy.App.Backend.Database;
 using Microsoft.OpenApi.Models;
 
-namespace Innovenergy.Backend;
+namespace InnovEnergy.App.Backend;
 
 public static class Program
 {

csharp/App/Backend/Utils/Crypto.cs

@@ -1,6 +1,6 @@
 using System.Security.Cryptography;
 
-namespace Innovenergy.Backend.Utils;
+namespace InnovEnergy.App.Backend.Utils;
 
 public static class Crypto
 {

csharp/App/Backend/Utils/Result.cs

@@ -1,4 +1,4 @@
-namespace Innovenergy.Backend.Utils;
+namespace InnovEnergy.App.Backend.Utils;
 
 public class Result
 {