Remove add note data command

Dfe.Academies.Academisation.Data.UnitTest/ProjectAggregate/IncompleteProjectsGetDataQueryTests.cs

@@ -1,10 +1,13 @@
 using System.Linq;
 using System.Threading.Tasks;
 using AutoFixture;
+using AutoMapper;
 using Dfe.Academies.Academisation.Data.ProjectAggregate;
+using Dfe.Academies.Academisation.Data.Repositories;
 using Dfe.Academies.Academisation.Data.UnitTest.Contexts;
 using Dfe.Academies.Academisation.Domain.Core.ProjectAggregate;
 using Dfe.Academies.Academisation.Domain.ProjectAggregate;
+using Moq;
 using Xunit;
 
 namespace Dfe.Academies.Academisation.Data.UnitTest.ProjectAggregate
@@ -13,13 +16,14 @@ public class IncompleteProjectsGetDataQueryTests
 	{
 		private readonly Fixture _fixture = new();
 
-		private readonly IncompleteProjectsGetDataQuery _subject;
+		private readonly ConversionProjectRepository _subject;
 		private readonly AcademisationContext _context;
+		private Mock<IMapper> _mockMapper  = new Mock<IMapper>();
 
 		public IncompleteProjectsGetDataQueryTests()
 		{
 			_context = new TestProjectContext().CreateContext();
-			_subject = new IncompleteProjectsGetDataQuery(_context);
+			_subject = new ConversionProjectRepository(_context, _mockMapper.Object);
 		}
 
 		[Fact]

Dfe.Academies.Academisation.Data/Repositories/ConversionProjectRepository.cs

@@ -89,6 +89,14 @@ private static IQueryable<Project> FilterFormAMAT(IQueryable<Project> queryable)
 			return queryable;
 		}
 
+		public async Task<IEnumerable<IProject>?> GetIncompleteProjects()
+		{
+			var createdProjectState = await _context.Projects
+				.Where(p => string.IsNullOrEmpty(p.Details.LocalAuthority) || string.IsNullOrEmpty(p.Details.Region) || string.IsNullOrEmpty(p.Details.SchoolPhase) || string.IsNullOrEmpty(p.Details.SchoolType))
+				.ToListAsync();
+
+			return createdProjectState;
+		}
 
 		private static IQueryable<Project> FilterByRegion(IEnumerable<string>? regions, IQueryable<Project> queryable)
 		{

Dfe.Academies.Academisation.Domain/ProjectAggregate/IConversionProjectRepository.cs

@@ -19,4 +19,6 @@ public interface IConversionProjectRepository : IRepository<Project>, IGenericRe
 	Task<IEnumerable<IProject>> GetConversionProjectsByFormAMatIds(IEnumerable<int?> ids, CancellationToken cancellationToken);
 	Task<(IEnumerable<IProject> projects, int totalCount)> SearchFormAMatProjects(
 	IEnumerable<string>? states, string? title, IEnumerable<string>? deliveryOfficers, IEnumerable<string>? regions, IEnumerable<string>? localAuthorities, IEnumerable<string>? advisoryBoardDates);
+
+	Task<IEnumerable<IProject>?> GetIncompleteProjects();
 }

Dfe.Academies.Academisation.Domain/ProjectAggregate/Project.cs

@@ -548,4 +548,9 @@ public void SetDeletedAt()
 	{
 		DeletedAt = DateTime.UtcNow;
 	}
+
+	public void AddNote(string subject, string note, string author, DateTime date)
+	{
+		_notes.Add(new ProjectNote(subject, note, author, date, Id));
+	}
 }

Dfe.Academies.Academisation.IDomain/ProjectAggregate/IProject.cs

@@ -43,4 +43,5 @@ public void SetSchoolOverview(
 	public void SetPerformanceData(string? keyStage2PerformanceAdditionalInformation, string? keyStage4PerformanceAdditionalInformation, string? keyStage5PerformanceAdditionalInformation, string? educationalAttendanceAdditionalInformation);
 	void SetFormAMatProjectId(int id);
 	void SetRoute(string route);
+	void AddNote(string subject, string note, string author, DateTime date);
 }

Dfe.Academies.Academisation.IService/Commands/Legacy/Project/IConversionProjectExportService.cs

