Version 1.0.1: Upgrades to work with new version of MongoDB.

aashishkoirala · Oct 30, 2015 · d0cd7ee · d0cd7ee
1 parent 5a24abc
commit d0cd7ee
Show file tree

Hide file tree

Showing 12 changed files with 85 additions and 32 deletions.
diff --git a/src/AK.Chore.Application/Properties/AssemblyInfo.cs b/src/AK.Chore.Application/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("c412acab-d2c9-4b4b-98a5-b0b894fdd857")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
diff --git a/src/AK.Chore.Application/Services/LoginService.cs b/src/AK.Chore.Application/Services/LoginService.cs
@@ -21,9 +21,12 @@
 
 #region Namespace Imports
 
+using AK.Chore.Contracts;
 using AK.Chore.Contracts.UserProfile;
 using AK.Commons;
+using AK.Commons.Logging;
 using AK.Commons.Security;
+using AK.Commons.Services;
 using System;
 using System.ServiceModel;
 
@@ -65,9 +68,11 @@ public class LoginService : ILoginService
             "<li>Export and import tasks to/from flat data.</li></ul>";
 
         private IUserProfileService userProfileService;
+        private IAppLogger logger;
         private LoginSplashInfo loginSplashInfo;
 
         public IUserProfileService UserProfileServiceOverride { get; set; }
+        public IAppLogger LoggerOverride { get; set; }
 
         public Uri RequestUriOverride { get; set; }
 
@@ -80,6 +85,11 @@ private IUserProfileService UserProfileService
             }
         }
 
