diff --git a/back/Dockerfile b/back/Dockerfile index b56244fe..dcbd08ed 100644 --- a/back/Dockerfile +++ b/back/Dockerfile @@ -11,9 +11,7 @@ COPY Kyoo.sln ./Kyoo.sln COPY nuget.config ./nuget.config COPY src/Directory.Build.props src/Directory.Build.props COPY src/Kyoo.Authentication/Kyoo.Authentication.csproj src/Kyoo.Authentication/Kyoo.Authentication.csproj -COPY src/Kyoo.Database/Kyoo.Database.csproj src/Kyoo.Database/Kyoo.Database.csproj COPY src/Kyoo.Host.Generic/Kyoo.Host.Generic.csproj src/Kyoo.Host.Generic/Kyoo.Host.Generic.csproj -COPY src/Kyoo.SqLite/Kyoo.SqLite.csproj src/Kyoo.SqLite/Kyoo.SqLite.csproj COPY src/Kyoo.TheMovieDb/Kyoo.TheMovieDb.csproj src/Kyoo.TheMovieDb/Kyoo.TheMovieDb.csproj COPY src/Kyoo.Abstractions/Kyoo.Abstractions.csproj src/Kyoo.Abstractions/Kyoo.Abstractions.csproj COPY src/Kyoo.Core/Kyoo.Core.csproj src/Kyoo.Core/Kyoo.Core.csproj diff --git a/back/Dockerfile.dev b/back/Dockerfile.dev index 89626df0..00f0b274 100644 --- a/back/Dockerfile.dev +++ b/back/Dockerfile.dev @@ -13,9 +13,7 @@ COPY Kyoo.sln ./Kyoo.sln COPY nuget.config ./nuget.config COPY src/Directory.Build.props src/Directory.Build.props COPY src/Kyoo.Authentication/Kyoo.Authentication.csproj src/Kyoo.Authentication/Kyoo.Authentication.csproj -COPY src/Kyoo.Database/Kyoo.Database.csproj src/Kyoo.Database/Kyoo.Database.csproj COPY src/Kyoo.Host.Generic/Kyoo.Host.Generic.csproj src/Kyoo.Host.Generic/Kyoo.Host.Generic.csproj -COPY src/Kyoo.SqLite/Kyoo.SqLite.csproj src/Kyoo.SqLite/Kyoo.SqLite.csproj COPY src/Kyoo.TheMovieDb/Kyoo.TheMovieDb.csproj src/Kyoo.TheMovieDb/Kyoo.TheMovieDb.csproj COPY src/Kyoo.Abstractions/Kyoo.Abstractions.csproj src/Kyoo.Abstractions/Kyoo.Abstractions.csproj COPY src/Kyoo.Core/Kyoo.Core.csproj src/Kyoo.Core/Kyoo.Core.csproj diff --git a/back/src/Kyoo.Host.Generic/Kyoo.Host.Generic.csproj b/back/src/Kyoo.Host.Generic/Kyoo.Host.Generic.csproj index e511789d..ae348c63 100644 --- a/back/src/Kyoo.Host.Generic/Kyoo.Host.Generic.csproj +++ b/back/src/Kyoo.Host.Generic/Kyoo.Host.Generic.csproj @@ -17,14 +17,13 @@ - + - diff --git a/back/tests/Kyoo.Tests/Database/RepositoryActivator.cs b/back/tests/Kyoo.Tests/Database/RepositoryActivator.cs index 3cf83295..dbe697f4 100644 --- a/back/tests/Kyoo.Tests/Database/RepositoryActivator.cs +++ b/back/tests/Kyoo.Tests/Database/RepositoryActivator.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Core.Controllers; -using Kyoo.Database; +using Kyoo.Postgresql; using Xunit.Abstractions; namespace Kyoo.Tests.Database diff --git a/back/tests/Kyoo.Tests/Database/RepositoryTests.cs b/back/tests/Kyoo.Tests/Database/RepositoryTests.cs index 82f3d420..ff891a55 100644 --- a/back/tests/Kyoo.Tests/Database/RepositoryTests.cs +++ b/back/tests/Kyoo.Tests/Database/RepositoryTests.cs @@ -24,7 +24,7 @@ using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; using Kyoo.Abstractions.Models.Exceptions; -using Kyoo.Database; +using Kyoo.Postgresql; using Xunit; namespace Kyoo.Tests.Database diff --git a/back/tests/Kyoo.Tests/Database/SpecificTests/CollectionsTests.cs b/back/tests/Kyoo.Tests/Database/SpecificTests/CollectionsTests.cs index ce3408d3..1d6bdd9f 100644 --- a/back/tests/Kyoo.Tests/Database/SpecificTests/CollectionsTests.cs +++ b/back/tests/Kyoo.Tests/Database/SpecificTests/CollectionsTests.cs @@ -22,22 +22,13 @@ using System.Linq; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; -using Kyoo.Database; +using Kyoo.Postgresql; using Microsoft.EntityFrameworkCore; using Xunit; using Xunit.Abstractions; namespace Kyoo.Tests.Database { - namespace SqLite - { - public class CollectionTests : ACollectionTests - { - public CollectionTests(ITestOutputHelper output) - : base(new RepositoryActivator(output)) { } - } - } - namespace PostgreSQL { [Collection(nameof(Postgresql))] diff --git a/back/tests/Kyoo.Tests/Database/SpecificTests/EpisodeTests.cs b/back/tests/Kyoo.Tests/Database/SpecificTests/EpisodeTests.cs index 88d6cb84..51c59d90 100644 --- a/back/tests/Kyoo.Tests/Database/SpecificTests/EpisodeTests.cs +++ b/back/tests/Kyoo.Tests/Database/SpecificTests/EpisodeTests.cs @@ -21,22 +21,13 @@ using System.Linq; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; -using Kyoo.Database; +using Kyoo.Postgresql; using Microsoft.EntityFrameworkCore; using Xunit; using Xunit.Abstractions; namespace Kyoo.Tests.Database { - namespace SqLite - { - public class EpisodeTests : AEpisodeTests - { - public EpisodeTests(ITestOutputHelper output) - : base(new RepositoryActivator(output)) { } - } - } - namespace PostgreSQL { [Collection(nameof(Postgresql))] diff --git a/back/tests/Kyoo.Tests/Database/SpecificTests/GenreTests.cs b/back/tests/Kyoo.Tests/Database/SpecificTests/GenreTests.cs index 22211a3d..b4456756 100644 --- a/back/tests/Kyoo.Tests/Database/SpecificTests/GenreTests.cs +++ b/back/tests/Kyoo.Tests/Database/SpecificTests/GenreTests.cs @@ -24,15 +24,6 @@ using Xunit.Abstractions; namespace Kyoo.Tests.Database { - namespace SqLite - { - public class GenreTests : AGenreTests - { - public GenreTests(ITestOutputHelper output) - : base(new RepositoryActivator(output)) { } - } - } - namespace PostgreSQL { [Collection(nameof(Postgresql))] diff --git a/back/tests/Kyoo.Tests/Database/SpecificTests/LibraryItemTest.cs b/back/tests/Kyoo.Tests/Database/SpecificTests/LibraryItemTest.cs index 2002e5ef..db572ea1 100644 --- a/back/tests/Kyoo.Tests/Database/SpecificTests/LibraryItemTest.cs +++ b/back/tests/Kyoo.Tests/Database/SpecificTests/LibraryItemTest.cs @@ -25,15 +25,6 @@ using Xunit.Abstractions; namespace Kyoo.Tests.Database { - namespace SqLite - { - public class LibraryItemTest : ALibraryItemTest - { - public LibraryItemTest(ITestOutputHelper output) - : base(new RepositoryActivator(output)) { } - } - } - namespace PostgreSQL { [Collection(nameof(Postgresql))] diff --git a/back/tests/Kyoo.Tests/Database/SpecificTests/LibraryTests.cs b/back/tests/Kyoo.Tests/Database/SpecificTests/LibraryTests.cs index d440537b..2c7cc9e6 100644 --- a/back/tests/Kyoo.Tests/Database/SpecificTests/LibraryTests.cs +++ b/back/tests/Kyoo.Tests/Database/SpecificTests/LibraryTests.cs @@ -22,7 +22,7 @@ using System.Linq; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; -using Kyoo.Database; +using Kyoo.Postgresql; using Kyoo.Utils; using Microsoft.EntityFrameworkCore; using Xunit; @@ -30,15 +30,6 @@ using Xunit.Abstractions; namespace Kyoo.Tests.Database { - namespace SqLite - { - public class LibraryTests : ALibraryTests - { - public LibraryTests(ITestOutputHelper output) - : base(new RepositoryActivator(output)) { } - } - } - namespace PostgreSQL { [Collection(nameof(Postgresql))] diff --git a/back/tests/Kyoo.Tests/Database/SpecificTests/PeopleTests.cs b/back/tests/Kyoo.Tests/Database/SpecificTests/PeopleTests.cs index 4b416ec7..50dbf151 100644 --- a/back/tests/Kyoo.Tests/Database/SpecificTests/PeopleTests.cs +++ b/back/tests/Kyoo.Tests/Database/SpecificTests/PeopleTests.cs @@ -21,22 +21,13 @@ using System.Linq; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; -using Kyoo.Database; +using Kyoo.Postgresql; using Microsoft.EntityFrameworkCore; using Xunit; using Xunit.Abstractions; namespace Kyoo.Tests.Database { - namespace SqLite - { - public class PeopleTests : APeopleTests - { - public PeopleTests(ITestOutputHelper output) - : base(new RepositoryActivator(output)) { } - } - } - namespace PostgreSQL { [Collection(nameof(Postgresql))] diff --git a/back/tests/Kyoo.Tests/Database/SpecificTests/ProviderTests.cs b/back/tests/Kyoo.Tests/Database/SpecificTests/ProviderTests.cs index 62d33528..49340367 100644 --- a/back/tests/Kyoo.Tests/Database/SpecificTests/ProviderTests.cs +++ b/back/tests/Kyoo.Tests/Database/SpecificTests/ProviderTests.cs @@ -24,15 +24,6 @@ using Xunit.Abstractions; namespace Kyoo.Tests.Database { - namespace SqLite - { - public class ProviderTests : AProviderTests - { - public ProviderTests(ITestOutputHelper output) - : base(new RepositoryActivator(output)) { } - } - } - namespace PostgreSQL { [Collection(nameof(Postgresql))] diff --git a/back/tests/Kyoo.Tests/Database/SpecificTests/SeasonTests.cs b/back/tests/Kyoo.Tests/Database/SpecificTests/SeasonTests.cs index 1bfeeb2b..c5017e9a 100644 --- a/back/tests/Kyoo.Tests/Database/SpecificTests/SeasonTests.cs +++ b/back/tests/Kyoo.Tests/Database/SpecificTests/SeasonTests.cs @@ -21,22 +21,13 @@ using System.Linq; using System.Threading.Tasks; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; -using Kyoo.Database; +using Kyoo.Postgresql; using Microsoft.EntityFrameworkCore; using Xunit; using Xunit.Abstractions; namespace Kyoo.Tests.Database { - namespace SqLite - { - public class SeasonTests : ASeasonTests - { - public SeasonTests(ITestOutputHelper output) - : base(new RepositoryActivator(output)) { } - } - } - namespace PostgreSQL { [Collection(nameof(Postgresql))] diff --git a/back/tests/Kyoo.Tests/Database/SpecificTests/ShowTests.cs b/back/tests/Kyoo.Tests/Database/SpecificTests/ShowTests.cs index 12c1cead..203f29a9 100644 --- a/back/tests/Kyoo.Tests/Database/SpecificTests/ShowTests.cs +++ b/back/tests/Kyoo.Tests/Database/SpecificTests/ShowTests.cs @@ -23,7 +23,7 @@ using System.Threading.Tasks; using FluentAssertions; using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Models; -using Kyoo.Database; +using Kyoo.Postgresql; using Kyoo.Utils; using Microsoft.EntityFrameworkCore; using Xunit; @@ -31,15 +31,6 @@ using Xunit.Abstractions; namespace Kyoo.Tests.Database { - namespace SqLite - { - public class ShowTests : AShowTests - { - public ShowTests(ITestOutputHelper output) - : base(new RepositoryActivator(output)) { } - } - } - namespace PostgreSQL { [Collection(nameof(Postgresql))] diff --git a/back/tests/Kyoo.Tests/Database/SpecificTests/StudioTests.cs b/back/tests/Kyoo.Tests/Database/SpecificTests/StudioTests.cs index b024d435..b95f3bed 100644 --- a/back/tests/Kyoo.Tests/Database/SpecificTests/StudioTests.cs +++ b/back/tests/Kyoo.Tests/Database/SpecificTests/StudioTests.cs @@ -24,15 +24,6 @@ using Xunit.Abstractions; namespace Kyoo.Tests.Database { - namespace SqLite - { - public class StudioTests : AStudioTests - { - public StudioTests(ITestOutputHelper output) - : base(new RepositoryActivator(output)) { } - } - } - namespace PostgreSQL { [Collection(nameof(Postgresql))] diff --git a/back/tests/Kyoo.Tests/Database/SpecificTests/TrackTests.cs b/back/tests/Kyoo.Tests/Database/SpecificTests/TrackTests.cs index 7a97d7ca..84f46bad 100644 --- a/back/tests/Kyoo.Tests/Database/SpecificTests/TrackTests.cs +++ b/back/tests/Kyoo.Tests/Database/SpecificTests/TrackTests.cs @@ -24,15 +24,6 @@ using Xunit.Abstractions; namespace Kyoo.Tests.Database { - namespace SqLite - { - public class TrackTests : ATrackTests - { - public TrackTests(ITestOutputHelper output) - : base(new RepositoryActivator(output)) { } - } - } - namespace PostgreSQL { [Collection(nameof(Postgresql))] diff --git a/back/tests/Kyoo.Tests/Database/SpecificTests/UserTests.cs b/back/tests/Kyoo.Tests/Database/SpecificTests/UserTests.cs index 5228356a..3ab32722 100644 --- a/back/tests/Kyoo.Tests/Database/SpecificTests/UserTests.cs +++ b/back/tests/Kyoo.Tests/Database/SpecificTests/UserTests.cs @@ -24,15 +24,6 @@ using Xunit.Abstractions; namespace Kyoo.Tests.Database { - namespace SqLite - { - public class UserTests : AUserTests - { - public UserTests(ITestOutputHelper output) - : base(new RepositoryActivator(output)) { } - } - } - namespace PostgreSQL { [Collection(nameof(Postgresql))] diff --git a/back/tests/Kyoo.Tests/Database/TestContext.cs b/back/tests/Kyoo.Tests/Database/TestContext.cs index dc95bc16..339bc1ee 100644 --- a/back/tests/Kyoo.Tests/Database/TestContext.cs +++ b/back/tests/Kyoo.Tests/Database/TestContext.cs @@ -18,7 +18,7 @@ using System; using System.Threading.Tasks; -using Kyoo.Database; +using Kyoo.Postgresql; using Kyoo.Postgresql; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; diff --git a/back/tests/Kyoo.Tests/Database/TestSample.cs b/back/tests/Kyoo.Tests/Database/TestSample.cs index 634c104a..3be5396e 100644 --- a/back/tests/Kyoo.Tests/Database/TestSample.cs +++ b/back/tests/Kyoo.Tests/Database/TestSample.cs @@ -19,7 +19,7 @@ using System; using System.Collections.Generic; using Kyoo.Abstractions.Models; -using Kyoo.Database; +using Kyoo.Postgresql; namespace Kyoo.Tests {