Browse Source

Refactoring

pull/1/head
Sebastian 9 years ago
parent
commit
e0dcee4bb8
  1. 2
      Squidex.sln
  2. 2
      src/Squidex.Read.MongoDb/Apps/MongoAppClientEntity.cs
  3. 2
      src/Squidex.Read.MongoDb/Apps/MongoAppContributorEntity.cs
  4. 2
      src/Squidex.Read.MongoDb/Apps/MongoAppEntity.cs
  5. 4
      src/Squidex.Read.MongoDb/Apps/MongoAppRepository.cs
  6. 2
      src/Squidex.Read.MongoDb/Contents/MongoContentEntity.cs
  7. 6
      src/Squidex.Read.MongoDb/Contents/MongoContentRepository.cs
  8. 2
      src/Squidex.Read.MongoDb/Contents/Visitors/ConstantVisitor.cs
  9. 2
      src/Squidex.Read.MongoDb/Contents/Visitors/FilterBuilder.cs
  10. 2
      src/Squidex.Read.MongoDb/Contents/Visitors/FilterVisitor.cs
  11. 2
      src/Squidex.Read.MongoDb/Contents/Visitors/FindExtensions.cs
  12. 2
      src/Squidex.Read.MongoDb/Contents/Visitors/PropertyVisitor.cs
  13. 2
      src/Squidex.Read.MongoDb/Contents/Visitors/SchemaExtensions.cs
  14. 2
      src/Squidex.Read.MongoDb/Contents/Visitors/SortBuilder.cs
  15. 2
      src/Squidex.Read.MongoDb/History/MongoHistoryEventEntity.cs
  16. 4
      src/Squidex.Read.MongoDb/History/MongoHistoryEventRepository.cs
  17. 2
      src/Squidex.Read.MongoDb/History/ParsedHistoryEvent.cs
  18. 2
      src/Squidex.Read.MongoDb/Infrastructure/MongoPersistedGrantStore.cs
  19. 16
      src/Squidex.Read.MongoDb/MongoDbModule.cs
  20. 2
      src/Squidex.Read.MongoDb/MyMongoDbOptions.cs
  21. 2
      src/Squidex.Read.MongoDb/Properties/AssemblyInfo.cs
  22. 2
      src/Squidex.Read.MongoDb/Schemas/MongoSchemaEntity.cs
  23. 4
      src/Squidex.Read.MongoDb/Schemas/MongoSchemaRepository.cs
  24. 6
      src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.xproj
  25. 2
      src/Squidex.Read.MongoDb/Users/MongoUserEntity.cs
  26. 2
      src/Squidex.Read.MongoDb/Users/MongoUserRepository.cs
  27. 2
      src/Squidex.Read.MongoDb/Utils/EntityMapper.cs
  28. 0
      src/Squidex.Read.MongoDb/project.json
  29. 2
      src/Squidex/Startup.cs
  30. 2
      src/Squidex/project.json
  31. 21
      tests/Squidex.Core.Tests/Schemas/SchemaTests.cs
  32. 1
      tests/Squidex.Infrastructure.Tests/CQRS/DomainObjectTest.cs
  33. 1
      tests/Squidex.Infrastructure.Tests/DispatchingTests.cs
  34. 1
      tests/Squidex.Infrastructure.Tests/PropertiesBagTests.cs
  35. 26
      tests/Squidex.Read.Tests/Properties/AssemblyInfo.cs
  36. 22
      tests/Squidex.Read.Tests/Squidex.Read.Tests.xproj
  37. 37
      tests/Squidex.Read.Tests/project.json
  38. 1
      tests/Squidex.Write.Tests/Apps/AppCommandHandlerTests.cs
  39. 1
      tests/Squidex.Write.Tests/Apps/AppDomainObjectTests.cs
  40. 1
      tests/Squidex.Write.Tests/Contents/ContentCommandHandlerTests.cs
  41. 1
      tests/Squidex.Write.Tests/Contents/ContentDomainObjectTests.cs
  42. 1
      tests/Squidex.Write.Tests/Schemas/SchemaCommandHandlerTests.cs
  43. 1
      tests/Squidex.Write.Tests/Schemas/SchemaDomainObjectTests.cs

2
Squidex.sln

