Refactoring

FoodsharingSiegen.Server/Data/Service/UserService.cs

@@ -44,7 +44,7 @@ namespace FoodsharingSiegen.Server.Data.Service
             try
             {
                 if (await Context.Users!.AnyAsync(x => x.Mail.ToLower().Equals(user.Mail.ToLower())))
-                    return new OperationResult<User>(new Exception("Diese E-Mail Adresse wird bereits verwendet"));
+                    return new(new Exception("Diese E-Mail Adresse wird bereits verwendet"));
 
                 user.Created = DateTime.UtcNow;
 
@@ -54,15 +54,15 @@ namespace FoodsharingSiegen.Server.Data.Service
                 await Context.Users!.AddAsync(user);
 
                 var saveResult = await Context.SaveChangesAsync();
-                if (saveResult == 0) return new OperationResult<User>(new Exception("Fehler bei der Registrierung"));
+                if (saveResult == 0) return new(new Exception("Fehler bei der Registrierung"));
 
                 await AuditService.Insert(AuditType.CreateUser, user.Mail);
 
-                return new OperationResult<User>(user);
+                return new(user);
             }
             catch (Exception e)
             {
-                return new OperationResult<User>(e);
+                return new(e);
             }
         }
 
@@ -80,11 +80,11 @@ namespace FoodsharingSiegen.Server.Data.Service
             try
             {
                 var users = await Context.Users!.AsNoTracking().ToListAsync();
-                return new OperationResult<List<User>>(users);
+                return new(users);
             }
             catch (Exception e)
             {
-                return new OperationResult<List<User>>(e);
+                return new(e);
             }
         }
 
@@ -102,7 +102,7 @@ namespace FoodsharingSiegen.Server.Data.Service
             try
             {
                 var user = await Context.Users!.Include(x => x.Interactions).FirstOrDefaultAsync(x => x.Id == userId);
-                if (user == null) return new OperationResult(new Exception("User not found"));
+                if (user == null) return new(new Exception("User not found"));
 
                 // Interaktionen vom aktuellen Nutzer übernehmen
                 if(CurrentUser?.Id != null)
@@ -118,13 +118,13 @@ namespace FoodsharingSiegen.Server.Data.Service
                 Context.Users?.Remove(user);
                 var saveR = await Context.SaveChangesAsync();
 
-                if (saveR < 1) return new OperationResult(new Exception("Fehler beim Löschen"));
+                if (saveR < 1) return new(new Exception("Fehler beim Löschen"));
                 await AuditService.Insert(AuditType.RemoveUser, user.Mail);
-                return new OperationResult();
+                return new();
             }
             catch (Exception e)
             {
-                return new OperationResult(e);
+                return new(e);
             }
         }
 
@@ -142,22 +142,22 @@ namespace FoodsharingSiegen.Server.Data.Service
             try
             {
                 var entityUser = await Context.Users!.FirstOrDefaultAsync(x => x.Id == user.Id);
-                if (entityUser == null) return new OperationResult(new Exception("User not found"));
+                if (entityUser == null) return new(new Exception("User not found"));
 
                 entityUser.Password = user.Password;
 
                 var saveR = await Context.SaveChangesAsync();
 
-                if (saveR < 1) return new OperationResult(new Exception("Fehler beim Speichern"));
+                if (saveR < 1) return new(new Exception("Fehler beim Speichern"));
 
                 var auditData = CurrentUser?.Id == user.Id ? "sich selbst" : user.Mail;
                 await AuditService.Insert(AuditType.SetUserPassword, auditData);
 
-                return new OperationResult();
+                return new();
             }
             catch (Exception e)
             {
-                return new OperationResult(e);
+                return new(e);
             }
         }
 
@@ -175,7 +175,7 @@ namespace FoodsharingSiegen.Server.Data.Service
             try
             {
                 var entityUser = await Context.Users!.FirstOrDefaultAsync(x => x.Id == user.Id);
-                if (entityUser == null) return new OperationResult(new Exception("User not found"));
+                if (entityUser == null) return new(new Exception("User not found"));
 
                 if (entityUser.Mail != user.Mail ||
                     entityUser.Verified != user.Verified ||
@@ -192,17 +192,17 @@ namespace FoodsharingSiegen.Server.Data.Service
                 entityUser.Network = user.Network;
 
                 if (!Context.HasChanges())
-                    return new OperationResult(new Exception("Nichts zum Speichern gefunden"));
+                    return new(new Exception("Nichts zum Speichern gefunden"));
 
                 var saveR = await Context.SaveChangesAsync();
 
-                if (saveR < 1) return new OperationResult(new Exception("Fehler beim Speichern"));
+                if (saveR < 1) return new(new Exception("Fehler beim Speichern"));
                 await AuditService.Insert(AuditType.UpdateUser, user.Mail);
-                return new OperationResult();
+                return new();
             }
             catch (Exception e)
             {
-                return new OperationResult(e);
+                return new(e);
             }
         }