Merge pull request #69 from LD-Reborn/feature/issue_65

Feature: Add return model to AssetsController

src/Controllers/AssetsController.cs

@@ -108,20 +108,28 @@ public class AssetsController : Controller
     }
 
     [HttpGet("Delete")]
-    public async Task<bool> Delete(string cn)
+    public async Task<AssetsDeleteResponseModel> Delete(string cn)
-    {
+    {        
-        if (cn is null) { return false; }
+        AssetsDeleteResponseModel response;
-        return await Task.Run(() =>
+        return await Task.Run(async () =>
         {
+            if (cn is null)
+            {
+                response = new AssetsDeleteResponseModel(false, AssetsDeleteErrorEnum.CnIsNull);
+                return response;
+            }
+
             try
             {
-                _ldap.DeleteAsset(cn);
+                await _ldap.DeleteAssetAsync(cn);
-                return true;
+                response = new AssetsDeleteResponseModel(true, AssetsDeleteErrorEnum.None);
             }
-            catch (Exception)
+            catch (Exception e)
             {
-                return false;
+                response = new AssetsDeleteResponseModel(false, AssetsDeleteErrorEnum.UnableToDeleteAsset, e.Message);
             }
+
+            return response;
         });
     }
 

src/Controllers/GroupsController.cs

@@ -47,11 +47,11 @@ public class GroupsController : Controller
     [HttpGet("Delete")]
     public async Task<bool> Delete(string uid)
     {
-        return await Task.Run(() =>
+        return await Task.Run(async () =>
         {
             try
             {
-                _ldap.DeleteGroup(uid);
+                await _ldap.DeleteGroupAsync(uid);
                 return true;
             }
             catch (Exception)

src/Controllers/LocationsController.cs

@@ -28,11 +28,11 @@ public class LocationsController : Controller
     public async Task<bool> Delete(string cn)
     {
         if (cn is null) { return false; }
-        return await Task.Run(() =>
+        return await Task.Run(async () =>
         {
             try
             {
-                _ldap.DeleteLocation(cn);
+                await _ldap.DeleteLocationAsync(cn);
                 return true;
             }
             catch (Exception)

src/Controllers/UsersController.cs

@@ -47,11 +47,11 @@ public class UsersController : Controller
     [HttpGet("Delete")]
     public async Task<bool> Delete(string uid)
     {
-        return await Task.Run(() =>
+        return await Task.Run(async () =>
         {
             try
             {
-                _ldap.DeleteUser(uid);
+                await _ldap.DeleteUserAsync(uid);
                 return true;
             }
             catch (Exception)

src/Models/AssetsDeleteResponseModel.cs

@@ -0,0 +1,14 @@
+public class AssetsDeleteResponseModel(bool successful, AssetsDeleteErrorEnum errorReason, string exception = "none")
+{
+    public bool Success { get; set; } = successful;
+    public AssetsDeleteErrorEnum Reason { get; set; } = errorReason;
+
+    public string? Exception { get; set; } = exception;
+}
+
+public enum AssetsDeleteErrorEnum
+{
+    None,
+    CnIsNull,
+    UnableToDeleteAsset
+}

src/Services/LdapService.cs

@@ -275,28 +275,28 @@ public async Task CreateAsset(LdapAttributeSet attributeSet)
         });
     }
 
-    public void DeleteUser(string uid)
+    public async Task DeleteUserAsync(string uid)
     {
         string dn = PrependRDN($"uid={uid}", UsersBaseDn);
-        DeleteObjectByDn(dn);
+        await DeleteObjectByDnAsync(dn);
     }
 
-    public void DeleteGroup(string cn)
+    public async Task DeleteGroupAsync(string cn)
     {
         string dn = PrependRDN($"cn={cn}", GroupsBaseDn);
-        DeleteObjectByDn(dn);
+        await DeleteObjectByDnAsync(dn);
     }
 
-    public void DeleteLocation(string cn)
+    public async Task DeleteLocationAsync(string cn)
     {
         string dn = PrependRDN($"cn={cn}", LocationsBaseDn);
-        DeleteObjectByDn(dn);
+        await DeleteObjectByDnAsync(dn);
     }
 
-    public void DeleteAsset(string cn)
+    public async Task DeleteAssetAsync(string cn)
     {
         string dn = PrependRDN($"cn={cn}", AssetsBaseDn);
-        DeleteObjectByDn(dn);
+        await DeleteObjectByDnAsync(dn);
     }
 
     public async Task UpdateUser(string uid, string attributeName, string attributeValue)
@@ -337,7 +337,7 @@ public async Task CreateAsset(LdapAttributeSet attributeSet)
         }
     }
 
-    public async void DeleteObjectByDn(string dn)
+    public async Task DeleteObjectByDnAsync(string dn)
     {
         await _conn.DeleteAsync(dn);
     }