refactor db access

HanyadikHetVan/Services/PauseService.cs

@@ -1,5 +1,6 @@
-using HanyadikHetVan.Data.Entities;
-using HanyadikHetVan.Interface;
+using HanyadikHetVan.Data;
+using HanyadikHetVan.Data.Entities;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,29 +10,32 @@ namespace HanyadikHetVan.Services
 {
     public class PauseService
     {
-        private readonly IRepository<Pause> _pause;
+        private readonly ApplicationDbContext _dbContext;
 
-        public PauseService(IRepository<Pause> pause)
+        public PauseService(ApplicationDbContext dbContext)
         {
-            _pause = pause ?? throw new ArgumentNullException(nameof(pause));
+            _dbContext = dbContext ?? throw new ArgumentNullException(nameof(dbContext));
         }
 
         public IEnumerable<Pause> GetAllPauses()
         {
-            return _pause.GetAll().ToList();
+            return _dbContext.Pauses.Include(x => x.WeeklyTimeSpan).ToList();
         }
 
         public async Task<Pause> AddPause(Pause pause)
         {
-            return await _pause.Create(pause);
+            var obj = await _dbContext.Pauses.AddAsync(pause);
+            _dbContext.SaveChanges();
+            return obj.Entity;
         }
 
         public bool DeletePause(int pauseId)
         {
             try
             {
-                var item = _pause.GetAll().Where(x => x.Id == pauseId).FirstOrDefault();
-                _pause.Delete(item);
+                var item = _dbContext.Pauses.Where(x => x.Id == pauseId).FirstOrDefault();
+                _dbContext.Pauses.Remove(item);
+                _dbContext.SaveChanges();
                 return true;
             }
             catch (Exception)
@@ -44,10 +48,11 @@ namespace HanyadikHetVan.Services
         {
             try
             {
-                var DataList = _pause.GetAll().ToList();
+                var DataList = _dbContext.Pauses.ToList();
                 foreach (var item in DataList)
                 {
-                    _pause.Update(item);
+                    _dbContext.Pauses.Update(item);
+                    _dbContext.SaveChanges();
                 }
                 return true;
             }

HanyadikHetVan/Services/WeeklyTimeSpanService.cs

@@ -1,7 +1,6 @@
-using HanyadikHetVan.Data.Entities;
-using HanyadikHetVan.Interface;
+using HanyadikHetVan.Data;
+using HanyadikHetVan.Data.Entities;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,44 +10,47 @@ namespace HanyadikHetVan.Services
 {
     public class WeeklyTimeSpanService
     {
-        private readonly IRepository<WeeklyTimeSpan> _weeklytimespan;
+        private readonly ApplicationDbContext _dbContext;
 
-        public WeeklyTimeSpanService(IRepository<WeeklyTimeSpan> weeklytimespan)
+        public WeeklyTimeSpanService(ApplicationDbContext dbContext)
         {
-            _weeklytimespan = weeklytimespan ?? throw new ArgumentNullException(nameof(weeklytimespan));
+            _dbContext = dbContext ?? throw new ArgumentNullException(nameof(dbContext));
         }
 
         public IEnumerable<WeeklyTimeSpan> GetAllWeeklyTimeSpans()
         {
-            return _weeklytimespan.GetAll().ToList();
+            return _dbContext.WeeklyTimeSpans.Include(x => x.Pauses).ToList();
         }
 
         public WeeklyTimeSpan GetWeeklyTimeSpan(int weeklytimespanId)
         {
-            return _weeklytimespan.GetAll().Where(x => x.Id == weeklytimespanId).FirstOrDefault();
+            return _dbContext.WeeklyTimeSpans.Include(x => x.Pauses).Where(x => x.Id == weeklytimespanId).FirstOrDefault();
         }
 
         public ICollection<Pause> GetPausesOfWeeklyTimeSpan(int weeklytimespanId)
         {
-            return _weeklytimespan.GetAll().Where(x => x.Id == weeklytimespanId).FirstOrDefault().Pauses;
+            return _dbContext.WeeklyTimeSpans.Include(x => x.Pauses).Where(x => x.Id == weeklytimespanId).FirstOrDefault().Pauses;
         }
 
         public IEnumerable<WeeklyTimeSpan> GetWeeklyTimeSpanByStartdate(DateTime startTime)
         {
-            return _weeklytimespan.GetAll().Where(x => x.Startdate.Date.Equals(startTime.Date)).ToList();
+            return _dbContext.WeeklyTimeSpans.Include(x => x.Pauses).Where(x => x.Startdate.Date.Equals(startTime.Date)).ToList();
         }
 
         public async Task<WeeklyTimeSpan> AddWeeklyTimeSpan(WeeklyTimeSpan weeklytimespan)
         {
-            return await _weeklytimespan.Create(weeklytimespan);
+            var obj = await _dbContext.WeeklyTimeSpans.AddAsync(weeklytimespan);
+            _dbContext.SaveChanges();
+            return obj.Entity;
         }
 
         public bool DeleteWeeklyTimeSpan(int weeklytimespanId)
         {
             try
             {
-                var item = _weeklytimespan.GetAll().Where(x => x.Id == weeklytimespanId).FirstOrDefault();
-                _weeklytimespan.Delete(item);
+                var item = _dbContext.WeeklyTimeSpans.Where(x => x.Id == weeklytimespanId).FirstOrDefault();
+                _dbContext.WeeklyTimeSpans.Remove(item);
+                _dbContext.SaveChanges();
                 return true;
             }
             catch (Exception)
@@ -61,10 +63,11 @@ namespace HanyadikHetVan.Services
         {
             try
             {
-                var DataList = _weeklytimespan.GetAll().ToList();
+                var DataList = _dbContext.WeeklyTimeSpans.ToList();
                 foreach (var item in DataList)
                 {
-                    _weeklytimespan.Update(item);
+                    _dbContext.WeeklyTimeSpans.Update(item);
+                    _dbContext.SaveChanges();
                 }
                 return true;
             }