@@ -1,5 +1,4 @@
-using Dfe.Academies.Academisation.Data.ProjectAggregate;
-using Dfe.Academies.Academisation.IService.ServiceModels.Legacy.ProjectAggregate;
+using Dfe.Academies.Academisation.IService.ServiceModels.Legacy.ProjectAggregate;
 
 namespace Dfe.Academies.Academisation.IService.Commands.Legacy.Project
 {

Dfe.Academies.Academisation.IService/Commands/Legacy/Project/ITransferProjectExportService.cs

@@ -1,4 +1,4 @@
-using Dfe.Academies.Academisation.Data.ProjectAggregate;
+using Dfe.Academies.Academisation.IService.ServiceModels.TransferProject;
 
 namespace Dfe.Academies.Academisation.IService.Commands.Legacy.Project
 {

Dfe.Academies.Academisation.Data/ProjectAggregate/GetProjectSearchModel.cs → Dfe.Academies.Academisation.IService/ServiceModels/GetProjectSearchModel.cs

@@ -1,4 +1,4 @@
-namespace Dfe.Academies.Academisation.Data.ProjectAggregate
+namespace Dfe.Academies.Academisation.IService.ServiceModels
 {
 	public class GetProjectSearchModel
 	{

Dfe.Academies.Academisation.Data/ProjectAggregate/ConversionProjectSearchModel.cs → Dfe.Academies.Academisation.IService/ServiceModels/Legacy/ProjectAggregate/ConversionProjectSearchModel.cs

@@ -1,4 +1,4 @@
-namespace Dfe.Academies.Academisation.Data.ProjectAggregate
+namespace Dfe.Academies.Academisation.IService.ServiceModels.Legacy.ProjectAggregate
 {
 	public class ConversionProjectSearchModel
 	{

Dfe.Academies.Academisation.Data/ProjectAggregate/TransferProjectSearchModel.cs → Dfe.Academies.Academisation.IService/ServiceModels/TransferProject/TransferProjectSearchModel.cs

@@ -1,4 +1,4 @@
-namespace Dfe.Academies.Academisation.Data.ProjectAggregate
+namespace Dfe.Academies.Academisation.IService.ServiceModels.TransferProject
 {
 	public class TransferProjectSearchModel
 	{

Dfe.Academies.Academisation.Service.UnitTest/Commands/Legacy/Project/EnrichProjectCommandTests.cs

@@ -1,4 +1,5 @@
 using AutoFixture;
+using Dfe.Academies.Academisation.Domain.ApplicationAggregate;
 using Dfe.Academies.Academisation.IData.ProjectAggregate;
 using Dfe.Academies.Academisation.IDomain.ProjectAggregate;
 using Dfe.Academies.Academisation.IService.Query;
@@ -13,7 +14,7 @@ namespace Dfe.Academies.Academisation.Service.UnitTest.Commands.Legacy.Project
 	public class EnrichProjectCommandTests
 	{
 		private readonly EnrichProjectCommand _subject;
-		private readonly Mock<IIncompleteProjectsGetDataQuery> _incompleteProjectGetDataQuery;
+		private readonly Mock<IConversionProjectRepository> _conversionProjectRepository;
 		private readonly Mock<IAcademiesQueryService> _establishmentGetDataQuery;
 		private readonly Mock<IProjectUpdateDataCommand> _updateCommand;
 		private readonly Mock<ILogger<EnrichProjectCommand>> _logger;
@@ -22,14 +23,14 @@ public class EnrichProjectCommandTests
 
 		public EnrichProjectCommandTests()
 		{
-			_incompleteProjectGetDataQuery = new Mock<IIncompleteProjectsGetDataQuery>();
+			_conversionProjectRepository = new Mock<IConversionProjectRepository>();
 			_establishmentGetDataQuery = new Mock<IAcademiesQueryService>();
 			_updateCommand = new Mock<IProjectUpdateDataCommand>();
 			_logger = new Mock<ILogger<EnrichProjectCommand>>();
 
 			_subject = new EnrichProjectCommand(
 				_logger.Object,
-				_incompleteProjectGetDataQuery.Object,
+				_conversionProjectRepository.Object,
 				_establishmentGetDataQuery.Object,
 				_updateCommand.Object);
 		}
@@ -50,7 +51,7 @@ public async Task NoIncompleteProjects__LogAndReturn()
 		public async Task IncompleteProjects__UnknownSchool__LogAndContinue()
 		{
 			var projects = _fixture.CreateMany<Domain.ProjectAggregate.Project>();
-			_incompleteProjectGetDataQuery.Setup(m => m.GetIncompleteProjects())
+			_conversionProjectRepository.Setup(m => m.GetIncompleteProjects())
 				.ReturnsAsync(projects);
 
 			_establishmentGetDataQuery.SetupSequence(m => m.GetEstablishment(It.IsAny<int>()))
@@ -71,7 +72,7 @@ public async Task IncompleteProjects__UnknownSchool__LogAndContinue()
 		public async Task IncompleteProjects__KnownSchool__UpdateDb()
 		{
 			var project = _fixture.Create<Domain.ProjectAggregate.Project>();
-			_incompleteProjectGetDataQuery.Setup(m => m.GetIncompleteProjects())
+			_conversionProjectRepository.Setup(m => m.GetIncompleteProjects())
 				.ReturnsAsync(new List<IProject> { project });
 
 			_establishmentGetDataQuery.Setup(m => m.GetEstablishment(It.IsAny<int>()))

Dfe.Academies.Academisation.Service.UnitTest/Commands/Legacy/Project/LegacyProjectAddNoteCommandTests.cs

@@ -1,11 +1,9 @@
 using AutoFixture;
 using Dfe.Academies.Academisation.Core;
 using Dfe.Academies.Academisation.Domain.ApplicationAggregate;
-using Dfe.Academies.Academisation.Domain.Core.ProjectAggregate;
-using Dfe.Academies.Academisation.IData.ProjectAggregate;
+using Dfe.Academies.Academisation.Domain.SeedWork;
 using Dfe.Academies.Academisation.IDomain.ProjectAggregate;
 using Dfe.Academies.Academisation.Service.Commands.ConversionProject;
-using Dfe.Academies.Academisation.Service.Commands.Legacy.Project;
 using FluentAssertions;
 using Moq;
 using Xunit;
@@ -15,25 +13,24 @@ namespace Dfe.Academies.Academisation.Service.UnitTest.Commands.Legacy.Project
 	public class LegacyProjectAddNoteCommandTests
 	{
 		private readonly Fixture _fixture;
-		private readonly Mock<IConversionProjectRepository> _projectGetDataQuery;
-		private readonly Mock<IProjectNoteAddCommand> _projectNoteAddCommand;
+		private readonly Mock<IConversionProjectRepository> _repo;
 
 		public LegacyProjectAddNoteCommandTests()
 		{
 			_fixture = new Fixture();
-			_projectGetDataQuery = new Mock<IConversionProjectRepository>();
-			_projectNoteAddCommand = new Mock<IProjectNoteAddCommand>();
+			_repo = new Mock<IConversionProjectRepository>();
+			_repo.Setup(x => x.UnitOfWork).Returns(Mock.Of<IUnitOfWork>());
 		}
 
 		private ConversionProjectAddNoteCommandHandler System_under_test()
 		{
-			return new ConversionProjectAddNoteCommandHandler(_projectGetDataQuery.Object, _projectNoteAddCommand.Object);
+			return new ConversionProjectAddNoteCommandHandler(_repo.Object);
 		}
 
 		[Fact]
 		public async Task Should_return_not_found_command_result_if_the_project_is_unknown()
 		{
-			_projectGetDataQuery
+			_repo
 				.Setup(x => x.GetConversionProject(It.IsAny<int>()))
 				.ReturnsAsync((IProject?)null);
 
@@ -49,22 +46,16 @@ public async Task Should_pass_on_the_result_from_the_data_layer_command_if_the_p
 		{
 			IProject project = _fixture.Create<Domain.ProjectAggregate.Project>();
 
-			_projectGetDataQuery
-				.Setup(x => x.GetConversionProject(It.IsAny<int>()))
+			_repo.Setup(x => x.GetConversionProject(It.IsAny<int>()))
 				.ReturnsAsync(project);
 
-			var addCommandResult = new CommandSuccessResult();
-			_projectNoteAddCommand
-				.Setup(x => x.Execute(It.IsAny<int>(), It.IsAny<ProjectNote>()))
-				.ReturnsAsync(addCommandResult);
-
 			var command = System_under_test();
 
 			CommandResult result = await command.Handle(
 				_fixture.Create<ConversionProjectAddNoteCommand>() with { ProjectId = project.Id }, default
 			);
 
-			result.Should().Be(addCommandResult);
+			result.Should().BeOfType(typeof(CommandSuccessResult));
 		}
 	}
 }

Dfe.Academies.Academisation.Service.UnitTest/Queries/TransferProjectExportServiceTests.cs

@@ -1,5 +1,4 @@
-using Dfe.Academies.Academisation.Data.ProjectAggregate;
-using Dfe.Academies.Academisation.IService.Query;
+using Dfe.Academies.Academisation.IService.Query;
 using Dfe.Academies.Academisation.IService.ServiceModels.TransferProject;
 using Dfe.Academies.Academisation.Service.Queries;
 using Moq;