Merge pull request #85 from binarymash/feature/#83-AddUserInformation…

…ToDTOs Feature/#83 add user information to DTOs
binarymash · Mar 19, 2018 · 7bf2284 · 7bf2284
2 parents ed85fa8 + a9746ff
commit 7bf2284
Show file tree

Hide file tree

Showing 27 changed files with 190 additions and 79 deletions.
diff --git a/build.cake b/build.cake
@@ -28,7 +28,7 @@ var netFrameworkUnitTestAssemblies = new []
 	@"./src/Evelyn.Storage.EventStore.Tests/bin/"+compileConfig+"/net461/Evelyn.Storage.EventStore.Tests.dll",
 };
 var openCoverSettings = new OpenCoverSettings();
-var minCodeCoverage = 89d;
+var minCodeCoverage = 90d;
 var coverallsRepoToken = "coveralls-repo-token-evelyn";
 
 // integration testing

diff --git a/src/Evelyn.Core.Tests/ReadModel/AccountProjects/ProjectionBuilderSpecs.cs b/src/Evelyn.Core.Tests/ReadModel/AccountProjects/ProjectionBuilderSpecs.cs
@@ -72,7 +72,9 @@ public void AccountAndProjectsExist()
                 .When(_ => WhenWeInvokeTheProjectionBuilder())
                 .Then(_ => ThenTheAccountIdIsSet())
                 .And(_ => ThenTheCreatedDateIsSet())
+                .And(_ => ThenTheCreatedByIsSet())
                 .And(_ => ThenTheLastModifiedDateIsSet())
+                .And(_ => ThenTheLastModifiedByIsSet())
                 .And(_ => ThenAllTheProjectsAreSet())
                 .BDDfy();
         }
@@ -182,11 +184,21 @@ private void ThenTheCreatedDateIsSet()
             Dto.Created.Should().Be(_account.Created);
         }
 
+        private void ThenTheCreatedByIsSet()
+        {
+            Dto.CreatedBy.Should().Be(_account.CreatedBy);
+        }
+
         private void ThenTheLastModifiedDateIsSet()
         {
             Dto.LastModified.Should().Be(_account.LastModified);
         }
 
+        private void ThenTheLastModifiedByIsSet()
+        {
+            Dto.LastModifiedBy.Should().Be(_account.LastModifiedBy);
+        }
+
         private void ThenAllTheProjectsAreSet()
         {
             var projects = Dto.Projects.ToList();

diff --git a/src/Evelyn.Core.Tests/ReadModel/EnvironmentDetails/ProjectionBuilderSpecs.cs b/src/Evelyn.Core.Tests/ReadModel/EnvironmentDetails/ProjectionBuilderSpecs.cs
@@ -60,7 +60,9 @@ public void EnvironmentExists()
                 .And(_ => GivenTheProjectIsInTheRepository())
                 .When(_ => WhenWeInvokeTheProjectionBuilder())
                 .Then(_ => ThenTheCreatedDateIsSet())
+                .And(_ => ThenTheCreatedByIsSet())
                 .And(_ => ThenTheLastModifiedDateIsSet())
+                .And(_ => ThenTheLastModifiedByIsSet())
                 .And(_ => ThenTheProjectIdIsSet())
                 .And(_ => ThenTheEnvironmentKeyIsSet())
                 .BDDfy();
@@ -136,11 +138,21 @@ private void ThenTheCreatedDateIsSet()
             Dto.Created.Should().Be(_expectedEnvironment.Created);
         }
 
+        private void ThenTheCreatedByIsSet()
+        {
+            Dto.CreatedBy.Should().Be(_expectedEnvironment.CreatedBy);
+        }
+
         private void ThenTheLastModifiedDateIsSet()
         {
             Dto.LastModified.Should().Be(_expectedEnvironment.LastModified);
         }
 
