Integration of CommonDomain by Jonathan Oliver

KennyBu · Mar 2, 2011 · 227a30f · 227a30f
1 parent 5cec9f9
commit 227a30f
Show file tree

Hide file tree

Showing 13 changed files with 62 additions and 290 deletions.
diff --git a/CQRSSample.App/CQRSSample.App.csproj b/CQRSSample.App/CQRSSample.App.csproj
@@ -91,16 +91,20 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\External Libs\Castle Windsor\dotNet40\Castle.Windsor.dll</HintPath>
     </Reference>
+    <Reference Include="CommonDomain">
+      <HintPath>..\External Libs\CommonDomain\bin\CommonDomain.dll</HintPath>
+    </Reference>
     <Reference Include="EventStore, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7735eb81c0bd9948, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\External Libs\EventStore\bin\EventStore.dll</HintPath>
+      <HintPath>..\External Libs\CommonDomain\bin\EventStore.dll</HintPath>
     </Reference>
     <Reference Include="EventStore.Persistence.RavenPersistence, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7735eb81c0bd9948, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\External Libs\EventStore\bin\EventStore.Persistence.RavenPersistence.dll</HintPath>
+      <HintPath>..\External Libs\CommonDomain\bin\EventStore.Persistence.RavenPersistence.dll</HintPath>
     </Reference>
-    <Reference Include="EventStore.Serialization.Json">
-      <HintPath>..\External Libs\EventStore\bin\EventStore.Serialization.Json.dll</HintPath>
+    <Reference Include="EventStore.Serialization.Json, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7735eb81c0bd9948, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\External Libs\CommonDomain\bin\EventStore.Serialization.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">

