From 35bfdc218336588375e33d397ac85bd10a75b7b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?= <sebastien.andre@arolla.fr>
Date: Tue, 12 Nov 2019 22:24:42 +0100
Subject: [PATCH] Change ioc setting to Singleton for LiteDbProvider

---
 Back/skydiveLogs-api.Data/AircraftRepository.cs | 11 ++---------
 Back/skydiveLogs-api.Data/DropZoneRepository.cs | 10 ++--------
 Back/skydiveLogs-api.Data/GearRepository.cs     | 10 ++--------
 Back/skydiveLogs-api.Data/JumpRepository.cs     | 11 ++---------
 Back/skydiveLogs-api.Data/JumpTypeRepository.cs | 11 +++--------
 Back/skydiveLogs-api.Ioc/IocService.cs          |  2 +-
 6 files changed, 12 insertions(+), 43 deletions(-)

diff --git a/Back/skydiveLogs-api.Data/AircraftRepository.cs b/Back/skydiveLogs-api.Data/AircraftRepository.cs
index 22df8ef..8d638e9 100644
--- a/Back/skydiveLogs-api.Data/AircraftRepository.cs
+++ b/Back/skydiveLogs-api.Data/AircraftRepository.cs
@@ -19,21 +19,14 @@ namespace skydiveLogs_api.Data
 
         public IEnumerable<Aircraft> GetAll()
         {
-            var results = _col.FindAll().ToList();
-            _dataProvider.Close();
-
-            return results;
+            return _col.FindAll().ToList();
         }
 
         public Aircraft GetById(int id)
         {
-            var result = _col.FindById(new BsonValue(id));
-            _dataProvider.Close();
-
-            return result;
+            return _col.FindById(new BsonValue(id));
         }
 
-
         private readonly IDataProvider _dataProvider;
 
         private readonly LiteCollection<Aircraft> _col;
diff --git a/Back/skydiveLogs-api.Data/DropZoneRepository.cs b/Back/skydiveLogs-api.Data/DropZoneRepository.cs
index a8b6c43..8528ead 100644
--- a/Back/skydiveLogs-api.Data/DropZoneRepository.cs
+++ b/Back/skydiveLogs-api.Data/DropZoneRepository.cs
@@ -19,18 +19,12 @@ namespace skydiveLogs_api.Data
 
         public IEnumerable<DropZone> GetAll()
         {
-            var results = _col.FindAll().ToList();
-            _dataProvider.Close();
-
-            return results;
+            return _col.FindAll().ToList();
         }
 
         public DropZone GetById(int id)
         {
-            var result = _col.FindById(new BsonValue(id));
-            _dataProvider.Close();
-
-            return result;
+            return _col.FindById(new BsonValue(id));
         }
 
         private readonly IDataProvider _dataProvider;
diff --git a/Back/skydiveLogs-api.Data/GearRepository.cs b/Back/skydiveLogs-api.Data/GearRepository.cs
index 2eab966..297443a 100644
--- a/Back/skydiveLogs-api.Data/GearRepository.cs
+++ b/Back/skydiveLogs-api.Data/GearRepository.cs
@@ -19,18 +19,12 @@ namespace skydiveLogs_api.Data
 
         public IEnumerable<Gear> GetAll()
         {
-            var results = _col.FindAll().ToList();
-            _dataProvider.Close();
-
-            return results;
+            return _col.FindAll().ToList();
         }
 
         public Gear GetById(int id)
         {
-            var result = _col.FindById(new BsonValue(id));
-            _dataProvider.Close();
-
-            return result;
+            return _col.FindById(new BsonValue(id));
         }
 
         private readonly IDataProvider _dataProvider;
diff --git a/Back/skydiveLogs-api.Data/JumpRepository.cs b/Back/skydiveLogs-api.Data/JumpRepository.cs
index 3309366..d6a344a 100644
--- a/Back/skydiveLogs-api.Data/JumpRepository.cs
+++ b/Back/skydiveLogs-api.Data/JumpRepository.cs
@@ -19,18 +19,12 @@ namespace skydiveLogs_api.Data
 
         public IEnumerable<Jump> GetAll()
         {
-            var results = _col.FindAll().ToList();
-            _dataProvider.Close();
-
-            return results;
+            return _col.FindAll().ToList();
         }
 
         public Jump GetById(int id)
         {
-            var result = _col.FindById(new BsonValue(id));
-            _dataProvider.Close();
-
-            return result;
+            return _col.FindById(new BsonValue(id));
         }
 
         public bool AddJump(Jump newJump)
@@ -40,7 +34,6 @@ namespace skydiveLogs_api.Data
             try
             {
                 _col.Insert(newJump);
-                _dataProvider.Close();
             }
             catch
             {
diff --git a/Back/skydiveLogs-api.Data/JumpTypeRepository.cs b/Back/skydiveLogs-api.Data/JumpTypeRepository.cs
index d2bf8f4..2c6a25d 100644
--- a/Back/skydiveLogs-api.Data/JumpTypeRepository.cs
+++ b/Back/skydiveLogs-api.Data/JumpTypeRepository.cs
@@ -19,19 +19,14 @@ namespace skydiveLogs_api.Data
 
         public IEnumerable<JumpType> GetAll()
         {
-            var results = _col.FindAll().ToList();
-            _dataProvider.Close();
-
-            return results;
+            return _col.FindAll().ToList();
         }
 
         public JumpType GetById(int id)
         {
-            var result = _col.FindById(new BsonValue(id));
-            _dataProvider.Close();
-
-            return result;
+            return _col.FindById(new BsonValue(id));
         }
+
         private readonly IDataProvider _dataProvider;
 
         private readonly LiteCollection<JumpType> _col;
diff --git a/Back/skydiveLogs-api.Ioc/IocService.cs b/Back/skydiveLogs-api.Ioc/IocService.cs
index 497e665..5a53be6 100644
--- a/Back/skydiveLogs-api.Ioc/IocService.cs
+++ b/Back/skydiveLogs-api.Ioc/IocService.cs
@@ -32,7 +32,7 @@ namespace skydiveLogs_api.Ioc
             _services.AddScoped<Data.Interface.IGearRepository, Data.GearRepository>();
 
             string connectionString = _configuration.GetConnectionString("DefaultConnection");
-            _services.AddScoped<Data.Interface.IDataProvider>(c => new Data.LiteDbProvider(connectionString));
+            _services.AddSingleton<Data.Interface.IDataProvider>(c => new Data.LiteDbProvider(connectionString));
         }
 
         private readonly IServiceCollection _services;