+        private void ThenTheLastModifiedByIsSet()
+        {
+            Dto.LastModifiedBy.Should().Be(_expectedEnvironment.LastModifiedBy);
+        }
+
         private void ThenTheProjectIdIsSet()
         {
             Dto.ProjectId.Should().Be(_projectId);

diff --git a/src/Evelyn.Core.Tests/ReadModel/EnvironmentState/ProjectionBuilderSpecs.cs b/src/Evelyn.Core.Tests/ReadModel/EnvironmentState/ProjectionBuilderSpecs.cs
@@ -27,9 +27,7 @@ public class ProjectionBuilderSpecs : ProjectionBuilderSpecs<ProjectionBuilder,
         private string _environmentKey;
         private EnvironmentState _expectedEnvironmentState;
 
-        private string _toggle1Key;
-        private string _toggle2Key;
-        private string _toggle3Key;
+        private string _toggleKey;
 
         public ProjectionBuilderSpecs()
         {
@@ -65,7 +63,9 @@ public void EnvironmentExists()
                 .When(_ => WhenWeInvokeTheProjectionBuilderForTheEnvironmentState())
                 .Then(_ => ThenTheEnvironmentVersionIsSet())
                 .And(_ => ThenTheCreatedDateIsSet())
+                .And(_ => ThenTheCreatedByIsSet())
                 .And(_ => ThenTheLastModifiedDateIsSet())
+                .And(_ => ThenTheLastModifiedByIsSet())
                 .And(_ => ThenAllTheToggleStatesAreSet())
                 .BDDfy();
         }
@@ -104,9 +104,7 @@ private void GivenWeHaveAProjectWithEnvironmentsAndToggles()
         {
             _projectId = DataFixture.Create<Guid>();
             _environmentKey = DataFixture.Create<string>();
-            _toggle1Key = DataFixture.Create<string>();
-            _toggle2Key = DataFixture.Create<string>();
-            _toggle3Key = DataFixture.Create<string>();
+            _toggleKey = DataFixture.Create<string>();
 
             _projectEvents.Add(DataFixture.Build<ProjectCreated>()
                 .With(ev => ev.Version, 0)
@@ -128,14 +126,14 @@ private void GivenWeHaveAProjectWithEnvironmentsAndToggles()
             _projectEvents.Add(DataFixture.Build<ToggleAdded>()
                 .With(ev => ev.Version, 3)
                 .With(ev => ev.Id, _projectId)
-                .With(ev => ev.Key, _toggle1Key)
+                .With(ev => ev.Key, _toggleKey)
                 .Create());
 
             _projectEvents.Add(new ToggleStateAdded(
                 DataFixture.Create<string>(),
                 _projectId,
                 _environmentKey,
-                _toggle1Key,
+                _toggleKey,
                 DataFixture.Create<bool>().ToString(),
                 DateTimeOffset.UtcNow)
                 {
@@ -145,14 +143,14 @@ private void GivenWeHaveAProjectWithEnvironmentsAndToggles()
             _projectEvents.Add(DataFixture.Build<ToggleAdded>()
                 .With(ev => ev.Version, 5)
                 .With(ev => ev.Id, _projectId)
-                .With(ev => ev.Key, _toggle1Key)
+                .With(ev => ev.Key, _toggleKey)
                 .Create());
 
             _projectEvents.Add(new ToggleStateAdded(
                 DataFixture.Create<string>(),
                 _projectId,
                 _environmentKey,
-                _toggle1Key,
+                _toggleKey,
                 DataFixture.Create<bool>().ToString(),
                 DateTimeOffset.UtcNow)
             {
@@ -197,11 +195,21 @@ private void ThenTheCreatedDateIsSet()
             Dto.Created.Should().Be(_expectedEnvironmentState.Created);
         }
 
+        private void ThenTheCreatedByIsSet()
+        {
+            Dto.CreatedBy.Should().Be(_expectedEnvironmentState.CreatedBy);
+        }
+
         private void ThenTheLastModifiedDateIsSet()
         {
             Dto.LastModified.Should().Be(_expectedEnvironmentState.LastModified);
         }
 
+        private void ThenTheLastModifiedByIsSet()
+        {
+            Dto.LastModifiedBy.Should().Be(_expectedEnvironmentState.LastModifiedBy);
+        }
+
         private void ThenAllTheToggleStatesAreSet()
         {
             Dto.ToggleStates.Count().Should().Be(_expectedEnvironmentState.ToggleStates.Count());

diff --git a/src/Evelyn.Core.Tests/ReadModel/ProjectDetails/ProjectionBuilderSpecs.cs b/src/Evelyn.Core.Tests/ReadModel/ProjectDetails/ProjectionBuilderSpecs.cs
@@ -46,7 +46,9 @@ public void EnvironmentExists()
                 .And(_ => GivenTheProjectIsInTheRepository())
                 .When(_ => WhenWeInvokeTheProjectionBuilder())
                 .Then(_ => ThenTheCreatedDateIsSet())
+                .And(_ => ThenTheCreatedByIsSet())
                 .And(_ => ThenTheLastModifiedDateIsSet())
+                .And(_ => ThenTheLastModifiedByIsSet())
                 .And(_ => ThenTheVersionIsSet())
                 .And(_ => ThenTheIdIsSet())
                 .And(_ => ThenTheNameIsSet())
@@ -131,11 +133,21 @@ private void ThenTheCreatedDateIsSet()
             Dto.Created.Should().Be(_project.Created);
         }
 
+        private void ThenTheCreatedByIsSet()
+        {
+            Dto.CreatedBy.Should().Be(_project.CreatedBy);
+        }
+
         private void ThenTheLastModifiedDateIsSet()
         {
             Dto.LastModified.Should().Be(_project.LastModified);
         }
 
+        private void ThenTheLastModifiedByIsSet()
+        {
+            Dto.LastModifiedBy.Should().Be(_project.LastModifiedBy);
+        }
+
         private void ThenTheVersionIsSet()
         {
             Dto.Version.Should().Be(_project.Version);

diff --git a/src/Evelyn.Core.Tests/ReadModel/ToggleDetails/ProjectionBuilderSpecs.cs b/src/Evelyn.Core.Tests/ReadModel/ToggleDetails/ProjectionBuilderSpecs.cs
@@ -59,7 +59,9 @@ public void ToggleExists()
                 .And(_ => GivenTheProjectIsInTheRepository())
                 .When(_ => WhenWeInvokeTheProjectionBuilder())
                 .Then(_ => ThenTheCreatedDateIsSet())
+                .And(_ => ThenTheCreatedByIsSet())
                 .And(_ => ThenTheLastModifiedDateIsSet())
+                .And(_ => ThenTheLastModifiedByIsSet())
                 .And(_ => ThenTheProjectIdIsSet())
                 .And(_ => ThenTheToggleKeyIsSet())
                 .And(_ => ThenTheToggleNameIsSet())
@@ -136,11 +138,21 @@ private void ThenTheCreatedDateIsSet()
             Dto.Created.Should().Be(_expectedToggle.Created);
         }
 
+        private void ThenTheCreatedByIsSet()
+        {
+            Dto.CreatedBy.Should().Be(_expectedToggle.CreatedBy);
+        }
+
         private void ThenTheLastModifiedDateIsSet()
         {
             Dto.LastModified.Should().Be(_expectedToggle.LastModified);
         }
 
+        private void ThenTheLastModifiedByIsSet()
+        {
+            Dto.LastModifiedBy.Should().Be(_expectedToggle.LastModifiedBy);
+        }
+
         private void ThenTheProjectIdIsSet()
         {
             Dto.ProjectId.Should().Be(_projectId);

diff --git a/src/Evelyn.Core.Tests/WriteModel/Project/AddEnvironmentSpecs.cs b/src/Evelyn.Core.Tests/WriteModel/Project/AddEnvironmentSpecs.cs
@@ -82,7 +82,7 @@ private void ThenAnEnvironmentAddedEventIsPublished()
             var @event = (EnvironmentAdded)PublishedEvents.First(ev => ev is EnvironmentAdded);
             @event.UserId.Should().Be(UserId);
             @event.Key.Should().Be(_newEnvironmentKey);
-            @event.OccurredAt.Should().BeCloseTo(DateTimeOffset.UtcNow);
+            @event.OccurredAt.Should().BeCloseTo(DateTimeOffset.UtcNow, 100);
         }
 
         private void ThenAnEnvironmentStateAddedEventIsPublished()
@@ -91,7 +91,7 @@ private void ThenAnEnvironmentStateAddedEventIsPublished()
             @event.UserId.Should().Be(UserId);
             @event.EnvironmentKey.Should().Be(_newEnvironmentKey);
             @event.ToggleStates.ToList().Exists(ts => ts.Key == _toggleKey && ts.Value == default(bool).ToString());
-            @event.OccurredAt.Should().BeCloseTo(DateTimeOffset.UtcNow);
+            @event.OccurredAt.Should().BeCloseTo(DateTimeOffset.UtcNow, 100);
         }
 
         private void ThenADuplicateEnvironmentKeyExceptionIsThrown()

diff --git a/src/Evelyn.Core/ReadModel/AccountProjects/AccountProjectsDto.cs b/src/Evelyn.Core/ReadModel/AccountProjects/AccountProjectsDto.cs
@@ -8,8 +8,8 @@ public class AccountProjectsDto : DtoRoot
     {
         private readonly List<ProjectListDto> _projects;
 
-        public AccountProjectsDto(Guid accountId, DateTimeOffset created, DateTimeOffset lastModified, IEnumerable<ProjectListDto> projects)
-            : base(created, lastModified)
+        public AccountProjectsDto(Guid accountId, DateTimeOffset created, string createdBy, DateTimeOffset lastModified, string lastModifiedBy, IEnumerable<ProjectListDto> projects)
+            : base(created, createdBy, lastModified, lastModifiedBy)
         {
             AccountId = accountId;
             _projects = projects?.ToList() ?? new List<ProjectListDto>();

diff --git a/src/Evelyn.Core/ReadModel/AccountProjects/ProjectionBuilder.cs b/src/Evelyn.Core/ReadModel/AccountProjects/ProjectionBuilder.cs
@@ -29,7 +29,7 @@ public ProjectionBuilder(IRepository repository)
                     projects.Add(new ProjectListDto(project.Id, project.Name));
                 }
 
-                var dto = new AccountProjectsDto(account.Id, account.Created, account.LastModified, projects);
+                var dto = new AccountProjectsDto(account.Id, account.Created, account.CreatedBy, account.LastModified, account.LastModifiedBy, projects);
 
                 return dto;
             }

diff --git a/src/Evelyn.Core/ReadModel/DtoRoot.cs b/src/Evelyn.Core/ReadModel/DtoRoot.cs
@@ -4,14 +4,20 @@
 
     public abstract class DtoRoot
     {
-        protected DtoRoot(DateTimeOffset created, DateTimeOffset lastModified)
+        protected DtoRoot(DateTimeOffset created, string createdBy, DateTimeOffset lastModified, string lastModifiedBy)
         {
             Created = created;
+            CreatedBy = createdBy;
             LastModified = lastModified;
+            LastModifiedBy = lastModifiedBy;
         }
 
         public DateTimeOffset Created { get; private set; }
 
+        public string CreatedBy { get; private set; }
+
         public DateTimeOffset LastModified { get; private set; }
+
+        public string LastModifiedBy { get; private set; }
     }
 }
diff --git a/src/Evelyn.Core/ReadModel/EnvironmentDetails/EnvironmentDetailsDto.cs b/src/Evelyn.Core/ReadModel/EnvironmentDetails/EnvironmentDetailsDto.cs
@@ -4,8 +4,8 @@
 
     public class EnvironmentDetailsDto : DtoRoot
     {
-        public EnvironmentDetailsDto(Guid projectId, string key, DateTimeOffset created, DateTimeOffset lastModified)
-            : base(created, lastModified)
+        public EnvironmentDetailsDto(Guid projectId, string key, DateTimeOffset created, string createdBy, DateTimeOffset lastModified, string lastModifiedBy)
+            : base(created, createdBy, lastModified, lastModifiedBy)
         {
             Key = key;
             ProjectId = projectId;

diff --git a/src/Evelyn.Core/ReadModel/EnvironmentDetails/ProjectionBuilder.cs b/src/Evelyn.Core/ReadModel/EnvironmentDetails/ProjectionBuilder.cs
@@ -21,7 +21,7 @@ public ProjectionBuilder(IRepository repository)
             {
                 var project = await _repository.Get<Project>(request.ProjectId, token);
                 var environment = project.Environments.First(e => e.Key == request.EnvironmentKey);
-                var dto = new EnvironmentDetailsDto(project.Id, environment.Key, environment.Created, environment.LastModified);
+                var dto = new EnvironmentDetailsDto(project.Id, environment.Key, environment.Created, environment.CreatedBy, environment.LastModified, environment.LastModifiedBy);
 
                 return dto;
             }

diff --git a/src/Evelyn.Core/ReadModel/EnvironmentState/EnvironmentStateDto.cs b/src/Evelyn.Core/ReadModel/EnvironmentState/EnvironmentStateDto.cs
@@ -8,8 +8,8 @@ public class EnvironmentStateDto : DtoRoot
     {
         private readonly List<ToggleStateDto> _toggleStates;
 
-        public EnvironmentStateDto(int version, DateTimeOffset created, DateTimeOffset lastModified, IEnumerable<ToggleStateDto> toggleStates)
-            : base(created, lastModified)
+        public EnvironmentStateDto(int version, DateTimeOffset created, string createdBy, DateTimeOffset lastModified, string lastModifiedBy, IEnumerable<ToggleStateDto> toggleStates)
+            : base(created, createdBy, lastModified, lastModifiedBy)
         {
             Version = version;
             _toggleStates = toggleStates.ToList();

diff --git a/src/Evelyn.Core/ReadModel/EnvironmentState/ProjectionBuilder.cs b/src/Evelyn.Core/ReadModel/EnvironmentState/ProjectionBuilder.cs
@@ -22,7 +22,7 @@ public ProjectionBuilder(IRepository repository)
                 var project = await _repository.Get<Project>(request.ProjectId, token);
                 var environmentState = project.EnvironmentStates.First(es => es.EnvironmentKey == request.EnvironmentKey);
                 var toggleStates = environmentState.ToggleStates.Select(ts => new ToggleStateDto(ts.Version, ts.Key, ts.Value));
-                var environmentStateDto = new EnvironmentStateDto(environmentState.Version, environmentState.Created, environmentState.LastModified, toggleStates);
+                var environmentStateDto = new EnvironmentStateDto(environmentState.Version, environmentState.Created, environmentState.CreatedBy, environmentState.LastModified, environmentState.LastModifiedBy, toggleStates);
 
                 return environmentStateDto;
             }

diff --git a/src/Evelyn.Core/ReadModel/ProjectDetails/ProjectDetailsDto.cs b/src/Evelyn.Core/ReadModel/ProjectDetails/ProjectDetailsDto.cs
@@ -9,8 +9,8 @@ public class ProjectDetailsDto : DtoRoot
         private readonly IList<EnvironmentListDto> _environments;
         private readonly IList<ToggleListDto> _toggles;
 
-        public ProjectDetailsDto(Guid id, string name, IEnumerable<EnvironmentListDto> environments, IEnumerable<ToggleListDto> toggles, int version, DateTimeOffset created, DateTimeOffset lastModified)
-            : base(created, lastModified)
+        public ProjectDetailsDto(Guid id, string name, IEnumerable<EnvironmentListDto> environments, IEnumerable<ToggleListDto> toggles, int version, DateTimeOffset created, string createdBy, DateTimeOffset lastModified, string lastModifiedBy)
+            : base(created, createdBy, lastModified, lastModifiedBy)
         {
             Id = id;
             Name = name;

diff --git a/src/Evelyn.Core/ReadModel/ProjectDetails/ProjectionBuilder.cs b/src/Evelyn.Core/ReadModel/ProjectDetails/ProjectionBuilder.cs
@@ -22,7 +22,7 @@ public ProjectionBuilder(IRepository repository)
                 var project = await _repository.Get<Project>(request.ProjectId, token).ConfigureAwait(false);
                 var environments = project.Environments.Select(e => new EnvironmentListDto(e.Key));
                 var toggles = project.Toggles.Select(t => new ToggleListDto(t.Key, t.Name));
-                var dto = new ProjectDetailsDto(project.Id, project.Name, environments, toggles, project.Version, project.Created, project.LastModified);
+                var dto = new ProjectDetailsDto(project.Id, project.Name, environments, toggles, project.Version, project.Created, project.CreatedBy, project.LastModified, project.LastModifiedBy);
 
                 return dto;
             }

diff --git a/src/Evelyn.Core/ReadModel/ToggleDetails/ProjectionBuilder.cs b/src/Evelyn.Core/ReadModel/ToggleDetails/ProjectionBuilder.cs
@@ -21,7 +21,7 @@ public ProjectionBuilder(IRepository repository)
             {
                 var project = await _repository.Get<Project>(request.ProjectId, token);
                 var toggle = project.Toggles.First(t => t.Key == request.ToggleKey);
-                var dto = new ToggleDetailsDto(request.ProjectId, toggle.Key, toggle.Name, toggle.Created, toggle.LastModified);
+                var dto = new ToggleDetailsDto(request.ProjectId, toggle.Key, toggle.Name, toggle.Created, toggle.CreatedBy, toggle.LastModified, toggle.LastModifiedBy);
 
                 return dto;
             }

diff --git a/src/Evelyn.Core/ReadModel/ToggleDetails/ToggleDetailsDto.cs b/src/Evelyn.Core/ReadModel/ToggleDetails/ToggleDetailsDto.cs
@@ -4,8 +4,8 @@
 
     public class ToggleDetailsDto : DtoRoot
     {
-        public ToggleDetailsDto(Guid projectId, string key, string name, DateTimeOffset created, DateTimeOffset lastModified)
-            : base(created, lastModified)
+        public ToggleDetailsDto(Guid projectId, string key, string name, DateTimeOffset created, string createdBy, DateTimeOffset lastModified, string lastModifiedBy)
+            : base(created, createdBy, lastModified, lastModifiedBy)
         {
             Key = key;
             Name = name;