Staging update

.circleci/config.yml

@@ -1,9 +1,10 @@
 version: 2.1
 
 orbs:
-  aws-ecr: circleci/aws-ecr@3.0.0
-  aws-cli: circleci/aws-cli@0.1.9
+  aws-ecr: circleci/aws-ecr@9.3.7
+  aws-cli: circleci/aws-cli@5.1.1
   aws_assume_role: lbh-hackit/[email protected]
+  node: circleci/[email protected]
 
 executors:
   docker-python:
@@ -14,7 +15,7 @@ executors:
       - image: "hashicorp/terraform:light"
   docker-dotnet:
     docker:
-      - image: mcr.microsoft.com/dotnet/sdk:6.0
+      - image: mcr.microsoft.com/dotnet/sdk:8.0
 
 references:
   workspace_root: &workspace_root "~"
@@ -47,29 +48,20 @@ commands:
       - *attach_workspace
       - checkout
       - setup_remote_docker
-      - run:
-          name: Install Node.js
-          command: |
-            curl -sL https://deb.nodesource.com/setup_18.x | bash -
-            apt-get update && apt-get install -y nodejs
-      - run:
-          name: Install serverless CLI
-          command: npm i -g serverless@^3
-      - run:
-          name: Install step function plugin          
-          command: npm i serverless-step-functions
+      - node/install
+      - node/install-packages:
+          app-dir: HousingFinanceInterimApi
       - run:
           name: Build lambda
           command: |
             cd ./HousingFinanceInterimApi/
             chmod +x ./build.sh
-            ./build.sh      
+            ./build.sh
       - run:
           name: Deploy lambda
           command: |
             cd ./HousingFinanceInterimApi/
-            npm i serverless-associate-waf
-            sls deploy --stage <<parameters.stage>> --conceal
+            npx --yes serverless deploy --stage <<parameters.stage>> --conceal
 
 jobs:
   check-code-formatting:
@@ -127,7 +119,7 @@ jobs:
 workflows:
   check-and-deploy-development:
     jobs:
-      - check-code-formatting        
+      - check-code-formatting
       - build-and-test:
           context:
             - api-nuget-token-context
@@ -141,11 +133,12 @@ workflows:
       - deploy-to-development:
           context:
             - api-nuget-token-context
+            - "Serverless Framework"
           requires:
-            - assume-role-development  
+            - assume-role-development
           filters:
             branches:
-              only: development     
+              only: development
   check-and-deploy-staging-and-production:
     jobs:
       - build-and-test:
@@ -164,6 +157,7 @@ workflows:
       - deploy-to-staging:
           context:
             - api-nuget-token-context
+            - "Serverless Framework"
           requires:
             - assume-role-staging
           filters:
@@ -186,6 +180,7 @@ workflows:
       - deploy-to-production:
           context:
             - api-nuget-token-context
+            - "Serverless Framework"
           requires:
             - permit-production-release
             - assume-role-production

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "HFSDatabaseObjects"]
+	path = HFSDatabaseObjects
+	url = https://github.com/LBHackney-IT/HFSDatabaseObjects

CODEOWNERS

@@ -1,8 +1,4 @@
-# doc for this file https://help.github.com/articles/about-code-owners/
+# This file specifies owners for pull request approval
+# See https://help.github.com/articles/about-code-owners/
 
-# These owners will be the default owners for everything in
-# the repo. Unless a later match takes precedence,
-# @global-owner1 and @global-owner2 will be requested for
-# review when someone opens a pull request.
-
-* @FaisalHackney @Duslerke @LBHackney-IT/mtfh-finance
+* @LBHackney-IT/housing-products

HousingFinanceInterimApi.Tests/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0
+FROM mcr.microsoft.com/dotnet/sdk:8.0
 
 # disable microsoft telematry
 ENV DOTNET_CLI_TELEMETRY_OPTOUT='true'

HousingFinanceInterimApi.Tests/HousingFinanceInterimApi.Tests.csproj

@@ -1,12 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
     <CodeAnalysisTreatWarningsAsErrors>false</CodeAnalysisTreatWarningsAsErrors>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
+    <NoWarn>
+      CA1707 <!-- "Identifiers should not contain underscores" -->
+    </NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,7 +18,7 @@
     <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="5.0.9" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Bogus" Version="25.0.4" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="xunit" Version="2.4.1" />

HousingFinanceInterimApi.Tests/V1/Controllers/TenancyAgreementControllerTests.cs