+        private IAppLogger Logger
+        {
+            get { return this.LoggerOverride ?? this.logger ?? (this.logger = AppEnvironment.Logger); }
+        }
+
         public LoginSplashInfo GetLoginSplashInfo()
         {
             return this.loginSplashInfo ??
@@ -88,7 +98,17 @@ public LoginSplashInfo GetLoginSplashInfo()
 
         public LoginUserInfo GetUser(string userName)
         {
-            var result = this.UserProfileService.GetUserByUserName(userName);
+            OperationResult<User> result;
+            try
+            {
+                result = this.UserProfileService.GetUserByUserName(userName);
+            }
+            catch (Exception ex)
+            {
+                this.Logger.Error(ex);
+                result = new OperationResult<User>(GeneralResult.Error, null, ex.Message);
+            }
+
             if (result.IsSuccess)
             {
                 var user = result.Result;
@@ -109,7 +129,18 @@ public LoginUserInfo GetUser(string userName)
 
         public LoginUserInfo CreateUser(LoginUserInfo userInfo)
         {
-            var result = this.UserProfileService.CreateUser(userInfo.UserName, userInfo.DisplayName);
+            OperationResult<User> result;
+
+            try
+            {
+                result = this.UserProfileService.CreateUser(userInfo.UserName, userInfo.DisplayName);
+            }
+            catch (Exception ex)
+            {
+                this.Logger.Error(ex);
+                result = new OperationResult<User>(GeneralResult.Error, null, ex.Message);
+            }
+
             if (!result.IsSuccess) throw new FaultException(new FaultReason(result.Message));
 
             userInfo.UserExists = true;

diff --git a/src/AK.Chore.Contracts/Properties/AssemblyInfo.cs b/src/AK.Chore.Contracts/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("2f72ec68-c3c5-454b-966b-a15a1a2afb04")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
diff --git a/src/AK.Chore.Domain/Properties/AssemblyInfo.cs b/src/AK.Chore.Domain/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("fcf9ec22-2233-420e-b28f-e3b534497b1f")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
diff --git a/src/AK.Chore.Infrastructure/Properties/AssemblyInfo.cs b/src/AK.Chore.Infrastructure/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("b008b443-6468-4f73-87f8-61a11d1e16f9")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
diff --git a/src/AK.Chore.Presentation/AK.Chore.Presentation.csproj b/src/AK.Chore.Presentation/AK.Chore.Presentation.csproj
@@ -49,9 +49,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\AK.Commons.1.0.3\lib\net45\AK.Commons.dll</HintPath>
     </Reference>
-    <Reference Include="AK.Commons.Providers.DataAccess.MongoDb, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="AK.Commons.Providers.DataAccess.MongoDb, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\AK.Commons.Providers.DataAccess.MongoDb.1.0.0\lib\net45\AK.Commons.Providers.DataAccess.MongoDb.dll</HintPath>
+      <HintPath>..\..\lib\AK.Commons.Providers.DataAccess.MongoDb.1.0.2\lib\net45\AK.Commons.Providers.DataAccess.MongoDb.dll</HintPath>
     </Reference>
     <Reference Include="AK.Commons.Web, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -82,13 +82,19 @@
       <Private>True</Private>
       <HintPath>..\..\lib\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Bson, Version=1.8.2.34, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
+    <Reference Include="MongoDB.Bson">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\mongocsharpdriver.1.8.2\lib\net35\MongoDB.Bson.dll</HintPath>
+      <HintPath>..\..\lib\MongoDB.Bson.2.1.0\lib\net45\MongoDB.Bson.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Driver, Version=1.8.2.34, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
+    <Reference Include="MongoDB.Driver">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\mongocsharpdriver.1.8.2\lib\net35\MongoDB.Driver.dll</HintPath>
+      <HintPath>..\..\lib\MongoDB.Driver.2.1.0\lib\net45\MongoDB.Driver.dll</HintPath>
+    </Reference>
+    <Reference Include="MongoDB.Driver.Core">
+      <HintPath>..\..\lib\MongoDB.Driver.Core.2.1.0\lib\net45\MongoDB.Driver.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="MongoDB.Driver.Legacy">
+      <HintPath>..\..\lib\mongocsharpdriver.2.1.0\lib\net45\MongoDB.Driver.Legacy.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -247,7 +253,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="packages.config" />
+    <Content Include="packages.config">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="Client\oswald.eot" />
     <Content Include="Client\oswald.woff2" />
     <Content Include="Client\oswald.woff" />

diff --git a/src/AK.Chore.Presentation/Properties/AssemblyInfo.cs b/src/AK.Chore.Presentation/Properties/AssemblyInfo.cs
@@ -39,5 +39,5 @@
 [assembly: OwinStartup(typeof(ChoreApplication))]
 [assembly: ComVisible(false)]
 [assembly: Guid("32b9e455-47b5-4628-821e-8455ec7621f2")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
diff --git a/src/AK.Chore.Presentation/packages.config b/src/AK.Chore.Presentation/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="AjaxMin" version="5.12.5436.22734" targetFramework="net45" />
   <package id="AK.Commons" version="1.0.3" targetFramework="net45" />
-  <package id="AK.Commons.Providers.DataAccess.MongoDb" version="1.0.0" targetFramework="net45" />
+  <package id="AK.Commons.Providers.DataAccess.MongoDb" version="1.0.2" targetFramework="net45" />
   <package id="AK.Commons.Web" version="1.0.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net45" />
   <package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
@@ -20,7 +20,10 @@
   <package id="Microsoft.Owin.Host.SystemWeb" version="2.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Security" version="2.0.1" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="mongocsharpdriver" version="1.8.2" targetFramework="net45" />
+  <package id="mongocsharpdriver" version="2.1.0" targetFramework="net45" />
+  <package id="MongoDB.Bson" version="2.1.0" targetFramework="net45" />
+  <package id="MongoDB.Driver" version="2.1.0" targetFramework="net45" />
+  <package id="MongoDB.Driver.Core" version="2.1.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
 </packages>
diff --git a/src/AK.Chore.Tests/AK.Chore.Tests.csproj b/src/AK.Chore.Tests/AK.Chore.Tests.csproj
@@ -41,16 +41,24 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\AK.Commons.1.0.3\lib\net45\AK.Commons.dll</HintPath>
     </Reference>
-    <Reference Include="AK.Commons.Providers.DataAccess.MongoDb, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="AK.Commons.Providers.DataAccess.MongoDb, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\AK.Commons.Providers.DataAccess.MongoDb.1.0.0\lib\net45\AK.Commons.Providers.DataAccess.MongoDb.dll</HintPath>
+      <HintPath>..\..\lib\AK.Commons.Providers.DataAccess.MongoDb.1.0.2\lib\net45\AK.Commons.Providers.DataAccess.MongoDb.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="MongoDB.Bson">
-      <HintPath>..\packages\mongocsharpdriver.1.8.2\lib\net35\MongoDB.Bson.dll</HintPath>
+    <Reference Include="MongoDB.Bson, Version=2.1.0.145, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\MongoDB.Bson.2.1.0\lib\net45\MongoDB.Bson.dll</HintPath>
+    </Reference>
+    <Reference Include="MongoDB.Driver, Version=2.1.0.145, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\MongoDB.Driver.2.1.0\lib\net45\MongoDB.Driver.dll</HintPath>
+    </Reference>
+    <Reference Include="MongoDB.Driver.Core">
+      <HintPath>..\..\lib\MongoDB.Driver.Core.2.1.0\lib\net45\MongoDB.Driver.Core.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Driver">
-      <HintPath>..\packages\mongocsharpdriver.1.8.2\lib\net35\MongoDB.Driver.dll</HintPath>
+    <Reference Include="MongoDB.Driver.Legacy">
+      <HintPath>..\..\lib\mongocsharpdriver.2.1.0\lib\net45\MongoDB.Driver.Legacy.dll</HintPath>
     </Reference>
     <Reference Include="Moq">
       <HintPath>..\..\lib\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>

diff --git a/src/AK.Chore.Tests/Properties/AssemblyInfo.cs b/src/AK.Chore.Tests/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("2acecedb-faa5-4328-8c96-b91e1cc572e0")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
diff --git a/src/AK.Chore.Tests/packages.config b/src/AK.Chore.Tests/packages.config
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AK.Commons" version="1.0.3" targetFramework="net45" />
-  <package id="AK.Commons.Providers.DataAccess.MongoDb" version="1.0.0" targetFramework="net45" />
-  <package id="mongocsharpdriver" version="1.8.2" targetFramework="net45" />
+  <package id="AK.Commons.Providers.DataAccess.MongoDb" version="1.0.2" targetFramework="net45" />
+  <package id="mongocsharpdriver" version="2.1.0" targetFramework="net45" />
+  <package id="MongoDB.Bson" version="2.1.0" targetFramework="net45" />
+  <package id="MongoDB.Driver" version="2.1.0" targetFramework="net45" />
+  <package id="MongoDB.Driver.Core" version="2.1.0" targetFramework="net45" />
   <package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
 </packages>
diff --git a/src/AK.Chore.sln b/src/AK.Chore.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2012 
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{B6578652-E4EC-4451-9F59-8BD5AE870A77}"
 	ProjectSection(SolutionItems) = preProject
 		.nuget\NuGet.Config = .nuget\NuGet.Config