mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed renamed OID to id in json response.

This commit is contained in:
kay.one 2013-02-17 19:18:25 -08:00
parent c904c6e085
commit 6c944758ed
8 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs
View File

@ -168,12 +168,12 @@ namespace NzbDrone.Core.Test.Datastore
}
}
public class UnknownType : BaseRepositoryModel
public class UnknownType : ModelBase
{
public string Field1 { get; set; }
}
public class NestedModel : BaseRepositoryModel
public class NestedModel : ModelBase
{
public NestedModel()
{
@ -183,12 +183,12 @@ namespace NzbDrone.Core.Test.Datastore
public List<NestedModel> List { get; set; }
}
public class ParentModel : BaseRepositoryModel
public class ParentModel : ModelBase
{
public ChildModel Child { get; set; }
}
public class ChildModel : BaseRepositoryModel
public class ChildModel : ModelBase
{
public String A { get; set; }

2
NzbDrone.Core.Test/Datastore/SimpleRepositoryFixture.cs
View File

@ -9,7 +9,7 @@ using NzbDrone.Core.Test.Framework;
namespace NzbDrone.Core.Test.Datastore
{
public class SampleType : BaseRepositoryModel
public class SampleType : ModelBase
{
public string Name { get; set; }
public string Tilte { get; set; }

2
NzbDrone.Core/Datastore/BasicRepository.cs
View File

@ -11,7 +11,7 @@ namespace NzbDrone.Core.Datastore
void Delete(int id);
}
public class BasicRepository<TModel> : IBasicRepository<TModel> where TModel : BaseRepositoryModel, new()
public class BasicRepository<TModel> : IBasicRepository<TModel> where TModel : ModelBase, new()
{
public BasicRepository(IObjectDatabase objectDatabase)
{

4
NzbDrone.Core/Datastore/BaseRepositoryModel.cs → NzbDrone.Core/Datastore/ModelBase.cs
View File

@ -1,10 +1,12 @@
using System.Linq;
using Newtonsoft.Json;
namespace NzbDrone.Core.Datastore
{
public abstract class BaseRepositoryModel
public abstract class ModelBase
{
[PetaPoco.Ignore]
[JsonProperty(PropertyName = "id")]
public int OID { get; set; }
}
}

26
NzbDrone.Core/Datastore/SiaqodbProxy.cs
View File

@ -8,12 +8,12 @@ namespace NzbDrone.Core.Datastore
public interface IObjectDatabase : IDisposable
{
IEnumerable<T> AsQueryable<T>();
T Insert<T>(T obj) where T : BaseRepositoryModel;
T Update<T>(T obj) where T : BaseRepositoryModel;
IList<T> InsertMany<T>(IList<T> objects) where T : BaseRepositoryModel;
IList<T> UpdateMany<T>(IList<T> objects) where T : BaseRepositoryModel;
void Delete<T>(T obj) where T : BaseRepositoryModel;
void DeleteMany<T>(IEnumerable<T> objects) where T : BaseRepositoryModel;
T Insert<T>(T obj) where T : ModelBase;
T Update<T>(T obj) where T : ModelBase;
IList<T> InsertMany<T>(IList<T> objects) where T : ModelBase;
IList<T> UpdateMany<T>(IList<T> objects) where T : ModelBase;
void Delete<T>(T obj) where T : ModelBase;
void DeleteMany<T>(IEnumerable<T> objects) where T : ModelBase;
}
public class SiaqodbProxy : IObjectDatabase
@ -35,7 +35,7 @@ namespace NzbDrone.Core.Datastore
return _db.Cast<T>();
}
public T Insert<T>(T obj) where T : BaseRepositoryModel
public T Insert<T>(T obj) where T : ModelBase
{
if (obj.OID != 0)
{
@ -46,7 +46,7 @@ namespace NzbDrone.Core.Datastore
return obj;
}
public T Update<T>(T obj) where T : BaseRepositoryModel
public T Update<T>(T obj) where T : ModelBase
{
if (obj.OID == 0)
{
@ -57,23 +57,23 @@ namespace NzbDrone.Core.Datastore
return obj;
}
public IList<T> InsertMany<T>(IList<T> objects) where T : BaseRepositoryModel
public IList<T> InsertMany<T>(IList<T> objects) where T : ModelBase
{
return DoMany(objects, Insert);
}
public IList<T> UpdateMany<T>(IList<T> objects) where T : BaseRepositoryModel
public IList<T> UpdateMany<T>(IList<T> objects) where T : ModelBase
{
return DoMany(objects, Update);
}
public void Delete<T>(T obj) where T : BaseRepositoryModel
public void Delete<T>(T obj) where T : ModelBase
{
_db.Delete(obj);
}
public void DeleteMany<T>(IEnumerable<T> objects) where T : BaseRepositoryModel
public void DeleteMany<T>(IEnumerable<T> objects) where T : ModelBase
{
foreach (var o in objects)
{
@ -81,7 +81,7 @@ namespace NzbDrone.Core.Datastore
}
}
private IList<T> DoMany<T>(IEnumerable<T> objects, Func<T, T> function) where T : BaseRepositoryModel
private IList<T> DoMany<T>(IEnumerable<T> objects, Func<T, T> function) where T : ModelBase
{
return objects.Select(function).ToList();
}

2
NzbDrone.Core/Helpers/XElementHelper.cs
View File

@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Xml.Linq;
namespace NzbDrone.Core.Helpers

2
NzbDrone.Core/NzbDrone.Core.csproj
View File

@ -251,7 +251,7 @@
</Compile>
<Compile Include="Constants.cs" />
<Compile Include="ContainerExtentions.cs" />
<Compile Include="Datastore\BaseRepositoryModel.cs" />
<Compile Include="Datastore\ModelBase.cs" />
<Compile Include="Datastore\BasicRepository.cs" />
<Compile Include="Datastore\ConnectionFactory.cs" />
<Compile Include="Datastore\ObjectDbFactory.cs" />

2
NzbDrone.Core/RootFolders/RootFolder.cs
View File

@ -4,7 +4,7 @@ using Sqo.Attributes;
namespace NzbDrone.Core.RootFolders
{
public class RootFolder : BaseRepositoryModel
public class RootFolder : ModelBase
{
public string Path { get; set; }