Feature/merge to release

.circleci/config.yml

@@ -231,8 +231,10 @@ jobs:
 workflows:
   check-and-deploy-development:
     jobs:
-      - check-code-formatting
-      - build-and-test
+      - check-code-formatting:
+          context: api-nuget-token-context
+      - build-and-test:
+          context: api-nuget-token-context
       - assume-role-development:
           context: api-assume-role-housing-development-context
           requires:
@@ -266,8 +268,10 @@ workflows:
               only: master
   check-and-deploy-staging-and-production:
       jobs:
-      - check-code-formatting
+      - check-code-formatting:
+          context: api-nuget-token-context
       - build-and-test:
+          context: api-nuget-token-context
           filters:
             branches:
               only: release

CODEOWNERS

@@ -5,4 +5,4 @@
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
 
-* @LBHMGeorgieva @LBHMKeyworth @LBHSPreston @LBHRShetty @mtfh-manage-my-home
+* @LBHMGeorgieva @LBHMKeyworth @LBHSPreston @LBHRShetty @LBHackney-IT/mtfh-manage-my-home

HousingSearchApi.Tests/HousingSearchApi.Tests.csproj

@@ -12,22 +12,18 @@
   <ItemGroup>
     <Compile Remove="TestResults\**" />
     <Compile Remove="V1\Domain\**" />
-    <Compile Remove="V1\Factories\**" />
     <Compile Remove="V1\Gateways\**" />
     <Compile Remove="V1\UseCase\**" />
     <Content Remove="TestResults\**" />
     <Content Remove="V1\Domain\**" />
-    <Content Remove="V1\Factories\**" />
     <Content Remove="V1\Gateways\**" />
     <Content Remove="V1\UseCase\**" />
     <EmbeddedResource Remove="TestResults\**" />
     <EmbeddedResource Remove="V1\Domain\**" />
-    <EmbeddedResource Remove="V1\Factories\**" />
     <EmbeddedResource Remove="V1\Gateways\**" />
     <EmbeddedResource Remove="V1\UseCase\**" />
     <None Remove="TestResults\**" />
     <None Remove="V1\Domain\**" />
-    <None Remove="V1\Factories\**" />
     <None Remove="V1\Gateways\**" />
     <None Remove="V1\UseCase\**" />
   </ItemGroup>
@@ -49,7 +45,7 @@
     <PackageReference Include="Docker.DotNet" Version="3.125.4" />
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="Hackney.Core.ElasticSearch" Version="1.45.0" />
-    <PackageReference Include="Hackney.Shared.HousingSearch" Version="0.6.0" />
+    <PackageReference Include="Hackney.Shared.HousingSearch" Version="0.19.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.3" />

HousingSearchApi.Tests/MockWebApplicationFactory.cs

@@ -1,4 +1,4 @@
-using HousingSearchApi.V1.Infrastructure;
+using HousingSearchApi.V1.Infrastructure.Extensions;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Extensions.Configuration;

HousingSearchApi.Tests/V1/Boundary/Requests/Validation/GetPersonListRequestValidatorTests.cs

@@ -14,9 +14,9 @@ public GetPersonListRequestValidatorTests()
             _sut = new HousingSearchRequestValidator();
         }
 
