Created simple blog sample (#8)

* Fixed context sample. * Added service collection extensions. * Created simple blog sample first draft. * Added sample projects again.
SwissLife-OSS · Dec 5, 2019 · cd94cb7 · cd94cb7
1 parent 8157a84
commit cd94cb7
Showing 24 changed files with 333 additions and 107 deletions.
diff --git a/samples/Context/DataAccess/BlogRepository.cs b/samples/Context/DataAccess/BlogRepository.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Models;
+using MongoDB.Driver;
+
+namespace DataAccess
+{
+    public class BlogRepository
+    {
+        private IMongoCollection<Blog> _mongoCollection;
+
+        public BlogRepository(SimpleBlogDbContext simpleBlogDbContext)
+        {
+            if (simpleBlogDbContext == null)
+                throw new ArgumentNullException(nameof(simpleBlogDbContext));
+
+            _mongoCollection = simpleBlogDbContext.CreateCollection<Blog>();
+        }
+
+        public async Task AddBlogAsync(
+            Blog blog, CancellationToken cancellationToken)
+        {
+            var insertOneOptions = new InsertOneOptions()
+            {
+                BypassDocumentValidation = false
+            };
+
+            await _mongoCollection
+                .InsertOneAsync(blog, insertOneOptions, cancellationToken);
+        }
+    }
+}
diff --git a/samples/Context/DataAccess/Configuration/BlogCollectionConfiguration.cs b/samples/Context/DataAccess/Configuration/BlogCollectionConfiguration.cs
@@ -0,0 +1,30 @@
+using Models;
+using MongoDB.Driver;
+using MongoDB.Extensions.Context;
+
+namespace DataAccess
+{
+    internal class BlogCollectionConfiguration : IMongoCollectionConfiguration<Blog>
+    {
+        public void Configure(IMongoCollectionBuilder<Blog> mongoCollectionBuilder)
+        {
+            mongoCollectionBuilder
+                .WithCollectionName("blogs")
+                .AddBsonClassMap<Blog>(cm =>
+                {
+                    cm.AutoMap();
+                    cm.MapIdMember<string>(c => c.Id);
+                })
+                .WithMongoCollectionSettings(settings => settings.ReadConcern = ReadConcern.Majority)
+                .WithMongoCollectionSettings(settings => settings.ReadPreference = ReadPreference.Nearest)
+                .WithMongoCollectionConfiguration(collection =>
+                {
+                    var timestampIndex = new CreateIndexModel<Blog>(
+                        Builders<Blog>.IndexKeys.Ascending(blog => blog.TimeStamp),
+                        new CreateIndexOptions { Unique = false });
+
+                    collection.Indexes.CreateOne(timestampIndex);
+                });
+        }
+    }
+}
diff --git a/samples/Context/DataAccess/Configuration/ProductCollectionConfiguration.cs b/samples/Context/DataAccess/Configuration/ProductCollectionConfiguration.cs
diff --git a/samples/Context/DataAccess/Configuration/ShopDbContext.cs b/samples/Context/DataAccess/Configuration/ShopDbContext.cs
diff --git a/samples/Context/DataAccess/Configuration/TagCollectionConfiguration.cs b/samples/Context/DataAccess/Configuration/TagCollectionConfiguration.cs
@@ -0,0 +1,30 @@
+using Models;
+using MongoDB.Driver;
+using MongoDB.Extensions.Context;
+using Tag = Models.Tag;
+
+namespace DataAccess
+{
+    internal class TagCollectionConfiguration : IMongoCollectionConfiguration<Tag>
+    {
+        public void Configure(IMongoCollectionBuilder<Tag> mongoCollectionBuilder)
+        {
+            mongoCollectionBuilder
+                .AddBsonClassMap<Tag>(cm => cm.AutoMap())
+                .WithMongoCollectionSettings(setting =>
+                {
+                    setting.ReadPreference = ReadPreference.Nearest;
+                    setting.ReadConcern = ReadConcern.Available;
+                    setting.WriteConcern = WriteConcern.Acknowledged;
+                })
+                .WithMongoCollectionConfiguration(collection =>
+                {
+                    var timestampIndex = new CreateIndexModel<Tag>(
+                        Builders<Tag>.IndexKeys.Ascending(tag => tag.Name),
+                        new CreateIndexOptions { Unique = false });
+
+                    collection.Indexes.CreateOne(timestampIndex);
+                });
+        }
+    }
+}
diff --git a/samples/Context/DataAccess/Configuration/UserCollectionConfiguration.cs b/samples/Context/DataAccess/Configuration/UserCollectionConfiguration.cs
@@ -0,0 +1,64 @@
+using System;
+using Models;
+using MongoDB.Bson.Serialization;
+using MongoDB.Driver;
+using MongoDB.Extensions.Context;
+
+namespace DataAccess
+{
+    internal class UserCollectionConfiguration : IMongoCollectionConfiguration<User>
+    {
+        public void Configure(IMongoCollectionBuilder<User> mongoCollectionBuilder)
+        {
+            mongoCollectionBuilder
+                .WithCollectionName("users")
+                .AddBsonClassMap<User>(ConfigureUserClassMap())
+                .WithMongoCollectionSettings(ConfigureCollectionSettings())
+                .WithMongoCollectionConfiguration(ConfigureIndexes());
+        }
+
+        private static Action<MongoCollectionSettings> ConfigureCollectionSettings()
+        {
+            return setting =>
+            {
+                setting.WriteConcern = WriteConcern.WMajority.With(journal: true);
+                setting.ReadConcern = ReadConcern.Majority;
+                setting.ReadPreference = ReadPreference.Primary;
+            };
+        }
+
+        private static Action<IMongoCollection<User>> ConfigureIndexes()
+        {
+            return collection =>
+            {
+                var emailIndex = new CreateIndexModel<User>(
+                    Builders<User>.IndexKeys.Ascending(user => user.Email),
+                    new CreateIndexOptions { Unique = true });
+
+                var nicknameIndex = new CreateIndexModel<User>(
+                    Builders<User>.IndexKeys.Ascending(user => user.Nickname),
+                    new CreateIndexOptions { Unique = true });
+
+                var firstname = new CreateIndexModel<User>(
+                    Builders<User>.IndexKeys.Ascending(user => user.Firstname),
+                    new CreateIndexOptions { Unique = false });
+
+                var secondname = new CreateIndexModel<User>(
+                    Builders<User>.IndexKeys.Ascending(user => user.Lastname),
+                    new CreateIndexOptions { Unique = false });
+
+                collection.Indexes.CreateMany(
+                    new[] { emailIndex, nicknameIndex, firstname, secondname });
+            };
+        }
+
+        private static Action<BsonClassMap<User>> ConfigureUserClassMap()
+        {
+            return cm =>
+            {
+                cm.AutoMap();
+                cm.MapIdMember(c => c.Id);
+            };
+        }
+    }
+}
diff --git a/samples/Context/DataAccess/DataAccess.csproj b/samples/Context/DataAccess/DataAccess.csproj
@@ -1,11 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>    
+    <AssemblyName>SimpleBlog.DataAccess</AssemblyName>
+    <RootNamespace>SimpleBlog.DataAccess</RootNamespace>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
     <PackageReference Include="MongoDB.Extensions.Context" Version="0.1.0-preview1" />
   </ItemGroup>

diff --git a/samples/Context/DataAccess/ProductRepository.cs b/samples/Context/DataAccess/ProductRepository.cs
diff --git a/samples/Context/DataAccess/ServiceCollectionExtensions.cs b/samples/Context/DataAccess/ServiceCollectionExtensions.cs
@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using MongoDB.Extensions.Context;
 
 namespace DataAccess
 {
@@ -8,9 +9,13 @@ public static class ServiceCollectionExtensions
         private static IServiceCollection AddShopDatabase(
             this IServiceCollection services, IConfiguration configuration)
         {
-            //MongoOptions dbOptions = configuration
-            //    .GetSection(Wellknown.Configuration.Sections.Database)
-            //    .Get<MongoOptions<IDocuStoreDbContext>>()
+            MongoOptions shopDbOptions = configuration
+                .GetSection("Shop:Database")
+                .Get<MongoOptions>();
+
+            services.AddSingleton<MongoOptions>(sp => shopDbOptions);
+            services.AddSingleton<SimpleBlogDbContext>();
+            services.AddSingleton<BlogRepository>();
 
             return services;
         }

diff --git a/samples/Context/DataAccess/SimpleBlogDbContext.cs b/samples/Context/DataAccess/SimpleBlogDbContext.cs
@@ -0,0 +1,26 @@
+using MongoDB.Bson.Serialization.Serializers;
+using MongoDB.Driver;
+using MongoDB.Extensions.Context;
+
+namespace DataAccess
+{
+    public class SimpleBlogDbContext : MongoDbContext
+    {
+        public SimpleBlogDbContext(MongoOptions mongoOptions) : base(mongoOptions)
+        {
+        }
+
+        protected override void OnConfiguring(IMongoDatabaseBuilder mongoDatabaseBuilder)
+        {
+            mongoDatabaseBuilder
+                .RegisterCamelCaseConventionPack()
+                .RegisterSerializer(new DateTimeOffsetSerializer())
+                .ConfigureConnection(con => con.ReadConcern = ReadConcern.Majority)
+                .ConfigureConnection(con => con.WriteConcern = WriteConcern.WMajority)
+                .ConfigureConnection(con => con.ReadPreference = ReadPreference.Primary)
+                .ConfigureCollection(new UserCollectionConfiguration())
+                .ConfigureCollection(new BlogCollectionConfiguration())
+                .ConfigureCollection(new TagCollectionConfiguration());
+        }
+    }
+}
diff --git a/samples/Context/DataAccess/TagRepository.cs b/samples/Context/DataAccess/TagRepository.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using MongoDB.Driver;
+using Tag = Models.Tag;
+
+namespace DataAccess
+{
+    public class TagRepository
+    {
+        private InsertOneOptions _insertOneOptions;
+        private IMongoCollection<Tag> _mongoCollection;
+
+        public TagRepository(SimpleBlogDbContext simpleBlogDbContext)
+        {
+            if (simpleBlogDbContext == null)
+                throw new ArgumentNullException(nameof(simpleBlogDbContext));
+
+            _mongoCollection = simpleBlogDbContext.CreateCollection<Tag>();
+
+            _insertOneOptions = new InsertOneOptions()
+            {
+                BypassDocumentValidation = false
+            };
+        }
+
+        public async Task AddTagAsync(
+            Tag tag, CancellationToken cancellationToken)
+        {
+            await _mongoCollection
+                .InsertOneAsync(tag, _insertOneOptions, cancellationToken);
+        }
+    }
+}
diff --git a/samples/Context/DataAccess/UserRepository.cs b/samples/Context/DataAccess/UserRepository.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Models;
+using MongoDB.Driver;
+
+namespace DataAccess
+{
+    public class UserRepository
+    {
+        private InsertOneOptions _insertOneOptions;
+        private IMongoCollection<User> _mongoCollection;
+
+        public UserRepository(SimpleBlogDbContext simpleBlogDbContext)
+        {
+            if (simpleBlogDbContext == null)
+                throw new ArgumentNullException(nameof(simpleBlogDbContext));
+
+            _mongoCollection = simpleBlogDbContext.CreateCollection<User>();
+
+            _insertOneOptions = new InsertOneOptions()
+            {
+                BypassDocumentValidation = false
+            };
+        }
+
+        public async Task AddUserAsync(
+            User user, CancellationToken cancellationToken)
+        {
+            await _mongoCollection
+                .InsertOneAsync(user, _insertOneOptions, cancellationToken);
+        }
+    }
+}
diff --git a/samples/Context/Domain/Domain.csproj b/samples/Context/Domain/Domain.csproj
@@ -2,10 +2,13 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <AssemblyName>SimpleBlog.Domain</AssemblyName>
+    <RootNamespace>SimpleBlog.Domain</RootNamespace>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Models\Models.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/samples/Context/Models/Blog.cs b/samples/Context/Models/Blog.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Models
+{
+    public class Blog
+    {
+        public string Id { get; set; }
+
+        public DateTime TimeStamp { get; set; }
+
+        public IEnumerable<Tag> Tags { get; set; }
+
+        public string Text { get; set; }
+
+        public string UserId { get; set; }
+    }
+}
diff --git a/samples/Context/Models/Models.csproj b/samples/Context/Models/Models.csproj
@@ -2,6 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <AssemblyName>SimpleBlog.Models</AssemblyName>
+    <RootNamespace>SimpleBlog.Models</RootNamespace>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-</Project>
+</Project>
diff --git a/samples/Context/Models/Product.cs b/samples/Context/Models/Product.cs
diff --git a/samples/Context/Models/Tag.cs b/samples/Context/Models/Tag.cs
@@ -0,0 +1,9 @@
+namespace Models
+{
+    public class Tag
+    {
+        public string Id { get; set; }
+
+        public string Name { get; set; }
+    }
+}
diff --git a/samples/Context/Models/User.cs b/samples/Context/Models/User.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace Models
+{
+    public class User
+    {
+        public Guid Id { get; set; }
+
+        public string Email { get; set; }
+
+        public string Nickname { get; set; }
+
+        public string Firstname { get; set; }
+
+        public string Lastname { get; set; }
+    }
+}
diff --git a/samples/MongoDB.Extensions.Samples.sln b/samples/MongoDB.Extensions.Samples.sln
@@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2_Domain", "2_Domain", "{22
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3_DataAccess", "3_DataAccess", "{A880C40E-8DAF-4EFF-AE50-B8983AF424D3}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SimpleBlog", "SimpleBlog", "{1B6D9C2E-9D39-49E2-8522-29049C3D4821}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,9 +45,10 @@ Global
 		{B08692DA-8E74-4F3D-9B8E-66C5962BD7D1} = {A880C40E-8DAF-4EFF-AE50-B8983AF424D3}
 		{932A6303-B363-4739-9051-C195C54D9C1C} = {229E6D6C-AB33-4095-A09B-647434079280}
 		{D571B3C8-F426-4A5B-BEB7-0B2D5B95A6C4} = {229E6D6C-AB33-4095-A09B-647434079280}
-		{C4DEA4A3-B50A-4ACD-9017-4919576CE069} = {27E20B8D-3948-41A2-9271-69D850357C35}
-		{229E6D6C-AB33-4095-A09B-647434079280} = {27E20B8D-3948-41A2-9271-69D850357C35}
-		{A880C40E-8DAF-4EFF-AE50-B8983AF424D3} = {27E20B8D-3948-41A2-9271-69D850357C35}
+		{C4DEA4A3-B50A-4ACD-9017-4919576CE069} = {1B6D9C2E-9D39-49E2-8522-29049C3D4821}
+		{229E6D6C-AB33-4095-A09B-647434079280} = {1B6D9C2E-9D39-49E2-8522-29049C3D4821}
+		{A880C40E-8DAF-4EFF-AE50-B8983AF424D3} = {1B6D9C2E-9D39-49E2-8522-29049C3D4821}
+		{1B6D9C2E-9D39-49E2-8522-29049C3D4821} = {27E20B8D-3948-41A2-9271-69D850357C35}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E28A6DDE-2575-483D-8C8B-7929357BA44A}

diff --git a/src/Context.Tests/MongoCollectionBuilderTests.cs b/src/Context.Tests/MongoCollectionBuilderTests.cs
@@ -138,7 +138,7 @@ public void WithMongoCollectionSettings_ChangeCollectionSettings_MongoCollection
             var mongoCollectionBuilder = new MongoCollectionBuilder<Order>(_mongoDatabase);
 
             // Act
-            mongoCollectionBuilder.WithMongoCollectionSettings(mongoCollectionSettings =>
+            mongoCollectionBuilder.WithCollectionSettings(mongoCollectionSettings =>
             {
                 mongoCollectionSettings.WriteConcern = WriteConcern.Unacknowledged;
                 mongoCollectionSettings.ReadConcern = ReadConcern.Linearizable;
@@ -178,7 +178,7 @@ public void WithMongoCollectionSettings_DefaultCollectionSettingsConfigured_Defa
             var mongoCollectionSettings = new MongoCollectionSettings();
 
             // Act
-            mongoCollectionBuilder.WithMongoCollectionSettings(mongoCollectionSettings => { });
+            mongoCollectionBuilder.WithCollectionSettings(mongoCollectionSettings => { });
             IMongoCollection <Order> result = mongoCollectionBuilder.Build();
 
             // Assert
@@ -199,7 +199,7 @@ public void WithMongoCollectionConfiguration_ChangeCollectionConfiguration_Mongo
             var mongoCollectionBuilder = new MongoCollectionBuilder<Order>(_mongoDatabase);
 
             // Act
-            mongoCollectionBuilder.WithMongoCollectionConfiguration(mongoCollection =>
+            mongoCollectionBuilder.WithCollectionConfiguration(mongoCollection =>
             {
                 mongoCollection.Indexes.CreateOne(new CreateIndexModel<Order>(
                     Builders<Order>.IndexKeys.Ascending(order => order.Name),

diff --git a/src/Context/IMongoCollectionBuilder.cs b/src/Context/IMongoCollectionBuilder.cs
@@ -12,10 +12,10 @@ public interface IMongoCollectionBuilder<TDocument>
         IMongoCollectionBuilder<TDocument> AddBsonClassMap<TMapDocument>(
             Action<BsonClassMap<TMapDocument>> bsonClassMapAction) where TMapDocument : class;
 
-        IMongoCollectionBuilder<TDocument> WithMongoCollectionSettings(
+        IMongoCollectionBuilder<TDocument> WithCollectionSettings(
             Action<MongoCollectionSettings> collectionSettings);
 
-        IMongoCollectionBuilder<TDocument> WithMongoCollectionConfiguration(
+        IMongoCollectionBuilder<TDocument> WithCollectionConfiguration(
             Action<IMongoCollection<TDocument>> collectionConfiguration);        
     }
 }
diff --git a/src/Context/IMongoCollectionConfiguration.cs b/src/Context/IMongoCollectionConfiguration.cs
@@ -2,6 +2,6 @@ namespace MongoDB.Extensions.Context
 {
     public interface IMongoCollectionConfiguration<TDocument> where TDocument : class
     {
-        void Configure(IMongoCollectionBuilder<TDocument> mongoCollectionBuilder);
+        void OnConfiguring(IMongoCollectionBuilder<TDocument> mongoCollectionBuilder);
     }
 }
diff --git a/src/Context/Internal/MongoCollectionBuilder.cs b/src/Context/Internal/MongoCollectionBuilder.cs
@@ -50,15 +50,15 @@ public IMongoCollectionBuilder<TDocument> AddBsonClassMap<TMapDocument>(
             return this;
         }
 
-        public IMongoCollectionBuilder<TDocument> WithMongoCollectionSettings(
+        public IMongoCollectionBuilder<TDocument> WithCollectionSettings(
             Action<MongoCollectionSettings> collectionSettings)
         {
             _collectionSettingsActions.Add(collectionSettings);
 
             return this;
         }
 
-        public IMongoCollectionBuilder<TDocument> WithMongoCollectionConfiguration(
+        public IMongoCollectionBuilder<TDocument> WithCollectionConfiguration(
             Action<IMongoCollection<TDocument>> collectionConfiguration)
         {
             _collectionConfigurations.Add(collectionConfiguration);

diff --git a/src/Context/Internal/MongoDatabaseBuilder.cs b/src/Context/Internal/MongoDatabaseBuilder.cs
@@ -56,7 +56,7 @@ public IMongoDatabaseBuilder ConfigureCollection<TDocument>(
 
                     var collectionBuilder = new MongoCollectionBuilder<TDocument>(mongoDb);
 
-                    configuration.Configure(collectionBuilder);
+                    configuration.OnConfiguring(collectionBuilder);
                     collectionBuilder.Build();
 
                     mongoCollectionBuilders.Add(typeof(TDocument), collectionBuilder);