diff --git a/CQRSSample.App/Program.cs b/CQRSSample.App/Program.cs
@@ -18,13 +18,15 @@ class Program
         static void Main()
         {
             var store = new DocumentStore{ Url = "http://localhost:8080" };
+            store.Initialize();
+
             //run RavenDB InMemory
             //var store = new EmbeddableDocumentStore {RunInMemory = true};
 
             IWindsorContainer container = null;
             try
             {
-                container = BootStrapper.BootStrap(store);
+                container = BootStrapper.BootStrap();
 
                 var bus = container.Resolve<IBus>();
                 var aggregateId = Guid.NewGuid();

diff --git a/CQRSSample/CQRSSample.csproj b/CQRSSample/CQRSSample.csproj
@@ -47,16 +47,20 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\External Libs\Castle Windsor\dotNet40\Castle.Windsor.dll</HintPath>
     </Reference>
+    <Reference Include="CommonDomain">
+      <HintPath>..\External Libs\CommonDomain\bin\CommonDomain.dll</HintPath>
+    </Reference>
     <Reference Include="EventStore, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7735eb81c0bd9948, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\External Libs\EventStore\bin\EventStore.dll</HintPath>
+      <HintPath>..\External Libs\CommonDomain\bin\EventStore.dll</HintPath>
     </Reference>
     <Reference Include="EventStore.Persistence.RavenPersistence, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7735eb81c0bd9948, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\External Libs\EventStore\bin\EventStore.Persistence.RavenPersistence.dll</HintPath>
+      <HintPath>..\External Libs\CommonDomain\bin\EventStore.Persistence.RavenPersistence.dll</HintPath>
     </Reference>
-    <Reference Include="EventStore.Serialization.Json">
-      <HintPath>..\External Libs\EventStore\bin\EventStore.Serialization.Json.dll</HintPath>
+    <Reference Include="EventStore.Serialization.Json, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7735eb81c0bd9948, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\External Libs\CommonDomain\bin\EventStore.Serialization.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -67,7 +71,6 @@
     <Reference Include="System.Data.DataSetExtensions" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Domain\AggregateRoot.cs" />
     <Compile Include="Events\DomainEvent.cs" />
     <Compile Include="Commands\Command.cs" />
     <Compile Include="Commands\RelocatingCustomerCommand.cs" />
@@ -80,19 +83,16 @@
     <Compile Include="CommandHandlers\TransactionHandler.cs" />
     <Compile Include="Commands\CreateCustomerCommand.cs" />
     <Compile Include="Domain\Customer.cs" />
-    <Compile Include="Domain\IAggregateRoot.cs" />
-    <Compile Include="Domain\IEventStore.cs" />
-    <Compile Include="Domain\IRepository.cs" />
     <Compile Include="Events\CustomerCreatedEvent.cs" />
+    <Compile Include="Infrastructure\AggregateFactory.cs" />
     <Compile Include="Infrastructure\BootStrapper.cs" />
     <Compile Include="Infrastructure\DelegateAdjuster.cs" />
     <Compile Include="Infrastructure\EventDescriptor.cs" />
+    <Compile Include="Infrastructure\FakeBus.cs" />
     <Compile Include="Infrastructure\InProcessBus.cs" />
     <Compile Include="Infrastructure\Installers\AllTypesWithAllInterfaceInstaller.cs" />
     <Compile Include="Infrastructure\Installers\EventHandlerHelper.cs" />
     <Compile Include="Infrastructure\Installers\EventStoreInstaller.cs" />
-    <Compile Include="Infrastructure\RavenDbEventStore.cs" />
-    <Compile Include="Infrastructure\RavenInMemoryPersistenceFactory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>

diff --git a/CQRSSample/CommandHandlers/CustomerCommandHandlers.cs b/CQRSSample/CommandHandlers/CustomerCommandHandlers.cs
@@ -1,20 +1,21 @@
 using CQRSSample.Commands;
 using CQRSSample.Domain;
+using CommonDomain.Persistence;
 
 namespace CQRSSample.CommandHandlers
 {
     public class RelocatingCustomerCommandHandler : Handles<RelocatingCustomerCommand>
     {
-        private readonly IRepository<Customer> _repository;
+        private readonly IRepository _repository;
 
-        public RelocatingCustomerCommandHandler(IRepository<Customer> repository)
+        public RelocatingCustomerCommandHandler(IRepository repository)
         {
             _repository = repository;
         }
 
         public void Handle(RelocatingCustomerCommand command)
         {
-            var customer = _repository.GetById(command.Id);
+            var customer = _repository.GetById<Customer>(command.Id, command.Version);
             customer.RelocateCustomer(command.Street, command.Streetnumber, command.PostalCode, command.City);
             _repository.Save(customer, customer.Version);
         }

diff --git a/CQRSSample/Domain/AggregateRoot.cs b/CQRSSample/Domain/AggregateRoot.cs
diff --git a/CQRSSample/Domain/Customer.cs b/CQRSSample/Domain/Customer.cs
@@ -1,9 +1,10 @@
 using System;
+using CommonDomain.Core;
 using CQRSSample.Events;
 
 namespace CQRSSample.Domain
 {
-    public class Customer : AggregateRoot
+    public class Customer : AggregateBase<DomainEvent>
     {
         private bool _deactivated;
         private CustomerName _customerName;
@@ -12,25 +13,19 @@ public class Customer : AggregateRoot
 
         private Customer(Guid id, CustomerName customerName, Address address, PhoneNumber phoneNumber)
         {
-            ApplyChange(new CustomerCreatedEvent(id, customerName.Name, address.Street, address.StreetNumber, address.PostalCode, address.City, phoneNumber.Number));
+            RaiseEvent(new CustomerCreatedEvent(id, customerName.Name, address.Street, address.StreetNumber, address.PostalCode, address.City, phoneNumber.Number));
         }
 
         public Customer()
         {
         }
-
-        private Guid _id;
-        public override Guid Id
-        {
-            get { return _id; }
-        }
-
+
         public void RelocateCustomer(string street, string streetNumber, string postalCode, string city)
         {
             if (Id == Guid.Empty)
                 throw new NonExistingCustomerException("The customer is not created and no opperations can be executed on it");
 
-            ApplyChange(new CustomerRelocatedEvent(Id, street, streetNumber, postalCode, city));
+            RaiseEvent(new CustomerRelocatedEvent(Id, street, streetNumber, postalCode, city));
         }
 
         public static Customer CreateNew(Guid id, CustomerName customerName, Address address, PhoneNumber phoneNumber)
@@ -43,7 +38,7 @@ public static Customer CreateNew(Guid id, CustomerName customerName, Address add
         //Domain-Eventhandlers
         private void Apply(CustomerCreatedEvent @event)
         {
-            _id = @event.AggregateId;
+            Id = @event.AggregateId;
             _customerName = new CustomerName(@event.CustomerName);
             _address = new Address(@event.Street, @event.StreetNumber, @event.PostalCode, @event.City);
             _phoneNumber = new PhoneNumber(@event.PhoneNumber);

diff --git a/CQRSSample/Domain/IAggregateRoot.cs b/CQRSSample/Domain/IAggregateRoot.cs
diff --git a/CQRSSample/Domain/IEventStore.cs b/CQRSSample/Domain/IEventStore.cs
diff --git a/CQRSSample/Domain/IRepository.cs b/CQRSSample/Domain/IRepository.cs
diff --git a/CQRSSample/Infrastructure/BootStrapper.cs b/CQRSSample/Infrastructure/BootStrapper.cs
@@ -12,13 +12,11 @@ namespace CQRSSample.Infrastructure
 {
     public class BootStrapper
     {
-        public static IWindsorContainer BootStrap(IDocumentStore store)
+        public static IWindsorContainer BootStrap()
         {
-            store.Initialize();
-
             var container = new WindsorContainer();
 
-            container.Register(Component.For<IDocumentStore>().Instance(store));
+            //container.Register(Component.For<IDocumentStore>().Instance(store));
             container.Register(Component.For<IWindsorContainer>().Instance(container));
 
             // adds and configures all components using WindsorInstallers from executing assembly