-        private static HousingSearchRequest CreateValidRequest()
+        private static GetPersonListRequest CreateValidRequest()
         {
-            return new HousingSearchRequest()
+            return new GetPersonListRequest()
             {
                 SearchText = "Some search text"
             };

HousingSearchApi.Tests/V1/Controllers/GetAssetListControllerTests.cs

@@ -9,24 +9,26 @@
 namespace HousingSearchApi.Tests.V1.Controllers
 {
     [Collection("LogCall collection")]
-    public class GetTenureListControllerTests
+    public class GetAssetListControllerTests
     {
         private readonly Mock<IGetAssetListUseCase> _mockGetAssetListUseCase;
+        private readonly Mock<IGetAssetListSetsUseCase> _mockGetAssetListSetsUseCase;
         private readonly GetAssetListController _classUnderTest;
 
-        public GetTenureListControllerTests()
+        public GetAssetListControllerTests()
         {
             new LogCallAspectFixture().RunBeforeTests();
 
             _mockGetAssetListUseCase = new Mock<IGetAssetListUseCase>();
-            _classUnderTest = new GetAssetListController(_mockGetAssetListUseCase.Object);
+            _mockGetAssetListSetsUseCase = new Mock<IGetAssetListSetsUseCase>();
+            _classUnderTest = new GetAssetListController(_mockGetAssetListUseCase.Object, _mockGetAssetListSetsUseCase.Object);
         }
 
         [Fact]
-        public async Task GetTenureListShouldCallGetTenureListUseCase()
+        public async Task GetAssetListShouldCallGetAssetListUseCase()
         {
             // given
-            var request = new HousingSearchRequest();
+            var request = new GetAssetListRequest();
             var response = new GetAssetListResponse();
             _mockGetAssetListUseCase.Setup(x => x.ExecuteAsync(request)).ReturnsAsync(response);
 
@@ -36,5 +38,19 @@ public async Task GetTenureListShouldCallGetTenureListUseCase()
             // then
             _mockGetAssetListUseCase.Verify(x => x.ExecuteAsync(request), Times.Once);
         }
+        [Fact]
+        public async Task GetAssetListSetsShouldCallGetAssetListSetsUseCase()
+        {
+            // given
+            var request = new GetAllAssetListRequest();
+            var response = new GetAllAssetListResponse();
+            _mockGetAssetListSetsUseCase.Setup(x => x.ExecuteAsync(request)).ReturnsAsync(response);
+
+            // when
+            await _classUnderTest.GetAllAssetList(request).ConfigureAwait(false);
+
+            // then
+            _mockGetAssetListSetsUseCase.Verify(x => x.ExecuteAsync(request), Times.Once);
+        }
     }
 }

HousingSearchApi.Tests/V1/Controllers/GetTenureListControllerTests.cs

@@ -9,33 +9,33 @@
 namespace HousingSearchApi.Tests.V1.Controllers
 {
     [Collection("LogCall collection")]
-    public class GetAssetListControllerTests
+    public class GetTenureListControllerTests
     {
-        private readonly Mock<IGetAssetListUseCase> _mockGetAssetListUseCase;
-        private readonly GetAssetListController _classUnderTest;
+        private readonly Mock<IGetTenureListUseCase> _mockGetTenureListUseCase;
+        private readonly GetTenureListController _classUnderTest;
 
 
-        public GetAssetListControllerTests()
+        public GetTenureListControllerTests()
         {
             new LogCallAspectFixture().RunBeforeTests();
 
-            _mockGetAssetListUseCase = new Mock<IGetAssetListUseCase>();
-            _classUnderTest = new GetAssetListController(_mockGetAssetListUseCase.Object);
+            _mockGetTenureListUseCase = new Mock<IGetTenureListUseCase>();
+            _classUnderTest = new GetTenureListController(_mockGetTenureListUseCase.Object);
         }
 
         [Fact]
-        public async Task GetAssetListShouldCallGetAssetListUseCase()
+        public async Task GetTenureListShouldCallGetTenureListUseCase()
         {
             // given
-            var request = new HousingSearchRequest();
-            var response = new GetAssetListResponse();
-            _mockGetAssetListUseCase.Setup(x => x.ExecuteAsync(request)).ReturnsAsync(response);
+            var request = new GetTenureListRequest();
+            var response = new GetTenureListResponse();
+            _mockGetTenureListUseCase.Setup(x => x.ExecuteAsync(request)).ReturnsAsync(response);
 
             // when
-            await _classUnderTest.GetAssetList(request).ConfigureAwait(false);
+            await _classUnderTest.GetTenureList(request).ConfigureAwait(false);
 
             // then
-            _mockGetAssetListUseCase.Verify(x => x.ExecuteAsync(request), Times.Once);
+            _mockGetTenureListUseCase.Verify(x => x.ExecuteAsync(request), Times.Once);
         }
     }
 }

HousingSearchApi.Tests/V1/Controllers/GetTransactionListControllerTests.cs

@@ -0,0 +1,74 @@
+using FluentAssertions;
+using HousingSearchApi.V1.Boundary.Requests;
+using HousingSearchApi.V1.Boundary.Responses.Metadata;
+using HousingSearchApi.V1.Boundary.Responses.Transactions;
+using HousingSearchApi.V1.Controllers;
+using HousingSearchApi.V1.UseCase.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+using Moq;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace HousingSearchApi.Tests.V1.Controllers
+{
+    [Collection("LogCall collection")]
+    public class GetTransactionListControllerTests
+    {
+        private readonly Mock<IGetTransactionListUseCase> _mockGetTransactionListUseCase;
+        private readonly GetTransactionListController _classUnderTest;
+
+        public GetTransactionListControllerTests()
+        {
+            new LogCallAspectFixture().RunBeforeTests();
+
+            _mockGetTransactionListUseCase = new Mock<IGetTransactionListUseCase>();
+            _classUnderTest = new GetTransactionListController(_mockGetTransactionListUseCase.Object);
+        }
+
+        [Fact]
+        public async Task GetTransactionListReturnsOk()
+        {
+            const int transactionsCount = 10;
+            var request = new GetTransactionListRequest();
+            var response = GetTransactionListResponse.Create(transactionsCount, new List<TransactionResponse>());
+
+            _mockGetTransactionListUseCase
+                .Setup(x => x.ExecuteAsync(request))
+                .ReturnsAsync(response);
+
+            var controllerResponse = await _classUnderTest.GetTransactionList(request).ConfigureAwait(false);
+
+            _mockGetTransactionListUseCase.Verify(x => x.ExecuteAsync(request), Times.Once);
+
+            var okObjectResult = controllerResponse as OkObjectResult;
+            okObjectResult.Should().NotBeNull();
+            okObjectResult.Value.Should().NotBeNull();
+
+            var apiResponse = okObjectResult.Value as APIResponse<GetTransactionListResponse>;
+            apiResponse.Should().NotBeNull();
+
+            apiResponse.Results.Should().BeEquivalentTo(response);
+            apiResponse.Total.Should().Be(transactionsCount);
+        }
+
+        [Fact]
+        public async Task GetTransactionListThrowsIfUseCaseReturnsNull()
+        {
+            var request = new GetTransactionListRequest();
+
+            _mockGetTransactionListUseCase
+                .Setup(x => x.ExecuteAsync(request))
+                .Throws(new Exception("Some error"));
+
+            var controllerResponse = await _classUnderTest.GetTransactionList(request).ConfigureAwait(false);
+
+            _mockGetTransactionListUseCase.Verify(x => x.ExecuteAsync(request), Times.Once);
+
+            var objectResult = controllerResponse as BadRequestObjectResult;
+            objectResult.Should().NotBeNull();
+            objectResult.Value.Should().Be("Some error");
+        }
+    }
+}

HousingSearchApi.Tests/V1/E2ETests/Fixtures/BaseFixture.cs

@@ -58,6 +58,5 @@ protected void EnsureEnvVarConfigured(string name, string defaultValue)
                 _elasticSearchAddress = default;
             }
         }