@@ -0,0 +1,59 @@
+using AutoFixture;
+using FluentAssertions;
+using HousingFinanceInterimApi.V1.Boundary.Request;
+using HousingFinanceInterimApi.V1.Controllers;
+using HousingFinanceInterimApi.V1.UseCase.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+using Moq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace HousingFinanceInterimApi.Tests.V1.Controllers
+{
+    public class TenancyAgreementControllerTests
+    {
+        private readonly TenancyAgreementController _classUnderTest;
+
+        private readonly Mock<IUpdateTAUseCase> _useCase;
+        private readonly Fixture _fixture = new Fixture();
+
+        public TenancyAgreementControllerTests()
+        {
+            _useCase = new Mock<IUpdateTAUseCase>();
+
+            _classUnderTest = new TenancyAgreementController(_useCase.Object);
+        }
+
+        [Fact]
+        public async Task UpdateTA_WhenValidRequest_ReturnsNoContent()
+        {
+            // Arrange
+            var query = _fixture.Create<string>();
+            var request = _fixture.Create<UpdateTARequest>();
+
+            // Act
+            var response = await _classUnderTest.DynamoDbStreamTrigger(query, request)
+                .ConfigureAwait(false);
+
+            // Assert
+            _useCase.Verify(x => x.ExecuteAsync(query, request), Times.Once);
+
+            response.Should().BeEquivalentTo(new NoContentResult());
+        }
+
+        [Fact]
+        public async Task ReturnBadRequestWhenNoTagRef()
+        {
+            // Arrange
+            var request = _fixture.Create<UpdateTARequest>();
+
+            // Act
+            var response = await _classUnderTest.DynamoDbStreamTrigger(null, request)
+                .ConfigureAwait(false);
+
+            // Assert
+
+            response.Should().BeEquivalentTo(new BadRequestObjectResult("No tagRef query parameter provided"));
+        }
+    }
+}

HousingFinanceInterimApi.Tests/V1/Infrastructure/DatabaseContext/AssetDetailsTests.cs

@@ -10,7 +10,6 @@
 
 namespace HousingFinanceInterimApi.Tests.V1.Infrastructure.DatabaseContext
 {
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Security", "CA2100:Review SQL queries for security vulnerabilities", Justification = "This is a test class")]
     public class AssetDetailsTests : IClassFixture<BaseContextTest>
     {
         private readonly HousingFinanceInterimApi.V1.Infrastructure.DatabaseContext _context;

HousingFinanceInterimApi.Tests/V1/Infrastructure/DatabaseContext/BaseContextTest.cs

@@ -1,24 +1,26 @@
 using AutoFixture;
+using Bogus;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 
 namespace HousingFinanceInterimApi.Tests.V1.Infrastructure.DatabaseContext
 {
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Security", "CA2100:Review SQL queries for security vulnerabilities", Justification = "This is a test class")]
     public class DbConnectionException : Exception { public DbConnectionException(string message) : base(message) { } }
 
     public class BaseContextTest : IDisposable
     {
         internal readonly HousingFinanceInterimApi.V1.Infrastructure.DatabaseContext _context;
         internal readonly Fixture _fixture;
+        internal readonly Faker _faker;
         internal List<Action> _cleanups;
         private bool _disposed;
 
         public BaseContextTest()
         {
             _context = CreateDbContext();
             _fixture = new Fixture();
+            _faker = new Faker();
             _cleanups = new List<Action>();
         }
 
@@ -32,12 +34,12 @@ public void ExecuteProcedure(string procedureName)
 
         private static HousingFinanceInterimApi.V1.Infrastructure.DatabaseContext CreateDbContext()
         {
-            var connectionStringEnvVar = Environment.GetEnvironmentVariable("CONNECTION_STRING");
-            if (string.IsNullOrEmpty(connectionStringEnvVar))
-                throw new DbConnectionException("CONNECTION_STRING env var is not set");
+            // TODO: Implement a way to switch between SQL Server and Postgres
+            var Server = "127.0.0.1"; // TODO: Should fetch from env var when it has Docker support
+            var connectionString = $"Server={Server};Database=sow2b;User Id=sa;Password=password123!;";
 
             var options = new DbContextOptionsBuilder<HousingFinanceInterimApi.V1.Infrastructure.DatabaseContext>()
-                .UseSqlServer(connectionStringEnvVar)
+                .UseSqlServer(connectionString)
                 .Options;
 
             var context = new HousingFinanceInterimApi.V1.Infrastructure.DatabaseContext(options);
@@ -63,7 +65,10 @@ protected virtual void Dispose(bool disposing)
                 try
                 {
                     foreach (var cleanup in _cleanups)
+                    {
                         cleanup();
+                        _context.SaveChanges();
+                    }
                     transaction.Commit();
                 }
                 catch (Exception)