From 444bc0b44f6913784e76a80f0e05fe75dc895b06 Mon Sep 17 00:00:00 2001 From: Schedel Pascal Date: Wed, 3 Jul 2024 08:01:01 +0200 Subject: [PATCH] urg --- OwnChar/Data/DataManagerActions.cs | 10 ++--- OwnChar/Data/Managers/DefaultDataManager.cs | 47 +++++++++++++-------- OwnChar/Manager/Modules/GroupsManager.cs | 3 +- 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/OwnChar/Data/DataManagerActions.cs b/OwnChar/Data/DataManagerActions.cs index 131f0ca..db4bbbe 100644 --- a/OwnChar/Data/DataManagerActions.cs +++ b/OwnChar/Data/DataManagerActions.cs @@ -2,16 +2,16 @@ public static class DataManagerActions { - public static DataManagerAction Create { get; } = new("create"); + public static DataManagerAction Get { get; } = new("create"); public static DataManagerAction Save { get; } = new("save"); public static DataManagerAction Delete { get; } = new("delete"); public static DataManagerAction Associate { get; } = new("associate"); - public static class Creation + public static class Getter { - public static DataManagerAction UserAccount { get; } = new(Create, "useraccount"); - public static DataManagerAction Group { get; } = new(Create, "group"); - public static DataManagerAction Character { get; } = new(Create, "character"); + public static DataManagerAction UserAccount { get; } = new(Get, "useraccount"); + public static DataManagerAction Group { get; } = new(Get, "group"); + public static DataManagerAction Character { get; } = new(Get, "character"); } public static class Association diff --git a/OwnChar/Data/Managers/DefaultDataManager.cs b/OwnChar/Data/Managers/DefaultDataManager.cs index 2ca84cd..eee472c 100644 --- a/OwnChar/Data/Managers/DefaultDataManager.cs +++ b/OwnChar/Data/Managers/DefaultDataManager.cs @@ -1,6 +1,5 @@ using OwnChar.Api; using OwnChar.Model; -using static System.Runtime.InteropServices.JavaScript.JSType; namespace OwnChar.Data.Managers; @@ -42,34 +41,48 @@ public class DefaultDataManager : IDataManager protected virtual bool HandleCreate(OnActionEventArgs e) { - if (e.Action != DataManagerActions.Create) + if (e.Action != DataManagerActions.Get) return false; // Character - if (e.Action == DataManagerActions.Creation.Character) + if (e.Action == DataManagerActions.Getter.Character) { - if (e.Object is not Group group || e.Parameters.Length < 1 || e.Parameters[0] is not string name) - return false; - e.Result = CreateCharacter(e.CurrentUser, name, group); - return e.Result != null; + if (e.ActionType == DataManagerActionType.Set) + { + if (e.Object is not Group group || e.Parameters.Length < 1 || e.Parameters[0] is not string name) + return false; + e.Result = CreateCharacter(e.CurrentUser, name, group); + return e.Result != null; + } } // Group - if (e.Action == DataManagerActions.Creation.Group) + if (e.Action == DataManagerActions.Getter.Group) { - if (e.Parameters.Length < 1 || e.Parameters[0] is not string name) - return false; - e.Result = CreateGroup(e.CurrentUser, name); - return e.Result != null; + if (e.ActionType == DataManagerActionType.Get) + { + if (e.Parameters.Length < 1 || e.Parameters[0] is not string name) + return false; + e.Result = CreateGroup(e.CurrentUser, name); + return e.Result != null; + } } // User - if (e.Action == DataManagerActions.Creation.UserAccount) + if (e.Action == DataManagerActions.Getter.UserAccount) { - if (e.Parameters.Length < 2 || e.Parameters[0] is not string username || e.Parameters[1] is not string password) - return false; - e.Result = CreateUserAccount(username, password); - return e.Result != null; + if (e.ActionType == DataManagerActionType.Get) + { + if (e.Parameters.Length < 2 || e.Parameters[0] is not string username || e.Parameters[1] is not string password) + return false; + e.Result = CreateUserAccount(username, password); + return e.Result != null; + } + //else + //{ + // e.Result = DataProvider.GetUserAccounts(); + // return e.Result != null; + //} } return false; diff --git a/OwnChar/Manager/Modules/GroupsManager.cs b/OwnChar/Manager/Modules/GroupsManager.cs index ddc7833..ea83c01 100644 --- a/OwnChar/Manager/Modules/GroupsManager.cs +++ b/OwnChar/Manager/Modules/GroupsManager.cs @@ -1,7 +1,6 @@ using OwnChar.Api; using OwnChar.Data; using OwnChar.Model; -using static System.Runtime.InteropServices.JavaScript.JSType; namespace OwnChar.Manager.Modules; @@ -41,7 +40,7 @@ public class GroupsManager(OwnCharManager manager) : OwnCharManagerModule(manage { ArgumentException.ThrowIfNullOrWhiteSpace(name, nameof(name)); Manager.CheckLogin(); - return Manager.DataManager.ExecuteAction(DataManagerActions.Creation.Group, DataManagerActionType.Default, Manager.CurrentUser, null, name).Result as Group; + return Manager.DataManager.ExecuteAction(DataManagerActions.Getter.Group, DataManagerActionType.Set, Manager.CurrentUser, null, name).Result as Group; } public bool DeleteGroup(Group? group)