-
     }
 }

HousingSearchApi.Tests/V1/E2ETests/Fixtures/PersonsFixture.cs

@@ -15,7 +15,6 @@ namespace HousingSearchApi.Tests.V1.E2ETests.Fixtures
 {
     public class PersonsFixture : BaseFixture
     {
-        public List<QueryablePerson> Persons { get; private set; }
         private const string INDEX = "persons";
         public static string[] Alphabet = { "aa", "bb", "cc", "dd", "ee", "vv", "ww", "xx", "yy", "zz" };
 

HousingSearchApi.Tests/V1/E2ETests/Fixtures/TransactionsFixture.cs

@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Nest;
+using System.Net.Http;
+using System.Threading;
+using AutoFixture;
+using Elasticsearch.Net;
+using Hackney.Shared.HousingSearch.Gateways.Models.Transactions;
+
+namespace HousingSearchApi.Tests.V1.E2ETests.Fixtures
+{
+    public class TransactionsFixture : BaseFixture
+    {
+        private const string IndexName = "transactions";
+        private const int SendersCount = 5;
+
+        private static readonly Fixture _fixture = new Fixture();
+
+        public static List<QueryableSender> Senders { get; } = CreateSendersData(SendersCount);
+
+        public TransactionsFixture(IElasticClient elasticClient, HttpClient httpHttpClient) : base(elasticClient, httpHttpClient)
+        {
+            WaitForESInstance();
+        }
+
+        private static List<QueryableSender> CreateSendersData(int personsCount)
+        {
+            return _fixture.CreateMany<QueryableSender>(personsCount).ToList();
+        }
+
+        public void GivenAnAssetIndexExists()
+        {
+            ElasticSearchClient.Indices.Delete(IndexName);
+
+            if (ElasticSearchClient.Indices.Exists(Indices.Index(IndexName)).Exists)
+            {
+                return;
+            }
+
+            // ToDo: add transactionsIndex to the folder
+            var assetSettingsDoc = File.ReadAllTextAsync("./data/elasticsearch/transactionsIndex.json").Result;
+            ElasticSearchClient.LowLevel.Indices.CreateAsync<BytesResponse>(IndexName, assetSettingsDoc)
+                .ConfigureAwait(true);
+
+            var transactions = CreateTransactionsData(20);
+            var awaitable = ElasticSearchClient.IndexManyAsync(transactions, IndexName).ConfigureAwait(true);
+
+            while (!awaitable.GetAwaiter().IsCompleted) { }
+
+            Thread.Sleep(5000);
+        }
+
+        private List<QueryableTransaction> CreateTransactionsData(int transactionsCount)
+        {
+            var listOfTransactions = new List<QueryableTransaction>(transactionsCount);
+            var random = new Random();
+
+            for (var i = 0; i < transactionsCount; i++)
+            {
+                var personIndex = random.Next(SendersCount);
+
+                var transaction = _fixture.Create<QueryableTransaction>();
+                transaction.Sender = Senders[personIndex];
+
+                listOfTransactions.Add(transaction);
+            }
+
+            return listOfTransactions;
+        }
+    }
+}

HousingSearchApi.Tests/V1/E2ETests/Steps/Base/BaseSteps.cs

@@ -1,6 +1,10 @@
+using System;
+using System.Net;
 using System.Net.Http;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+using FluentAssertions;
 
 namespace HousingSearchApi.Tests.V1.E2ETests.Steps.Base
 {
@@ -27,5 +31,30 @@ protected JsonSerializerOptions CreateJsonOptions()
             options.Converters.Add(new JsonStringEnumConverter());
             return options;
         }
+
+        public async Task ThenTheLastRequestShouldBeBadRequestResult(string expectedErrorMessage = null)
+        {
+            _lastResponse.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+
+            if (expectedErrorMessage != null)
+            {
+                var resultBody = await _lastResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+                resultBody.Should().NotBeNull();
+                resultBody.Should().Contain(expectedErrorMessage);
+            }
+        }
+
+        public async Task ThenTheLastRequestShouldBe200()
+        {
+            if (_lastResponse.StatusCode != HttpStatusCode.OK)
+            {
+                var resultBody = await _lastResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+                resultBody.Should().NotBeNull();
+                throw new Exception(resultBody);
+            }
+            _lastResponse.StatusCode.Should().Be(HttpStatusCode.OK);
+        }
     }
 }