From 5930a15d3a695924c2b5d8583b5ca6e517720599 Mon Sep 17 00:00:00 2001 From: Keivan Beigi Date: Tue, 12 Feb 2013 17:25:32 -0800 Subject: [PATCH] some EloqueraDb cleanup --- .../Datastore/ObjectDatabaseFixture.cs | 12 ++++++------ NzbDrone.Core/Datastore/BasicRepository.cs | 6 ++---- NzbDrone.Core/Datastore/EloqueraDb.cs | 17 +++++------------ NzbDrone.Core/Repository/Episode.cs | 6 ++---- NzbDrone.Core/Repository/Series.cs | 6 ++---- .../RootFolders/RootFolderRepository.cs | 3 +-- 6 files changed, 18 insertions(+), 32 deletions(-) diff --git a/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs b/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs index fe75c205d..34a920722 100644 --- a/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs +++ b/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs @@ -3,6 +3,7 @@ using Eloquera.Client; using FizzWare.NBuilder; using FluentAssertions; using NUnit.Framework; +using NzbDrone.Core.Datastore; using NzbDrone.Core.Repository; using NzbDrone.Core.Test.Framework; @@ -84,25 +85,26 @@ namespace NzbDrone.Core.Test.Datastore [Test] public void new_objects_should_get_id() { - testSeries.Id = Db.InsertAndGetId(testSeries); + Db.Insert(testSeries); testSeries.Id.Should().NotBe(0); } [Test] public void should_have_id_when_returned_from_database() { - testSeries.Id = Db.InsertAndGetId(testSeries); + Db.Insert(testSeries); var item = Db.AsQueryable(); item.Should().HaveCount(1); item.First().Id.Should().NotBe(0); + item.First().Id.Should().BeLessThan(100); item.First().Id.Should().Be(testSeries.Id); } [Test] public void should_be_able_to_find_object_by_id() { - testSeries.Id = Db.InsertAndGetId(testSeries); + Db.Insert(testSeries); var item = Db.AsQueryable().Single(c => c.Id == testSeries.Id); item.Id.Should().NotBe(0); @@ -116,10 +118,8 @@ namespace NzbDrone.Core.Test.Datastore } } - public class UnknownType + public class UnknownType : BaseRepositoryModel { - [ID] - public string Id; public string Field1 { get; set; } } } diff --git a/NzbDrone.Core/Datastore/BasicRepository.cs b/NzbDrone.Core/Datastore/BasicRepository.cs index a58ab04c8..cf59b867b 100644 --- a/NzbDrone.Core/Datastore/BasicRepository.cs +++ b/NzbDrone.Core/Datastore/BasicRepository.cs @@ -1,7 +1,5 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Text; namespace NzbDrone.Core.Datastore { @@ -13,7 +11,7 @@ namespace NzbDrone.Core.Datastore void Delete(long rootFolderId); } - public abstract class BasicRepository : IBasicRepository where TModel : BaseRepositoryModel, new() + public class BasicRepository : IBasicRepository where TModel : BaseRepositoryModel, new() { public BasicRepository(EloqueraDb eloqueraDb) { diff --git a/NzbDrone.Core/Datastore/EloqueraDb.cs b/NzbDrone.Core/Datastore/EloqueraDb.cs index 9e598ecb4..a71d6e14e 100644 --- a/NzbDrone.Core/Datastore/EloqueraDb.cs +++ b/NzbDrone.Core/Datastore/EloqueraDb.cs @@ -1,5 +1,4 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Linq; using Eloquera.Client; @@ -20,26 +19,20 @@ namespace NzbDrone.Core.Datastore return _db.Query(); } - public T Insert(T obj) + public T Insert(T obj) where T : BaseRepositoryModel { - //Todo: need to verify that this is properly setting the ID of T - _db.Store(obj); + obj.Id = _db.Store(obj); return obj; } - public long InsertAndGetId(T obj) - { - return _db.Store(obj); - } - - public IList InsertMany(IEnumerable objects) + public IList InsertMany(IEnumerable objects) where T : BaseRepositoryModel { return DoMany(objects, Insert); } public T Update(T obj) { - _db.Store(obj); + _db.Store(obj); return obj; } @@ -53,7 +46,7 @@ namespace NzbDrone.Core.Datastore _db.Delete(obj); } - public void DeleteMany(IEnumerable objects) where T: new() + public void DeleteMany(IEnumerable objects) where T : new() { foreach (var o in objects) { diff --git a/NzbDrone.Core/Repository/Episode.cs b/NzbDrone.Core/Repository/Episode.cs index 2c45125ab..7425c8494 100644 --- a/NzbDrone.Core/Repository/Episode.cs +++ b/NzbDrone.Core/Repository/Episode.cs @@ -1,5 +1,6 @@ using System; using Eloquera.Client; +using NzbDrone.Core.Datastore; using NzbDrone.Core.Model; using PetaPoco; @@ -7,11 +8,8 @@ namespace NzbDrone.Core.Repository { [TableName("Episodes")] [PrimaryKey("EpisodeId", autoIncrement = true)] - public class Episode + public class Episode:BaseRepositoryModel { - [ID] - public long Id; - public int EpisodeId { get; set; } public int? TvDbEpisodeId { get; set; } diff --git a/NzbDrone.Core/Repository/Series.cs b/NzbDrone.Core/Repository/Series.cs index a210a6ab4..157bf8acf 100644 --- a/NzbDrone.Core/Repository/Series.cs +++ b/NzbDrone.Core/Repository/Series.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Eloquera.Client; +using NzbDrone.Core.Datastore; using NzbDrone.Core.Model; using NzbDrone.Core.Repository.Quality; using PetaPoco; @@ -8,11 +9,8 @@ using PetaPoco; namespace NzbDrone.Core.Repository { [PrimaryKey("SeriesId", autoIncrement = false)] - public class Series + public class Series:BaseRepositoryModel { - [ID] - public long Id; - public virtual int SeriesId { get; set; } public string Title { get; set; } diff --git a/NzbDrone.Core/RootFolders/RootFolderRepository.cs b/NzbDrone.Core/RootFolders/RootFolderRepository.cs index 9d7162a87..c5929edbe 100644 --- a/NzbDrone.Core/RootFolders/RootFolderRepository.cs +++ b/NzbDrone.Core/RootFolders/RootFolderRepository.cs @@ -22,8 +22,7 @@ namespace NzbDrone.Core.RootFolders public RootFolder Add(RootFolder rootFolder) { - rootFolder.Id = EloqueraDb.InsertAndGetId(rootFolder); - return rootFolder; + return EloqueraDb.Insert(rootFolder); } } }