diff --git a/Kyoo.CommonAPI/DatabaseContext.cs b/Kyoo.Database/DatabaseContext.cs similarity index 99% rename from Kyoo.CommonAPI/DatabaseContext.cs rename to Kyoo.Database/DatabaseContext.cs index 7cdbfbbe..282cb93c 100644 --- a/Kyoo.CommonAPI/DatabaseContext.cs +++ b/Kyoo.Database/DatabaseContext.cs @@ -11,7 +11,7 @@ using Kyoo.Abstractions.Models.Exceptions; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.ChangeTracking; -namespace Kyoo +namespace Kyoo.Database { /// /// The database handle used for all local repositories. diff --git a/Kyoo.CommonAPI/Extensions.cs b/Kyoo.Database/Extensions.cs similarity index 100% rename from Kyoo.CommonAPI/Extensions.cs rename to Kyoo.Database/Extensions.cs diff --git a/Kyoo.CommonAPI/Kyoo.CommonAPI.csproj b/Kyoo.Database/Kyoo.Database.csproj similarity index 85% rename from Kyoo.CommonAPI/Kyoo.CommonAPI.csproj rename to Kyoo.Database/Kyoo.Database.csproj index b60cd70a..9a64194a 100644 --- a/Kyoo.CommonAPI/Kyoo.CommonAPI.csproj +++ b/Kyoo.Database/Kyoo.Database.csproj @@ -2,9 +2,8 @@ net5.0 - Kyoo.CommonApi - Kyoo.CommonApi - Kyoo.CommonApi + Kyoo.Database + Kyoo.Database Zoe Roux https://github.com/AnonymusRaccoon/Kyoo Library diff --git a/Kyoo.Postgresql/Kyoo.Postgresql.csproj b/Kyoo.Postgresql/Kyoo.Postgresql.csproj index 04d76671..e356ba8a 100644 --- a/Kyoo.Postgresql/Kyoo.Postgresql.csproj +++ b/Kyoo.Postgresql/Kyoo.Postgresql.csproj @@ -18,7 +18,7 @@ - + diff --git a/Kyoo.Postgresql/PostgresContext.cs b/Kyoo.Postgresql/PostgresContext.cs index cb7aeba3..cbefb849 100644 --- a/Kyoo.Postgresql/PostgresContext.cs +++ b/Kyoo.Postgresql/PostgresContext.cs @@ -4,6 +4,7 @@ using System.Linq.Expressions; using System.Reflection; using EFCore.NamingConventions.Internal; using Kyoo.Abstractions.Models; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; using Npgsql; diff --git a/Kyoo.Postgresql/PostgresModule.cs b/Kyoo.Postgresql/PostgresModule.cs index 47d1e143..295faf96 100644 --- a/Kyoo.Postgresql/PostgresModule.cs +++ b/Kyoo.Postgresql/PostgresModule.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using Kyoo.Abstractions.Controllers; +using Kyoo.Database; using Microsoft.AspNetCore.Hosting; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; diff --git a/Kyoo.SqLite/Kyoo.SqLite.csproj b/Kyoo.SqLite/Kyoo.SqLite.csproj index d7e9fbc5..f689dbe8 100644 --- a/Kyoo.SqLite/Kyoo.SqLite.csproj +++ b/Kyoo.SqLite/Kyoo.SqLite.csproj @@ -18,7 +18,7 @@ - + diff --git a/Kyoo.SqLite/SqLiteContext.cs b/Kyoo.SqLite/SqLiteContext.cs index 1b549492..123de717 100644 --- a/Kyoo.SqLite/SqLiteContext.cs +++ b/Kyoo.SqLite/SqLiteContext.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq.Expressions; using System.Reflection; using Kyoo.Abstractions.Models; +using Kyoo.Database; using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; diff --git a/Kyoo.SqLite/SqLiteModule.cs b/Kyoo.SqLite/SqLiteModule.cs index 340fbc34..9a1dc76b 100644 --- a/Kyoo.SqLite/SqLiteModule.cs +++ b/Kyoo.SqLite/SqLiteModule.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using Kyoo.Abstractions.Controllers; +using Kyoo.Database; using Microsoft.AspNetCore.Hosting; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; diff --git a/Kyoo.sln b/Kyoo.sln index 1ab3ea16..701d760b 100644 --- a/Kyoo.sln +++ b/Kyoo.sln @@ -3,7 +3,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyoo", "Kyoo\Kyoo.csproj", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kyoo.Abstractions", "Kyoo.Abstractions\Kyoo.Abstractions.csproj", "{BAB2CAE1-AC28-4509-AA3E-8DC75BD59220}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kyoo.CommonAPI", "Kyoo.CommonAPI\Kyoo.CommonAPI.csproj", "{6F91B645-F785-46BB-9C4F-1EFC83E489B6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kyoo.Database", "Kyoo.Database\Kyoo.Database.csproj", "{6F91B645-F785-46BB-9C4F-1EFC83E489B6}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kyoo.Postgresql", "Kyoo.Postgresql\Kyoo.Postgresql.csproj", "{3213C96D-0BF3-460B-A8B5-B9977229408A}" EndProject diff --git a/Kyoo/Controllers/Repositories/CollectionRepository.cs b/Kyoo/Controllers/Repositories/CollectionRepository.cs index 64266be2..cdb0740a 100644 --- a/Kyoo/Controllers/Repositories/CollectionRepository.cs +++ b/Kyoo/Controllers/Repositories/CollectionRepository.cs @@ -5,6 +5,7 @@ using System.Linq.Expressions; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/EpisodeRepository.cs b/Kyoo/Controllers/Repositories/EpisodeRepository.cs index 743c2429..d31e97cc 100644 --- a/Kyoo/Controllers/Repositories/EpisodeRepository.cs +++ b/Kyoo/Controllers/Repositories/EpisodeRepository.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; using Kyoo.Abstractions.Models.Exceptions; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/GenreRepository.cs b/Kyoo/Controllers/Repositories/GenreRepository.cs index ade3225e..b791f627 100644 --- a/Kyoo/Controllers/Repositories/GenreRepository.cs +++ b/Kyoo/Controllers/Repositories/GenreRepository.cs @@ -5,6 +5,7 @@ using System.Linq.Expressions; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/LibraryItemRepository.cs b/Kyoo/Controllers/Repositories/LibraryItemRepository.cs index aedd1842..172c7ab6 100644 --- a/Kyoo/Controllers/Repositories/LibraryItemRepository.cs +++ b/Kyoo/Controllers/Repositories/LibraryItemRepository.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; using Kyoo.Abstractions.Models.Exceptions; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/LibraryRepository.cs b/Kyoo/Controllers/Repositories/LibraryRepository.cs index b50de2f3..e532d4e0 100644 --- a/Kyoo/Controllers/Repositories/LibraryRepository.cs +++ b/Kyoo/Controllers/Repositories/LibraryRepository.cs @@ -5,6 +5,7 @@ using System.Linq.Expressions; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo.CommonAPI/LocalRepository.cs b/Kyoo/Controllers/Repositories/LocalRepository.cs similarity index 99% rename from Kyoo.CommonAPI/LocalRepository.cs rename to Kyoo/Controllers/Repositories/LocalRepository.cs index 1b7c03b7..14d4cb40 100644 --- a/Kyoo.CommonAPI/LocalRepository.cs +++ b/Kyoo/Controllers/Repositories/LocalRepository.cs @@ -8,7 +8,7 @@ using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; using Kyoo.Abstractions.Models.Attributes; using Kyoo.Abstractions.Models.Exceptions; -using Kyoo.CommonApi; +using Kyoo.Api; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/PeopleRepository.cs b/Kyoo/Controllers/Repositories/PeopleRepository.cs index ede28e52..10ca820b 100644 --- a/Kyoo/Controllers/Repositories/PeopleRepository.cs +++ b/Kyoo/Controllers/Repositories/PeopleRepository.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; using Kyoo.Abstractions.Models.Exceptions; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/ProviderRepository.cs b/Kyoo/Controllers/Repositories/ProviderRepository.cs index 04e93012..a1f00608 100644 --- a/Kyoo/Controllers/Repositories/ProviderRepository.cs +++ b/Kyoo/Controllers/Repositories/ProviderRepository.cs @@ -5,6 +5,7 @@ using System.Linq.Expressions; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/SeasonRepository.cs b/Kyoo/Controllers/Repositories/SeasonRepository.cs index fe68a51f..f63f37e2 100644 --- a/Kyoo/Controllers/Repositories/SeasonRepository.cs +++ b/Kyoo/Controllers/Repositories/SeasonRepository.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; using Kyoo.Abstractions.Models.Exceptions; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/ShowRepository.cs b/Kyoo/Controllers/Repositories/ShowRepository.cs index dc1c276a..1605eab6 100644 --- a/Kyoo/Controllers/Repositories/ShowRepository.cs +++ b/Kyoo/Controllers/Repositories/ShowRepository.cs @@ -5,6 +5,7 @@ using System.Linq.Expressions; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/StudioRepository.cs b/Kyoo/Controllers/Repositories/StudioRepository.cs index 040f800c..42b98b44 100644 --- a/Kyoo/Controllers/Repositories/StudioRepository.cs +++ b/Kyoo/Controllers/Repositories/StudioRepository.cs @@ -5,6 +5,7 @@ using System.Linq.Expressions; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/TrackRepository.cs b/Kyoo/Controllers/Repositories/TrackRepository.cs index d4c39a3e..b7c29c47 100644 --- a/Kyoo/Controllers/Repositories/TrackRepository.cs +++ b/Kyoo/Controllers/Repositories/TrackRepository.cs @@ -4,6 +4,7 @@ using System.Linq.Expressions; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/UserRepository.cs b/Kyoo/Controllers/Repositories/UserRepository.cs index dec6c1a0..896b8480 100644 --- a/Kyoo/Controllers/Repositories/UserRepository.cs +++ b/Kyoo/Controllers/Repositories/UserRepository.cs @@ -5,6 +5,7 @@ using System.Linq.Expressions; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/CoreModule.cs b/Kyoo/CoreModule.cs index ef456639..b6445b3d 100644 --- a/Kyoo/CoreModule.cs +++ b/Kyoo/CoreModule.cs @@ -7,7 +7,9 @@ using Autofac.Extras.AttributeMetadata; using Kyoo.Abstractions; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models.Permissions; +using Kyoo.Api; using Kyoo.Controllers; +using Kyoo.Database; using Kyoo.Models.Options; using Kyoo.Tasks; using Microsoft.AspNetCore.Builder; diff --git a/Kyoo/Kyoo.csproj b/Kyoo/Kyoo.csproj index 4e23238a..8c6762c8 100644 --- a/Kyoo/Kyoo.csproj +++ b/Kyoo/Kyoo.csproj @@ -35,7 +35,7 @@ - + diff --git a/Kyoo/Views/CollectionApi.cs b/Kyoo/Views/CollectionApi.cs index b9419819..b6cada95 100644 --- a/Kyoo/Views/CollectionApi.cs +++ b/Kyoo/Views/CollectionApi.cs @@ -7,7 +7,6 @@ using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; using Kyoo.Abstractions.Models.Exceptions; using Kyoo.Abstractions.Models.Permissions; -using Kyoo.CommonApi; using Kyoo.Models.Options; using Microsoft.Extensions.Options; diff --git a/Kyoo/Views/EpisodeApi.cs b/Kyoo/Views/EpisodeApi.cs index eb1ceee0..f225c0b7 100644 --- a/Kyoo/Views/EpisodeApi.cs +++ b/Kyoo/Views/EpisodeApi.cs @@ -7,7 +7,6 @@ using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; using Kyoo.Abstractions.Models.Exceptions; using Kyoo.Abstractions.Models.Permissions; -using Kyoo.CommonApi; using Kyoo.Models.Options; using Microsoft.Extensions.Options; diff --git a/Kyoo/Views/GenreApi.cs b/Kyoo/Views/GenreApi.cs index d8490638..3076fca2 100644 --- a/Kyoo/Views/GenreApi.cs +++ b/Kyoo/Views/GenreApi.cs @@ -5,7 +5,6 @@ using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; using Kyoo.Abstractions.Models.Permissions; -using Kyoo.CommonApi; using Kyoo.Models.Options; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; diff --git a/Kyoo.CommonAPI/ApiHelper.cs b/Kyoo/Views/Helper/ApiHelper.cs similarity index 99% rename from Kyoo.CommonAPI/ApiHelper.cs rename to Kyoo/Views/Helper/ApiHelper.cs index 7dc0888f..f2650942 100644 --- a/Kyoo.CommonAPI/ApiHelper.cs +++ b/Kyoo/Views/Helper/ApiHelper.cs @@ -6,7 +6,7 @@ using System.Linq.Expressions; using System.Reflection; using Kyoo.Abstractions.Models; -namespace Kyoo.CommonApi +namespace Kyoo.Api { public static class ApiHelper { diff --git a/Kyoo.CommonAPI/CrudApi.cs b/Kyoo/Views/Helper/CrudApi.cs similarity index 99% rename from Kyoo.CommonAPI/CrudApi.cs rename to Kyoo/Views/Helper/CrudApi.cs index 78c7be9c..36ccf94e 100644 --- a/Kyoo.CommonAPI/CrudApi.cs +++ b/Kyoo/Views/Helper/CrudApi.cs @@ -8,7 +8,7 @@ using Kyoo.Abstractions.Models.Exceptions; using Kyoo.Abstractions.Models.Permissions; using Microsoft.AspNetCore.Mvc; -namespace Kyoo.CommonApi +namespace Kyoo.Api { [ApiController] [ResourceView] diff --git a/Kyoo.CommonAPI/JsonSerializer.cs b/Kyoo/Views/Helper/JsonSerializer.cs similarity index 90% rename from Kyoo.CommonAPI/JsonSerializer.cs rename to Kyoo/Views/Helper/JsonSerializer.cs index 153d5fd6..c5b91b03 100644 --- a/Kyoo.CommonAPI/JsonSerializer.cs +++ b/Kyoo/Views/Helper/JsonSerializer.cs @@ -10,7 +10,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; -namespace Kyoo.Controllers +namespace Kyoo.Api { public class JsonPropertyIgnorer : CamelCasePropertyNamesContractResolver { @@ -26,7 +26,7 @@ namespace Kyoo.Controllers { JsonProperty property = base.CreateProperty(member, memberSerialization); - LoadableRelationAttribute relation = member?.GetCustomAttribute(); + LoadableRelationAttribute relation = member.GetCustomAttribute(); if (relation != null) { if (relation.RelationID == null) @@ -42,14 +42,14 @@ namespace Kyoo.Controllers }; } - if (member?.GetCustomAttribute() != null) + if (member.GetCustomAttribute() != null) property.ShouldSerialize = _ => false; - if (member?.GetCustomAttribute() != null) + if (member.GetCustomAttribute() != null) property.ShouldDeserialize = _ => false; // TODO use http context to disable serialize as. // TODO check https://stackoverflow.com/questions/53288633/net-core-api-custom-json-resolver-based-on-request-values - SerializeAsAttribute serializeAs = member?.GetCustomAttribute(); + SerializeAsAttribute serializeAs = member.GetCustomAttribute(); if (serializeAs != null) property.ValueProvider = new SerializeAsProvider(serializeAs.Format, _host); return property; @@ -81,7 +81,7 @@ namespace Kyoo.Controllers if (value.People != null) value.People.Roles = null; - JObject obj = JObject.FromObject(value.ForPeople ? value.People : value.Show, serializer); + JObject obj = JObject.FromObject((value.ForPeople ? value.People : value.Show)!, serializer); obj.Add("role", value.Role); obj.Add("type", value.Type); obj.WriteTo(writer); diff --git a/Kyoo.CommonAPI/ResourceViewAttribute.cs b/Kyoo/Views/Helper/ResourceViewAttribute.cs similarity index 99% rename from Kyoo.CommonAPI/ResourceViewAttribute.cs rename to Kyoo/Views/Helper/ResourceViewAttribute.cs index 66d03002..386dc60c 100644 --- a/Kyoo.CommonAPI/ResourceViewAttribute.cs +++ b/Kyoo/Views/Helper/ResourceViewAttribute.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.DependencyInjection; -namespace Kyoo.CommonApi +namespace Kyoo.Api { public class ResourceViewAttribute : ActionFilterAttribute { diff --git a/Kyoo/Views/LibraryApi.cs b/Kyoo/Views/LibraryApi.cs index dd9f38ce..69203926 100644 --- a/Kyoo/Views/LibraryApi.cs +++ b/Kyoo/Views/LibraryApi.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; using Kyoo.Abstractions.Models.Permissions; -using Kyoo.CommonApi; using Kyoo.Models.Options; using Microsoft.Extensions.Options; diff --git a/Kyoo/Views/LibraryItemApi.cs b/Kyoo/Views/LibraryItemApi.cs index cc12c58c..4210be03 100644 --- a/Kyoo/Views/LibraryItemApi.cs +++ b/Kyoo/Views/LibraryItemApi.cs @@ -6,7 +6,6 @@ using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; using Kyoo.Abstractions.Models.Exceptions; using Kyoo.Abstractions.Models.Permissions; -using Kyoo.CommonApi; using Kyoo.Models.Options; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; diff --git a/Kyoo/Views/PeopleApi.cs b/Kyoo/Views/PeopleApi.cs index 96cdbd77..06ce4df7 100644 --- a/Kyoo/Views/PeopleApi.cs +++ b/Kyoo/Views/PeopleApi.cs @@ -5,7 +5,6 @@ using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; using Kyoo.Abstractions.Models.Exceptions; using Kyoo.Abstractions.Models.Permissions; -using Kyoo.CommonApi; using Kyoo.Models.Options; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; diff --git a/Kyoo/Views/ProviderApi.cs b/Kyoo/Views/ProviderApi.cs index 79d5d8c2..04f999a1 100644 --- a/Kyoo/Views/ProviderApi.cs +++ b/Kyoo/Views/ProviderApi.cs @@ -2,7 +2,6 @@ using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; using Kyoo.Abstractions.Models.Permissions; -using Kyoo.CommonApi; using Kyoo.Models.Options; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; diff --git a/Kyoo/Views/SeasonApi.cs b/Kyoo/Views/SeasonApi.cs index f504e061..6979b47b 100644 --- a/Kyoo/Views/SeasonApi.cs +++ b/Kyoo/Views/SeasonApi.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Kyoo.CommonApi; using Microsoft.AspNetCore.Mvc; using System.Linq; using Kyoo.Abstractions.Controllers; diff --git a/Kyoo/Views/ShowApi.cs b/Kyoo/Views/ShowApi.cs index b71c9372..1c3c3fa5 100644 --- a/Kyoo/Views/ShowApi.cs +++ b/Kyoo/Views/ShowApi.cs @@ -8,7 +8,6 @@ using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; using Kyoo.Abstractions.Models.Exceptions; using Kyoo.Abstractions.Models.Permissions; -using Kyoo.CommonApi; using Kyoo.Models.Options; using Microsoft.Extensions.Options; diff --git a/Kyoo/Views/StudioApi.cs b/Kyoo/Views/StudioApi.cs index 6058cb2c..5474d1f5 100644 --- a/Kyoo/Views/StudioApi.cs +++ b/Kyoo/Views/StudioApi.cs @@ -5,7 +5,6 @@ using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; using Kyoo.Abstractions.Models.Permissions; -using Kyoo.CommonApi; using Kyoo.Models.Options; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; diff --git a/Kyoo/Views/TrackApi.cs b/Kyoo/Views/TrackApi.cs index d8fd1157..a6a1b6cb 100644 --- a/Kyoo/Views/TrackApi.cs +++ b/Kyoo/Views/TrackApi.cs @@ -4,7 +4,6 @@ using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; using Kyoo.Abstractions.Models.Exceptions; using Kyoo.Abstractions.Models.Permissions; -using Kyoo.CommonApi; using Kyoo.Models.Options; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; diff --git a/tests/Kyoo.Tests/Database/RepositoryActivator.cs b/tests/Kyoo.Tests/Database/RepositoryActivator.cs index 8127dc52..92addd86 100644 --- a/tests/Kyoo.Tests/Database/RepositoryActivator.cs +++ b/tests/Kyoo.Tests/Database/RepositoryActivator.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Controllers; +using Kyoo.Database; using Xunit.Abstractions; namespace Kyoo.Tests diff --git a/tests/Kyoo.Tests/Database/RepositoryTests.cs b/tests/Kyoo.Tests/Database/RepositoryTests.cs index 702a86bb..536673b3 100644 --- a/tests/Kyoo.Tests/Database/RepositoryTests.cs +++ b/tests/Kyoo.Tests/Database/RepositoryTests.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; using Kyoo.Abstractions.Models.Exceptions; +using Kyoo.Database; using Xunit; namespace Kyoo.Tests diff --git a/tests/Kyoo.Tests/Database/SpecificTests/CollectionsTests.cs b/tests/Kyoo.Tests/Database/SpecificTests/CollectionsTests.cs index 6efe7453..f28cef94 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/CollectionsTests.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/CollectionsTests.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/SpecificTests/EpisodeTests.cs b/tests/Kyoo.Tests/Database/SpecificTests/EpisodeTests.cs index a840257b..0aff5ec7 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/EpisodeTests.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/EpisodeTests.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/SpecificTests/LibraryTests.cs b/tests/Kyoo.Tests/Database/SpecificTests/LibraryTests.cs index e2fd028a..20b7defe 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/LibraryTests.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/LibraryTests.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/SpecificTests/PeopleTests.cs b/tests/Kyoo.Tests/Database/SpecificTests/PeopleTests.cs index 5a712e18..669f6f91 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/PeopleTests.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/PeopleTests.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/SpecificTests/SeasonTests.cs b/tests/Kyoo.Tests/Database/SpecificTests/SeasonTests.cs index a0c69b13..54d164a9 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/SeasonTests.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/SeasonTests.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/SpecificTests/ShowTests.cs b/tests/Kyoo.Tests/Database/SpecificTests/ShowTests.cs index d0bda03c..c46aaa26 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/ShowTests.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/ShowTests.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using FluentAssertions; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; +using Kyoo.Database; using Microsoft.EntityFrameworkCore; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/TestContext.cs b/tests/Kyoo.Tests/Database/TestContext.cs index fa2935b8..79d873c4 100644 --- a/tests/Kyoo.Tests/Database/TestContext.cs +++ b/tests/Kyoo.Tests/Database/TestContext.cs @@ -1,5 +1,6 @@ using System; using System.Threading.Tasks; +using Kyoo.Database; using Kyoo.Postgresql; using Kyoo.SqLite; using Microsoft.Data.Sqlite; diff --git a/tests/Kyoo.Tests/Database/TestSample.cs b/tests/Kyoo.Tests/Database/TestSample.cs index 13efb26d..2cf72abd 100644 --- a/tests/Kyoo.Tests/Database/TestSample.cs +++ b/tests/Kyoo.Tests/Database/TestSample.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using Kyoo.Abstractions.Models; +using Kyoo.Database; namespace Kyoo.Tests { diff --git a/tests/Kyoo.Tests/Kyoo.Tests.csproj b/tests/Kyoo.Tests/Kyoo.Tests.csproj index 76350024..7568e9d5 100644 --- a/tests/Kyoo.Tests/Kyoo.Tests.csproj +++ b/tests/Kyoo.Tests/Kyoo.Tests.csproj @@ -32,7 +32,7 @@ - +