@ -26,7 +26,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Squidex.Write", "src\Squide
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Squidex.Read", "src\Squidex.Read\Squidex.Read.xproj", "{A92B4734-2587-4F6F-97A3-741BE48709A5}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Squidex.Read", "src\Squidex.Read\Squidex.Read.xproj", "{A92B4734-2587-4F6F-97A3-741BE48709A5}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Squidex.Store.MongoDb", "src\Squidex.Store.MongoDb\Squidex.Store.MongoDb.xproj", "{28F8E9E2-FE24-41F7-A888-9FC244A9E2DD}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Squidex.Read.MongoDb", "src\Squidex.Read.MongoDb\Squidex.Read.MongoDb.xproj", "{28F8E9E2-FE24-41F7-A888-9FC244A9E2DD}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "squidex_store", "squidex_store", "{4082AA58-D410-4C52-8E88-3B0A4E860B28}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "squidex_store", "squidex_store", "{4082AA58-D410-4C52-8E88-3B0A4E860B28}"
EndProject EndProject

2
src/Squidex.Store.MongoDb/Apps/MongoAppClientEntity.cs → src/Squidex.Read.MongoDb/Apps/MongoAppClientEntity.cs

@ -10,7 +10,7 @@ using System;
using MongoDB.Bson.Serialization.Attributes; using MongoDB.Bson.Serialization.Attributes;
using Squidex.Read.Apps; using Squidex.Read.Apps;
namespace Squidex.Store.MongoDb.Apps namespace Squidex.Read.MongoDb.Apps
{ {
public sealed class MongoAppClientEntity : IAppClientEntity public sealed class MongoAppClientEntity : IAppClientEntity
{ {

2
src/Squidex.Store.MongoDb/Apps/MongoAppContributorEntity.cs → src/Squidex.Read.MongoDb/Apps/MongoAppContributorEntity.cs

@ -10,7 +10,7 @@ using MongoDB.Bson.Serialization.Attributes;
using Squidex.Core.Apps; using Squidex.Core.Apps;
using Squidex.Read.Apps; using Squidex.Read.Apps;
namespace Squidex.Store.MongoDb.Apps namespace Squidex.Read.MongoDb.Apps
{ {
public sealed class MongoAppContributorEntity : IAppContributorEntity public sealed class MongoAppContributorEntity : IAppContributorEntity
{ {

2
src/Squidex.Store.MongoDb/Apps/MongoAppEntity.cs → src/Squidex.Read.MongoDb/Apps/MongoAppEntity.cs

@ -13,7 +13,7 @@ using Squidex.Infrastructure;
using Squidex.Infrastructure.MongoDb; using Squidex.Infrastructure.MongoDb;
using Squidex.Read.Apps; using Squidex.Read.Apps;
namespace Squidex.Store.MongoDb.Apps namespace Squidex.Read.MongoDb.Apps
{ {
public sealed class MongoAppEntity : MongoEntity, IAppEntity public sealed class MongoAppEntity : MongoEntity, IAppEntity
{ {

4
src/Squidex.Store.MongoDb/Apps/MongoAppRepository.cs → src/Squidex.Read.MongoDb/Apps/MongoAppRepository.cs

@ -17,12 +17,12 @@ using Squidex.Infrastructure.Dispatching;
using Squidex.Infrastructure.Reflection; using Squidex.Infrastructure.Reflection;
using Squidex.Read.Apps; using Squidex.Read.Apps;
using Squidex.Read.Apps.Repositories; using Squidex.Read.Apps.Repositories;
using Squidex.Store.MongoDb.Utils; using Squidex.Read.MongoDb.Utils;
using Squidex.Infrastructure; using Squidex.Infrastructure;
using Squidex.Infrastructure.CQRS.Replay; using Squidex.Infrastructure.CQRS.Replay;
using Squidex.Infrastructure.MongoDb; using Squidex.Infrastructure.MongoDb;
namespace Squidex.Store.MongoDb.Apps namespace Squidex.Read.MongoDb.Apps
{ {
public class MongoAppRepository : MongoRepositoryBase<MongoAppEntity>, IAppRepository, ICatchEventConsumer, IReplayableStore public class MongoAppRepository : MongoRepositoryBase<MongoAppEntity>, IAppRepository, ICatchEventConsumer, IReplayableStore
{ {

2
src/Squidex.Store.MongoDb/Contents/MongoContentEntity.cs → src/Squidex.Read.MongoDb/Contents/MongoContentEntity.cs

@ -21,7 +21,7 @@ using Squidex.Read.Contents;
// ReSharper disable ConvertIfStatementToConditionalTernaryExpression // ReSharper disable ConvertIfStatementToConditionalTernaryExpression
// ReSharper disable InvertIf // ReSharper disable InvertIf
namespace Squidex.Store.MongoDb.Contents namespace Squidex.Read.MongoDb.Contents
{ {
public sealed class MongoContentEntity : MongoEntity, IContentEntity public sealed class MongoContentEntity : MongoEntity, IContentEntity
{ {

6
src/Squidex.Store.MongoDb/Contents/MongoContentRepository.cs → src/Squidex.Read.MongoDb/Contents/MongoContentRepository.cs

@ -25,10 +25,10 @@ using Squidex.Infrastructure.Reflection;
using Squidex.Read.Contents; using Squidex.Read.Contents;
using Squidex.Read.Contents.Repositories; using Squidex.Read.Contents.Repositories;
using Squidex.Read.Schemas.Services; using Squidex.Read.Schemas.Services;
using Squidex.Store.MongoDb.Contents.Visitors; using Squidex.Read.MongoDb.Contents.Visitors;
using Squidex.Store.MongoDb.Utils; using Squidex.Read.MongoDb.Utils;
namespace Squidex.Store.MongoDb.Contents namespace Squidex.Read.MongoDb.Contents
{ {
public class MongoContentRepository : IContentRepository, ICatchEventConsumer, IReplayableStore public class MongoContentRepository : IContentRepository, ICatchEventConsumer, IReplayableStore
{ {

2
src/Squidex.Store.MongoDb/Contents/Visitors/ConstantVisitor.cs → src/Squidex.Read.MongoDb/Contents/Visitors/ConstantVisitor.cs

@ -9,7 +9,7 @@
using Microsoft.OData.Core.UriParser.Semantic; using Microsoft.OData.Core.UriParser.Semantic;
using Microsoft.OData.Core.UriParser.Visitors; using Microsoft.OData.Core.UriParser.Visitors;
namespace Squidex.Store.MongoDb.Contents.Visitors namespace Squidex.Read.MongoDb.Contents.Visitors
{ {
public sealed class ConstantVisitor : QueryNodeVisitor<object> public sealed class ConstantVisitor : QueryNodeVisitor<object>
{ {

2
src/Squidex.Store.MongoDb/Contents/Visitors/FilterBuilder.cs → src/Squidex.Read.MongoDb/Contents/Visitors/FilterBuilder.cs

@ -11,7 +11,7 @@ using MongoDB.Driver;
using Squidex.Core.Schemas; using Squidex.Core.Schemas;
// ReSharper disable ConvertIfStatementToReturnStatement // ReSharper disable ConvertIfStatementToReturnStatement
namespace Squidex.Store.MongoDb.Contents.Visitors namespace Squidex.Read.MongoDb.Contents.Visitors
{ {
public static class FilterBuilder public static class FilterBuilder
{ {

2
src/Squidex.Store.MongoDb/Contents/Visitors/FilterVisitor.cs → src/Squidex.Read.MongoDb/Contents/Visitors/FilterVisitor.cs

@ -15,7 +15,7 @@ using Squidex.Core.Schemas;
// ReSharper disable SwitchStatementMissingSomeCases // ReSharper disable SwitchStatementMissingSomeCases
// ReSharper disable ConvertIfStatementToSwitchStatement // ReSharper disable ConvertIfStatementToSwitchStatement
namespace Squidex.Store.MongoDb.Contents.Visitors namespace Squidex.Read.MongoDb.Contents.Visitors
{ {
public class FilterVisitor : QueryNodeVisitor<FilterDefinition<MongoContentEntity>> public class FilterVisitor : QueryNodeVisitor<FilterDefinition<MongoContentEntity>>
{ {

2
src/Squidex.Store.MongoDb/Contents/Visitors/FindExtensions.cs → src/Squidex.Read.MongoDb/Contents/Visitors/FindExtensions.cs

@ -11,7 +11,7 @@ using Microsoft.OData.Core.UriParser;
using MongoDB.Driver; using MongoDB.Driver;
using Squidex.Core.Schemas; using Squidex.Core.Schemas;
namespace Squidex.Store.MongoDb.Contents.Visitors namespace Squidex.Read.MongoDb.Contents.Visitors
{ {
public static class FindExtensions public static class FindExtensions
{ {

2
src/Squidex.Store.MongoDb/Contents/Visitors/PropertyVisitor.cs → src/Squidex.Read.MongoDb/Contents/Visitors/PropertyVisitor.cs

@ -16,7 +16,7 @@ using Squidex.Core.Schemas;
// ReSharper disable InvertIf // ReSharper disable InvertIf
// ReSharper disable RedundantIfElseBlock // ReSharper disable RedundantIfElseBlock
namespace Squidex.Store.MongoDb.Contents.Visitors namespace Squidex.Read.MongoDb.Contents.Visitors
{ {
public sealed class PropertyVisitor : QueryNodeVisitor<ImmutableList<string>> public sealed class PropertyVisitor : QueryNodeVisitor<ImmutableList<string>>
{ {

2
src/Squidex.Store.MongoDb/Contents/Visitors/SchemaExtensions.cs → src/Squidex.Read.MongoDb/Contents/Visitors/SchemaExtensions.cs

@ -14,7 +14,7 @@ using Microsoft.OData.Edm.Library;
using Squidex.Core.Schemas; using Squidex.Core.Schemas;
using Squidex.Infrastructure; using Squidex.Infrastructure;
namespace Squidex.Store.MongoDb.Contents.Visitors namespace Squidex.Read.MongoDb.Contents.Visitors
{ {
public static class SchemaExtensions public static class SchemaExtensions
{ {

2
src/Squidex.Store.MongoDb/Contents/Visitors/SortBuilder.cs → src/Squidex.Read.MongoDb/Contents/Visitors/SortBuilder.cs

@ -15,7 +15,7 @@ using Squidex.Core.Schemas;
// ReSharper disable ConvertIfStatementToReturnStatement // ReSharper disable ConvertIfStatementToReturnStatement
// ReSharper disable ConvertIfStatementToConditionalTernaryExpression // ReSharper disable ConvertIfStatementToConditionalTernaryExpression
namespace Squidex.Store.MongoDb.Contents.Visitors namespace Squidex.Read.MongoDb.Contents.Visitors
{ {
public static class SortBuilder public static class SortBuilder
{ {

2
src/Squidex.Store.MongoDb/History/MongoHistoryEventEntity.cs → src/Squidex.Read.MongoDb/History/MongoHistoryEventEntity.cs

@ -14,7 +14,7 @@ using Squidex.Infrastructure.CQRS;
using Squidex.Infrastructure.MongoDb; using Squidex.Infrastructure.MongoDb;
using Squidex.Read; using Squidex.Read;
namespace Squidex.Store.MongoDb.History namespace Squidex.Read.MongoDb.History
{ {
public sealed class MongoHistoryEventEntity : MongoEntity, IAppRefEntity, ITrackCreatedByEntity public sealed class MongoHistoryEventEntity : MongoEntity, IAppRefEntity, ITrackCreatedByEntity
{ {

4
src/Squidex.Store.MongoDb/History/MongoHistoryEventRepository.cs → src/Squidex.Read.MongoDb/History/MongoHistoryEventRepository.cs

@ -18,9 +18,9 @@ using Squidex.Infrastructure.CQRS.Replay;
using Squidex.Infrastructure.MongoDb; using Squidex.Infrastructure.MongoDb;
using Squidex.Read.History; using Squidex.Read.History;
using Squidex.Read.History.Repositories; using Squidex.Read.History.Repositories;
using Squidex.Store.MongoDb.Utils; using Squidex.Read.MongoDb.Utils;
namespace Squidex.Store.MongoDb.History namespace Squidex.Read.MongoDb.History
{ {
public class MongoHistoryEventRepository : MongoRepositoryBase<MongoHistoryEventEntity>, IHistoryEventRepository, ICatchEventConsumer, IReplayableStore public class MongoHistoryEventRepository : MongoRepositoryBase<MongoHistoryEventEntity>, IHistoryEventRepository, ICatchEventConsumer, IReplayableStore
{ {

2
src/Squidex.Store.MongoDb/History/ParsedHistoryEvent.cs → src/Squidex.Read.MongoDb/History/ParsedHistoryEvent.cs

@ -12,7 +12,7 @@ using Squidex.Infrastructure;
using Squidex.Read.History; using Squidex.Read.History;
// ReSharper disable LoopCanBeConvertedToQuery // ReSharper disable LoopCanBeConvertedToQuery
namespace Squidex.Store.MongoDb.History namespace Squidex.Read.MongoDb.History
{ {
internal sealed class ParsedHistoryEvent : IHistoryEventEntity internal sealed class ParsedHistoryEvent : IHistoryEventEntity
{ {

2
src/Squidex.Store.MongoDb/Infrastructure/MongoPersistedGrantStore.cs → src/Squidex.Read.MongoDb/Infrastructure/MongoPersistedGrantStore.cs

@ -14,7 +14,7 @@ using MongoDB.Bson.Serialization;
using MongoDB.Driver; using MongoDB.Driver;
using Squidex.Infrastructure.MongoDb; using Squidex.Infrastructure.MongoDb;
namespace Squidex.Store.MongoDb.Infrastructure namespace Squidex.Read.MongoDb.Infrastructure
{ {
public class MongoPersistedGrantStore : MongoRepositoryBase<PersistedGrant>, IPersistedGrantStore public class MongoPersistedGrantStore : MongoRepositoryBase<PersistedGrant>, IPersistedGrantStore
{ {

16
src/Squidex.Store.MongoDb/MongoDbModule.cs → src/Squidex.Read.MongoDb/MongoDbModule.cs

@ -20,14 +20,14 @@ using Squidex.Read.Contents.Repositories;
using Squidex.Read.History.Repositories; using Squidex.Read.History.Repositories;
using Squidex.Read.Schemas.Repositories; using Squidex.Read.Schemas.Repositories;
using Squidex.Read.Users.Repositories; using Squidex.Read.Users.Repositories;
using Squidex.Store.MongoDb.Apps; using Squidex.Read.MongoDb.Apps;
using Squidex.Store.MongoDb.Contents; using Squidex.Read.MongoDb.Contents;
using Squidex.Store.MongoDb.History; using Squidex.Read.MongoDb.History;
using Squidex.Store.MongoDb.Infrastructure; using Squidex.Read.MongoDb.Infrastructure;
using Squidex.Store.MongoDb.Schemas; using Squidex.Read.MongoDb.Schemas;
using Squidex.Store.MongoDb.Users; using Squidex.Read.MongoDb.Users;
namespace Squidex.Store.MongoDb namespace Squidex.Read.MongoDb
{ {
public class MongoDbModule : Module public class MongoDbModule : Module
{ {

2
src/Squidex.Store.MongoDb/MyMongoDbOptions.cs → src/Squidex.Read.MongoDb/MyMongoDbOptions.cs

@ -5,7 +5,7 @@
// Copyright (c) Squidex Group // Copyright (c) Squidex Group
// All rights reserved. // All rights reserved.
// ========================================================================== // ==========================================================================
namespace Squidex.Store.MongoDb namespace Squidex.Read.MongoDb
{ {
public class MyMongoDbOptions public class MyMongoDbOptions
{ {

2
src/Squidex.Store.MongoDb/Properties/AssemblyInfo.cs → src/Squidex.Read.MongoDb/Properties/AssemblyInfo.cs

@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Squidex.Store.MongoDb")] [assembly: AssemblyProduct("Squidex.Read.MongoDb")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
// Setting ComVisible to false makes the types in this assembly not visible // Setting ComVisible to false makes the types in this assembly not visible

2
src/Squidex.Store.MongoDb/Schemas/MongoSchemaEntity.cs → src/Squidex.Read.MongoDb/Schemas/MongoSchemaEntity.cs

@ -15,7 +15,7 @@ using Squidex.Infrastructure;
using Squidex.Infrastructure.MongoDb; using Squidex.Infrastructure.MongoDb;
using Squidex.Read.Schemas; using Squidex.Read.Schemas;
namespace Squidex.Store.MongoDb.Schemas namespace Squidex.Read.MongoDb.Schemas
{ {
public sealed class MongoSchemaEntity : MongoEntity, ISchemaEntityWithSchema public sealed class MongoSchemaEntity : MongoEntity, ISchemaEntityWithSchema
{ {

4
src/Squidex.Store.MongoDb/Schemas/MongoSchemaRepository.cs → src/Squidex.Read.MongoDb/Schemas/MongoSchemaRepository.cs

@ -24,9 +24,9 @@ using Squidex.Infrastructure.MongoDb;
using Squidex.Infrastructure.Reflection; using Squidex.Infrastructure.Reflection;
using Squidex.Read.Schemas; using Squidex.Read.Schemas;
using Squidex.Read.Schemas.Repositories; using Squidex.Read.Schemas.Repositories;
using Squidex.Store.MongoDb.Utils; using Squidex.Read.MongoDb.Utils;
namespace Squidex.Store.MongoDb.Schemas namespace Squidex.Read.MongoDb.Schemas
{ {
public class MongoSchemaRepository : MongoRepositoryBase<MongoSchemaEntity>, ISchemaRepository, ICatchEventConsumer, IReplayableStore public class MongoSchemaRepository : MongoRepositoryBase<MongoSchemaEntity>, ISchemaRepository, ICatchEventConsumer, IReplayableStore
{ {

6
src/Squidex.Store.MongoDb/Squidex.Store.MongoDb.xproj → src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.xproj

@ -4,18 +4,16 @@
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" /> <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>28f8e9e2-fe24-41f7-a888-9fc244a9e2dd</ProjectGuid> <ProjectGuid>28f8e9e2-fe24-41f7-a888-9fc244a9e2dd</ProjectGuid>
<RootNamespace>Squidex.Store.MongoDb</RootNamespace> <RootNamespace>Squidex.Read.MongoDb</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath> <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath> <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" /> <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project> </Project>

2
src/Squidex.Store.MongoDb/Users/MongoUserEntity.cs → src/Squidex.Read.MongoDb/Users/MongoUserEntity.cs

@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Identity.MongoDB;
using Squidex.Infrastructure.Security; using Squidex.Infrastructure.Security;
using Squidex.Read.Users; using Squidex.Read.Users;
namespace Squidex.Store.MongoDb.Users namespace Squidex.Read.MongoDb.Users
{ {
public class MongoUserEntity : IUserEntity public class MongoUserEntity : IUserEntity
{ {

2
src/Squidex.Store.MongoDb/Users/MongoUserRepository.cs → src/Squidex.Read.MongoDb/Users/MongoUserRepository.cs

@ -15,7 +15,7 @@ using Squidex.Infrastructure;
using Squidex.Read.Users; using Squidex.Read.Users;
using Squidex.Read.Users.Repositories; using Squidex.Read.Users.Repositories;
namespace Squidex.Store.MongoDb.Users namespace Squidex.Read.MongoDb.Users
{ {
public sealed class MongoUserRepository : IUserRepository public sealed class MongoUserRepository : IUserRepository
{ {

2
src/Squidex.Store.MongoDb/Utils/EntityMapper.cs → src/Squidex.Read.MongoDb/Utils/EntityMapper.cs

@ -16,7 +16,7 @@ using Squidex.Read;
// ReSharper disable ConvertIfStatementToConditionalTernaryExpression // ReSharper disable ConvertIfStatementToConditionalTernaryExpression
// ReSharper disable SuspiciousTypeConversion.Global // ReSharper disable SuspiciousTypeConversion.Global
namespace Squidex.Store.MongoDb.Utils namespace Squidex.Read.MongoDb.Utils
{ {
public static class EntityMapper public static class EntityMapper
{ {

0
src/Squidex.Store.MongoDb/project.json → src/Squidex.Read.MongoDb/project.json

2
src/Squidex/Startup.cs

@ -24,7 +24,7 @@ using Squidex.Config.Identity;
using Squidex.Config.Swagger; using Squidex.Config.Swagger;
using Squidex.Config.Web; using Squidex.Config.Web;
using Squidex.Pipeline; using Squidex.Pipeline;
using Squidex.Store.MongoDb; using Squidex.Read.MongoDb;
// ReSharper disable ConvertClosureToMethodGroup // ReSharper disable ConvertClosureToMethodGroup
// ReSharper disable AccessToModifiedClosure // ReSharper disable AccessToModifiedClosure

2
src/Squidex/project.json

@ -33,7 +33,7 @@
"Squidex.Infrastructure.MongoDb": "1.0.0-*", "Squidex.Infrastructure.MongoDb": "1.0.0-*",
"Squidex.Infrastructure.RabbitMq": "1.0.0-*", "Squidex.Infrastructure.RabbitMq": "1.0.0-*",
"Squidex.Read": "1.0.0-*", "Squidex.Read": "1.0.0-*",
"Squidex.Store.MongoDb": "1.0.0-*", "Squidex.Read.MongoDb": "1.0.0-*",
"Squidex.Write": "1.0.0-*", "Squidex.Write": "1.0.0-*",
"System.Linq": "4.3.0" "System.Linq": "4.3.0"
}, },

21
tests/Squidex.Core.Tests/Schemas/SchemaTests.cs

@ -265,6 +265,27 @@ namespace Squidex.Core.Schemas
Assert.NotNull(json); Assert.NotNull(json);
} }
[Fact]
public void Should_build_edm_model()
{
var schema =
Schema.Create("user", new SchemaProperties { Hints = "The User" })
.AddOrUpdateField(new StringField(1, "firstName",
new StringFieldProperties { Label = "FirstName", IsLocalizable = true, IsRequired = true, AllowedValues = new[] { "1", "2" }.ToImmutableList() }))
.AddOrUpdateField(new StringField(2, "lastName",
new StringFieldProperties { Hints = "Last Name" }))
.AddOrUpdateField(new BooleanField(3, "admin",
new BooleanFieldProperties()))
.AddOrUpdateField(new NumberField(4, "age",
new NumberFieldProperties { MinValue = 1, MaxValue = 10 }));
var languages = new HashSet<Language>(new[] { Language.GetLanguage("de"), Language.GetLanguage("en") });
var edmModel = schema.BuildEdmType(languages, x => x);
Assert.NotNull(edmModel);
}
private NumberField AddField() private NumberField AddField()
{ {
var field = new NumberField(1, "my-field", new NumberFieldProperties()); var field = new NumberField(1, "my-field", new NumberFieldProperties());

1
tests/Squidex.Infrastructure.Tests/CQRS/DomainObjectTest.cs

@ -10,7 +10,6 @@ using System;
using Squidex.Infrastructure.CQRS.Events; using Squidex.Infrastructure.CQRS.Events;
using Xunit; using Xunit;
using System.Linq; using System.Linq;
// ReSharper disable ConvertToConstant.Local // ReSharper disable ConvertToConstant.Local
namespace Squidex.Infrastructure.CQRS namespace Squidex.Infrastructure.CQRS

1
tests/Squidex.Infrastructure.Tests/DispatchingTests.cs

@ -10,7 +10,6 @@ using System.Threading.Tasks;
using Squidex.Infrastructure.Dispatching; using Squidex.Infrastructure.Dispatching;
using Squidex.Infrastructure.Tasks; using Squidex.Infrastructure.Tasks;
using Xunit; using Xunit;
// ReSharper disable UnusedMethodReturnValue.Local // ReSharper disable UnusedMethodReturnValue.Local
// ReSharper disable UnusedParameter.Local // ReSharper disable UnusedParameter.Local
// ReSharper disable UnusedMember.Local // ReSharper disable UnusedMember.Local

1
tests/Squidex.Infrastructure.Tests/PropertiesBagTests.cs

@ -14,7 +14,6 @@ using Newtonsoft.Json;
using NodaTime; using NodaTime;
using Squidex.Infrastructure.Json; using Squidex.Infrastructure.Json;
using Xunit; using Xunit;
// ReSharper disable PossibleInvalidOperationException // ReSharper disable PossibleInvalidOperationException
// ReSharper disable UnusedParameter.Local // ReSharper disable UnusedParameter.Local

26
tests/Squidex.Read.Tests/Properties/AssemblyInfo.cs

@ -0,0 +1,26 @@
// ==========================================================================
// AssemblyInfo.cs
// Squidex Headless CMS
// ==========================================================================
// Copyright (c) Squidex Group
// All rights reserved.
// ==========================================================================
using System.Reflection;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Squidex.Read.Tests")]
[assembly: AssemblyTrademark("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("6b9364c6-94a1-4631-9cf1-87616afaf1ea")]

22
tests/Squidex.Read.Tests/Squidex.Read.Tests.xproj

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>9a3dea7e-1681-4d48-ac5c-1f0de421a203</ProjectGuid>
<RootNamespace>Squidex.Write</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

37
tests/Squidex.Read.Tests/project.json

@ -0,0 +1,37 @@
{
"buildOptions": {
"copyToOutput": {
"include": [
"xunit.runner.json"
]
}
},
"dependencies": {
"dotnet-test-xunit": "2.2.0-preview2-build1029",
"FluentAssertions": "4.18.0",
"Moq": "4.6.38-alpha",
"Squidex.Core": "1.0.0-*",
"Squidex.Infrastructure": "1.0.0-*",
"Squidex.Write": "1.0.0-*",
"xunit": "2.2.0-beta4-build3444"
},
"frameworks": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.1.0"
}
},
"imports": "dnxcore50"
}
},
"testRunner": "xunit",
"tooling": {
"defaultNamespace": "Squidex.Write"
},
"tools": {
"Microsoft.DotNet.Watcher.Tools": "1.0.0-preview2-final"
},
"version": "1.0.0-*"
}

1
tests/Squidex.Write.Tests/Apps/AppCommandHandlerTests.cs

@ -19,7 +19,6 @@ using Squidex.Read.Users.Repositories;
using Squidex.Write.Apps.Commands; using Squidex.Write.Apps.Commands;
using Squidex.Write.Utils; using Squidex.Write.Utils;
using Xunit; using Xunit;
// ReSharper disable ImplicitlyCapturedClosure // ReSharper disable ImplicitlyCapturedClosure
// ReSharper disable ConvertToConstant.Local // ReSharper disable ConvertToConstant.Local

1
tests/Squidex.Write.Tests/Apps/AppDomainObjectTests.cs

@ -16,7 +16,6 @@ using Squidex.Infrastructure.CQRS;
using Squidex.Infrastructure.CQRS.Events; using Squidex.Infrastructure.CQRS.Events;
using Squidex.Write.Apps.Commands; using Squidex.Write.Apps.Commands;
using Xunit; using Xunit;
// ReSharper disable ConvertToConstant.Local // ReSharper disable ConvertToConstant.Local
namespace Squidex.Write.Apps namespace Squidex.Write.Apps

1
tests/Squidex.Write.Tests/Contents/ContentCommandHandlerTests.cs

@ -20,7 +20,6 @@ using Squidex.Read.Schemas.Services;
using Squidex.Write.Contents.Commands; using Squidex.Write.Contents.Commands;
using Squidex.Write.Utils; using Squidex.Write.Utils;
using Xunit; using Xunit;
// ReSharper disable ConvertToConstant.Local // ReSharper disable ConvertToConstant.Local
namespace Squidex.Write.Contents namespace Squidex.Write.Contents

1
tests/Squidex.Write.Tests/Contents/ContentDomainObjectTests.cs

@ -16,7 +16,6 @@ using Squidex.Infrastructure.CQRS;
using Squidex.Infrastructure.CQRS.Events; using Squidex.Infrastructure.CQRS.Events;
using Squidex.Write.Contents.Commands; using Squidex.Write.Contents.Commands;
using Xunit; using Xunit;
// ReSharper disable ConvertToConstant.Local // ReSharper disable ConvertToConstant.Local
namespace Squidex.Write.Contents namespace Squidex.Write.Contents

1
tests/Squidex.Write.Tests/Schemas/SchemaCommandHandlerTests.cs

@ -18,7 +18,6 @@ using Squidex.Read.Schemas.Services;
using Squidex.Write.Schemas.Commands; using Squidex.Write.Schemas.Commands;
using Squidex.Write.Utils; using Squidex.Write.Utils;
using Xunit; using Xunit;
// ReSharper disable ConvertToConstant.Local // ReSharper disable ConvertToConstant.Local
namespace Squidex.Write.Schemas namespace Squidex.Write.Schemas

1
tests/Squidex.Write.Tests/Schemas/SchemaDomainObjectTests.cs

@ -16,7 +16,6 @@ using Squidex.Infrastructure.CQRS;
using Squidex.Infrastructure.CQRS.Events; using Squidex.Infrastructure.CQRS.Events;
using Squidex.Write.Schemas.Commands; using Squidex.Write.Schemas.Commands;
using Xunit; using Xunit;
// ReSharper disable ConvertToConstant.Local // ReSharper disable ConvertToConstant.Local
namespace Squidex.Write.Schemas namespace Squidex.Write.Schemas

Loading…
Cancel
Save