diff --git a/Back/skydiveLogs-api.Data/GearRepository.cs b/Back/skydiveLogs-api.Data/GearRepository.cs index df68165..2eab966 100644 --- a/Back/skydiveLogs-api.Data/GearRepository.cs +++ b/Back/skydiveLogs-api.Data/GearRepository.cs @@ -11,33 +11,30 @@ namespace skydiveLogs_api.Data { public class GearRepository : IGearRepository { + public GearRepository(IDataProvider dataProvider) + { + _dataProvider = dataProvider; + _col = _dataProvider.CollOfGear; + } + public IEnumerable GetAll() { - IEnumerable result = new List(); + var results = _col.FindAll().ToList(); + _dataProvider.Close(); - using (var db = new LiteDatabase(@".\Data\MyData.db")) - { - var col = db.GetCollection("Gear"); - - result = col.FindAll().ToList(); - } - - return result; + return results; } public Gear GetById(int id) { - Gear result; - - using (var db = new LiteDatabase(@".\Data\MyData.db")) - { - var col = db.GetCollection("Gear"); - - result = col.FindById(new BsonValue(id)); - } + var result = _col.FindById(new BsonValue(id)); + _dataProvider.Close(); return result; } + private readonly IDataProvider _dataProvider; + + private readonly LiteCollection _col; } } diff --git a/Back/skydiveLogs-api.Data/JumpRepository.cs b/Back/skydiveLogs-api.Data/JumpRepository.cs index ffcd378..3309366 100644 --- a/Back/skydiveLogs-api.Data/JumpRepository.cs +++ b/Back/skydiveLogs-api.Data/JumpRepository.cs @@ -11,30 +11,24 @@ namespace skydiveLogs_api.Data { public class JumpRepository : IJumpRepository { + public JumpRepository(IDataProvider dataProvider) + { + _dataProvider = dataProvider; + _col = _dataProvider.CollOfJump; + } + public IEnumerable GetAll() { - IEnumerable result = new List(); + var results = _col.FindAll().ToList(); + _dataProvider.Close(); - using (var db = new LiteDatabase(@".\Data\MyData.db")) - { - var col = db.GetCollection("Jump"); - - result = col.FindAll().ToList(); - } - - return result; + return results; } public Jump GetById(int id) { - Jump result; - - using (var db = new LiteDatabase(@".\Data\MyData.db")) - { - var col = db.GetCollection("Jump"); - - result = col.FindById(new BsonValue(id)); - } + var result = _col.FindById(new BsonValue(id)); + _dataProvider.Close(); return result; } @@ -45,12 +39,8 @@ namespace skydiveLogs_api.Data try { - using (var db = new LiteDatabase(@".\Data\MyData.db")) - { - var col = db.GetCollection("Jump"); - - col.Insert(newJump); - } + _col.Insert(newJump); + _dataProvider.Close(); } catch { @@ -59,5 +49,9 @@ namespace skydiveLogs_api.Data return result; } + + private readonly IDataProvider _dataProvider; + + private readonly LiteCollection _col; } } diff --git a/Back/skydiveLogs-api.Data/JumpTypeRepository.cs b/Back/skydiveLogs-api.Data/JumpTypeRepository.cs index 069fd23..d2bf8f4 100644 --- a/Back/skydiveLogs-api.Data/JumpTypeRepository.cs +++ b/Back/skydiveLogs-api.Data/JumpTypeRepository.cs @@ -11,32 +11,29 @@ namespace skydiveLogs_api.Data { public class JumpTypeRepository : IJumpTypeRepository { + public JumpTypeRepository(IDataProvider dataProvider) + { + _dataProvider = dataProvider; + _col = _dataProvider.CollOfJumpType; + } + public IEnumerable GetAll() { - IEnumerable result = new List(); + var results = _col.FindAll().ToList(); + _dataProvider.Close(); - using (var db = new LiteDatabase(@".\Data\MyData.db")) - { - var col = db.GetCollection("JumpType"); - - result = col.FindAll().ToList(); - } - - return result; + return results; } public JumpType GetById(int id) { - JumpType result; - - using (var db = new LiteDatabase(@".\Data\MyData.db")) - { - var col = db.GetCollection("JumpType"); - - result = col.FindById(new BsonValue(id)); - } + var result = _col.FindById(new BsonValue(id)); + _dataProvider.Close(); return result; } + private readonly IDataProvider _dataProvider; + + private readonly LiteCollection _col; } } diff --git a/Back/skydiveLogs-api/Data/MyData.db b/Back/skydiveLogs-api/Data/MyData.db deleted file mode 100644 index 728dc0c..0000000 Binary files a/Back/skydiveLogs-api/Data/MyData.db and /dev/null differ