Finishing merge

Alexandria.Backend/AlexandriaBootStrapper.cs

@@ -1,47 +1,40 @@
-using System;
-using System.Net;
-using Alexandria.Backend.Model;
 using Alexandria.Backend.Modules;
 using Castle.Core;
 using Castle.Facilities.FactorySupport;
 using Castle.MicroKernel.Registration;
 using HibernatingRhinos.Profiler.Appender.NHibernate;
-using log4net.Appender;
-using log4net.Config;
-using log4net.Core;
-using log4net.Layout;
 using NHibernate;
 using NHibernate.Cfg;
-using NHibernate.Tool.hbm2ddl;
 using Rhino.ServiceBus.Hosting;
 using Rhino.ServiceBus.MessageModules;
 
 namespace Alexandria.Backend
 {
-	public class AlexandriaBootStrapper : AbstractBootStrapper
-	{
-		public AlexandriaBootStrapper()
-		{
-			NHibernateProfiler.Initialize();
-		}
+  public class AlexandriaBootStrapper : AbstractBootStrapper
+  {
+    public AlexandriaBootStrapper()
+    {
+      NHibernateProfiler.Initialize();
+    }
 
-		protected override void ConfigureContainer()
-		{
-			container.Kernel.AddFacility("factory", new FactorySupportFacility());
+    protected override void ConfigureContainer()
+    {
+      var cfg = new Configuration()
+        .Configure("nhibernate.config");
+      var sessionFactory = cfg.BuildSessionFactory();
 
-			var cfg = new Configuration()
-				.Configure("nhibernate.config");
+      container.Kernel.AddFacility("factory", new FactorySupportFacility());
 
-			var sessionFactory = cfg.BuildSessionFactory();
-			container.Register(Component.For<ISessionFactory>().Instance(sessionFactory));
+      container.Register(
+        Component.For<ISessionFactory>()
+          .Instance(sessionFactory),
+        Component.For<IMessageModule>()
+          .ImplementedBy<NHibernateMessageModule>(),
+        Component.For<ISession>()
+          .UsingFactoryMethod(() => NHibernateMessageModule.CurrentSession)
+          .LifeStyle.Is(LifestyleType.Transient));
 
-			container.Register(Component.For<IMessageModule>().ImplementedBy<NHibernateMessageModule>());
-
-			container.Register(Component.For<ISession>()
-				.UsingFactoryMethod(() => NHibernateMessageModule.CurrentSession)
-				.LifeStyle.Is(LifestyleType.Transient));
-
-			base.ConfigureContainer();
-		}
-	}
+      base.ConfigureContainer();
+    }
+  }
 }

Alexandria.Client/ApplicationModel.cs

@@ -11,6 +11,12 @@ public class ApplicationModel : Screen
         private readonly IServiceBus bus;
         private Screen potentialBooks;
 
+        /// <summary>
+        /// Pretend that application startup is showing the user some login screen
+        /// and that we get the user id from the login process
+        /// </summary>
+        private const int userId = 1;
+
         public ApplicationModel(IServiceBus bus)
         {
             this.bus = bus;
@@ -52,19 +58,19 @@ protected override void OnInitialize()
             bus.Send(
                 new MyBooksRequest
                     {
-                        UserId = 1
+                        UserId = userId
                     },
                 new MyQueueRequest
                     {
-                        UserId = 1
+                        UserId = userId
                     },
                 new MyRecommendationsRequest
                     {
-                        UserId = 1
+                        UserId = userId
                     },
                 new SubscriptionDetailsRequest
                     {
-                        UserId = 1
+                        UserId = userId
                     });
         }
     }

Alexandria.Client/Consumers/SubscriptionDetailsResponseConsumer.cs

@@ -1,3 +1,5 @@
+using Caliburn.Core.Invocation;
+
 namespace Alexandria.Client.Consumers
 {
     using Messages;
@@ -14,7 +16,7 @@ public SubscriptionDetailsResponseConsumer(ApplicationModel applicationModel)
 
         public void Consume(SubscriptionDetailsResponse message)
         {
-            applicationModel.SubscriptionDetails.UpdateFrom(message.SubscriptionDetails);
+        	Execute.OnUIThreadAsync(() => applicationModel.SubscriptionDetails.UpdateFrom(message.SubscriptionDetails));
         }
     }
 }

Alexandria.Client/Consumers/UpdateDetailsResultConsumer.cs

@@ -1,3 +1,5 @@
+using Caliburn.Core.Invocation;
+
 namespace Alexandria.Client.Consumers
 {
     using Infrastructure;
@@ -16,14 +18,17 @@ public UpdateDetailsResultConsumer(ApplicationModel applicationModel)
 
         public void Consume(UpdateDetailsResult message)
         {
-            if(message.Success)
-            {
-            	applicationModel.SubscriptionDetails.CompleteEdit();
-            }
-			else
-            {
-            	applicationModel.SubscriptionDetails.ErrorEdit(message.ErrorMessage);
-            }
+        	Execute.OnUIThreadAsync(() =>
+        	{
+        		if (message.Success)
+        		{
+        			applicationModel.SubscriptionDetails.CompleteEdit();
+        		}
+        		else
+        		{
+        			applicationModel.SubscriptionDetails.ErrorEdit(message.ErrorMessage);
+        		}
+        	});
         }
     }
 }