From 96018a5867f21f207a87aad72641a9861fe30749 Mon Sep 17 00:00:00 2001 From: ig Date: Thu, 16 Mar 2023 09:15:59 +0100 Subject: [PATCH] add Create User2Installation and User2Folder to Db --- csharp/App/Backend/Controllers/Controller.cs | 1 - csharp/App/Backend/Database/Create.cs | 10 ++++- csharp/App/Backend/Database/Db.cs | 43 +------------------- 3 files changed, 10 insertions(+), 44 deletions(-) diff --git a/csharp/App/Backend/Controllers/Controller.cs b/csharp/App/Backend/Controllers/Controller.cs index 322242871..2cb2ba46f 100644 --- a/csharp/App/Backend/Controllers/Controller.cs +++ b/csharp/App/Backend/Controllers/Controller.cs @@ -4,7 +4,6 @@ using InnovEnergy.App.Backend.DataTypes.Methods; using InnovEnergy.App.Backend.Relations; using Microsoft.AspNetCore.Mvc; using static System.Net.HttpStatusCode; -using static System.String; using Folder = InnovEnergy.App.Backend.DataTypes.Folder; using Installation = InnovEnergy.App.Backend.DataTypes.Installation; using Object = System.Object; diff --git a/csharp/App/Backend/Database/Create.cs b/csharp/App/Backend/Database/Create.cs index 875b5ddef..4eb630a82 100644 --- a/csharp/App/Backend/Database/Create.cs +++ b/csharp/App/Backend/Database/Create.cs @@ -29,10 +29,18 @@ public static partial class Db return Connection.Insert(user) > 0; } - public static Boolean Create(Session session) { return Connection.Insert(session) > 0; } + public static Boolean Create(User2Installation user2Installation) + { + return Connection.Insert(user2Installation) > 0; + } + + public static Boolean Create(User2Folder user2Folder) + { + return Connection.Insert(user2Folder) > 0; + } } \ No newline at end of file diff --git a/csharp/App/Backend/Database/Db.cs b/csharp/App/Backend/Database/Db.cs index 3e2fd815c..07bae933f 100644 --- a/csharp/App/Backend/Database/Db.cs +++ b/csharp/App/Backend/Database/Db.cs @@ -1,6 +1,5 @@ using System.Reactive.Linq; using InnovEnergy.App.Backend.DataTypes; -using InnovEnergy.App.Backend.DataTypes.Methods; using InnovEnergy.App.Backend.Relations; using InnovEnergy.Lib.Utils; using SQLite; @@ -39,10 +38,6 @@ public static partial class Db }); - var installation = Installations.First(); - UserMethods.CreateAndSaveInstallationS3ApiKey(installation); - - Observable.Interval(TimeSpan.FromDays(1)) .StartWith(0) // Do it right away (on startup) .Subscribe(Cleanup); // and then daily @@ -72,43 +67,7 @@ public static partial class Db - public static Boolean AddToAccessibleInstallations(Int64 userId, Int64 updatedInstallationId) - { - var con = new User2Installation - { - UserId = userId, - InstallationId = updatedInstallationId - }; - - try - { - Connection.Insert(con); - return true; - } - catch (Exception e) - { - return false; - } - } - - public static Boolean AddToAccessibleFolders(Int64 userId, Int64 updatedFolderId) - { - var con = new User2Folder - { - UserId = userId, - FolderId = updatedFolderId - }; - - try - { - Connection.Insert(con); - return true; - } - catch (Exception e) - { - return false; - } - } + private static void Cleanup(Int64 _)