From c337c3dfd51583043eea6a784fb8e4ddedcb996e Mon Sep 17 00:00:00 2001
From: Gulum <gulum@rismer.de>
Date: Mon, 30 Oct 2023 22:08:02 +0100
Subject: [PATCH] Resolve all warnings

---
 GerbilManagerWebAPI/Controllers/BreedersController.cs |  4 ++--
 GerbilManagerWebAPI/Controllers/GerbilsController.cs  |  8 ++++----
 GerbilManagerWebAPI/Controllers/LittersController.cs  |  2 +-
 GerbilManagerWebAPI/DAL/GenericRepository.cs          | 10 +++++-----
 GerbilManagerWebAPI/DAL/UnitOfWork.cs                 | 11 ++++-------
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/GerbilManagerWebAPI/Controllers/BreedersController.cs b/GerbilManagerWebAPI/Controllers/BreedersController.cs
index 75db24a..5bbff92 100644
--- a/GerbilManagerWebAPI/Controllers/BreedersController.cs
+++ b/GerbilManagerWebAPI/Controllers/BreedersController.cs
@@ -64,8 +64,8 @@ namespace GerbilManagerWebAPI.Controllers
                 return NotFound();
             }
 
-            Breeder updatedBreeder = existingItem with{
-                Name = breederDto.Name
+            Breeder updatedBreeder = existingItem with {
+                Name = breederDto?.Name!
             };
 
             unitOfWork.BreederRepository.Update(updatedBreeder);
diff --git a/GerbilManagerWebAPI/Controllers/GerbilsController.cs b/GerbilManagerWebAPI/Controllers/GerbilsController.cs
index 88e27a1..46977df 100644
--- a/GerbilManagerWebAPI/Controllers/GerbilsController.cs
+++ b/GerbilManagerWebAPI/Controllers/GerbilsController.cs
@@ -79,10 +79,10 @@ namespace GerbilManagerWebAPI.Controllers
             }
 
             Gerbil updatedGerbil = existingItem with{
-                Breeder = unitOfWork.BreederRepository.GetByID(gerbilDto.Breeder),
-                Litter = unitOfWork.LitterRepository.GetByID(gerbilDto.Litter),
-                Gender = (Gender) (int) gerbilDto.Gender,
-                Name = gerbilDto.Name
+                Breeder = unitOfWork.BreederRepository.GetByID(gerbilDto?.Breeder ?? Guid.Empty),
+                Litter = unitOfWork.LitterRepository.GetByID(gerbilDto?.Litter ?? Guid.Empty),
+                Gender = (Gender) (int) gerbilDto?.Gender!,
+                Name = gerbilDto?.Name!
             };
 
             unitOfWork.GerbilRepository.Update(updatedGerbil);
diff --git a/GerbilManagerWebAPI/Controllers/LittersController.cs b/GerbilManagerWebAPI/Controllers/LittersController.cs
index b746a43..c50cc6c 100644
--- a/GerbilManagerWebAPI/Controllers/LittersController.cs
+++ b/GerbilManagerWebAPI/Controllers/LittersController.cs
@@ -81,7 +81,7 @@ namespace GerbilManagerWebAPI.Controllers
                 Strength = litterDto.Strength,
                 Father = this.unitOfWork.GerbilRepository.GetByID(litterDto.Father ?? Guid.Empty),
                 Mother = this.unitOfWork.GerbilRepository.GetByID(litterDto.Mother ?? Guid.Empty),
-                Name = litterDto.Name
+                Name = litterDto?.Name!
             };
 
             unitOfWork.LitterRepository.Update(updatedLitter);
diff --git a/GerbilManagerWebAPI/DAL/GenericRepository.cs b/GerbilManagerWebAPI/DAL/GenericRepository.cs
index 0604d4e..a09807d 100644
--- a/GerbilManagerWebAPI/DAL/GenericRepository.cs
+++ b/GerbilManagerWebAPI/DAL/GenericRepository.cs
@@ -16,8 +16,8 @@ namespace GerbilManagerWebAPI.DAL
         }
 
         public virtual IEnumerable<TEntity> Get(
-            Expression<Func<TEntity, bool>> filter = null,
-            Func<IQueryable<TEntity>, IOrderedQueryable<TEntity>> orderBy = null,
+            Expression<Func<TEntity, bool>> filter = null!,
+            Func<IQueryable<TEntity>, IOrderedQueryable<TEntity>> orderBy = null!,
             string includeProperties = "")
         {
             IQueryable<TEntity> query = dbSet;
@@ -45,7 +45,7 @@ namespace GerbilManagerWebAPI.DAL
 
         public virtual TEntity GetByID(object id)
         {
-            return dbSet.Find(id);
+            return dbSet?.Find(id)!;
         }
 
         public virtual void Insert(TEntity entity)
@@ -55,8 +55,8 @@ namespace GerbilManagerWebAPI.DAL
 
         public virtual void Delete(object id)
         {
-            TEntity entityToDelete = dbSet.Find(id);
-            Delete(entityToDelete);
+            TEntity entityToDelete = dbSet?.Find(id)!;
+            if (entityToDelete is not null) Delete(entityToDelete);
         }
 
         public virtual void Delete(TEntity entityToDelete)
diff --git a/GerbilManagerWebAPI/DAL/UnitOfWork.cs b/GerbilManagerWebAPI/DAL/UnitOfWork.cs
index 5f7297f..4128dd0 100644
--- a/GerbilManagerWebAPI/DAL/UnitOfWork.cs
+++ b/GerbilManagerWebAPI/DAL/UnitOfWork.cs
@@ -6,9 +6,9 @@ namespace GerbilManagerWebAPI.DAL
     public class UnitOfWork : IDisposable
     {
         private ApplicationContext context;
-        private GenericRepository<Gerbil> gerbilRepository;
-        private GenericRepository<Litter> litterRepository;
-        private GenericRepository<Breeder> breederRepository;
+        private GenericRepository<Gerbil> gerbilRepository = null!;
+        private GenericRepository<Litter> litterRepository = null!;
+        private GenericRepository<Breeder> breederRepository = null!;
 
         public GenericRepository<Gerbil> GerbilRepository
         {
@@ -46,10 +46,7 @@ namespace GerbilManagerWebAPI.DAL
             }
         }
 
-        public UnitOfWork(ApplicationContext context)
-        {
-            this.context = context;
-        }
+        public UnitOfWork(ApplicationContext context) => this.context = context;
 
         public void Save()
         {