459419 Transpose pom and org data

src/EPR.Calculator.API.UnitTests/BaseControllerTest.cs

@@ -14,6 +14,7 @@
 using EPR.Calculator.API.Builder;
 using EPR.Calculator.API.Models;
 using EPR.Calculator.API.Exporter;
+using EPR.Calculator.API.Services;
 
 namespace EPR.Calculator.API.Tests.Controllers
 {
@@ -54,7 +55,8 @@ public void SetUp()
                 new RpdStatusDataValidator(wrapper),
                 wrapper, 
                 new Mock<ICalcResultBuilder>().Object,
-                new Mock<ICalcResultsExporter<CalcResult>>().Object
+                new Mock<ICalcResultsExporter<CalcResult>>().Object,
+                new Mock<ITransposePomAndOrgDataService>().Object
             );
 
             var mockFactory = new Mock<IAzureClientFactory<ServiceBusClient>>();
@@ -65,11 +67,12 @@ public void SetUp()
 
             mockFactory.Setup(m => m.CreateClient(It.IsAny<string>())).Returns(mockClient.Object);
 
-
-
             dbContext.CalculatorRuns.AddRange(GetCalculatorRuns());
             dbContext.SaveChanges();
             calculatorController = new CalculatorController(dbContext, ConfigurationItems.GetConfigurationValues(), mockFactory.Object);
+
+            dbContext.Material.AddRange(GetMaterials());
+            dbContext.SaveChanges();
         }
 
         public void CheckDbContext()
@@ -709,6 +712,156 @@ protected static IEnumerable<CalculatorRun> GetCalculatorRuns()
                 CreatedAt = new DateTime(2024, 8, 21, 14, 16, 27, DateTimeKind.Utc),
                 CreatedBy = "Test User"
             });
+            list.Add(new CalculatorRun
+            {
+                Id = 3,
+                CalculatorRunClassificationId = (int)RunClassification.RUNNING,
+                Name = "Test Run",
+                Financial_Year = "2024-25",
+                CreatedAt = new DateTime(2024, 8, 28, 10, 12, 30, DateTimeKind.Utc),
+                CreatedBy = "Test User",
+                CalculatorRunOrganisationDataMasterId = 1,
+                CalculatorRunPomDataMasterId = 1,
+            });
+            list.Add(new CalculatorRun
+            {
+                Id = 4,
+                CalculatorRunClassificationId = (int)RunClassification.RUNNING,
+                Name = "Test Calculated Result",
+                Financial_Year = "2024-25",
+                CreatedAt = new DateTime(2024, 8, 21, 14, 16, 27, DateTimeKind.Utc),
+                CreatedBy = "Test User",
+                CalculatorRunOrganisationDataMasterId = 2,
+                CalculatorRunPomDataMasterId = 2,
+            });
+            return list;
+        }
+
+        protected static IEnumerable<Material> GetMaterials()
+        {
+            var list = new List<Material>();
+            list.Add(new Material
+            {
+                Id = 1,
+                Code = "AL",
+                Name = "Aluminium",
+                Description = "Aluminium"
+            });
+            list.Add(new Material
+            {
+                Id = 2,
+                Code = "FC",
+                Name = "Fibre composite",
+                Description = "Fibre composite"
+            });
+            list.Add(new Material
+            {
+                Id = 3,
+                Code = "GL",
+                Name = "Glass",
+                Description = "Glass"
+            });
+            list.Add(new Material
+            {
+                Id = 4,
+                Code = "PC",
+                Name = "Paper or card",
+                Description = "Paper or card"
+            });
+            list.Add(new Material
+            {
+                Id = 5,
+                Code = "PL",
+                Name = "Plastic",
+                Description = "Plastic"
+            });
+            list.Add(new Material
+            {
+                Id = 6,
+                Code = "ST",
+                Name = "Steel",
+                Description = "Steel"
+            });
+            list.Add(new Material
+            {
+                Id = 7,
+                Code = "WD",
+                Name = "Wood",
+                Description = "Wood"
+            });
+            list.Add(new Material
+            {
+                Id = 8,
+                Code = "OT",
+                Name = "Other materials",
+                Description = "Other materials"
+            });
+            return list;
+        }
+
+        protected static IEnumerable<CalculatorRunPomDataMaster> GetCalculatorRunPomDataMaster()
+        {
+            var list = new List<CalculatorRunPomDataMaster>();
+            list.Add(new CalculatorRunPomDataMaster
+            {
+                Id = 1,
+                CalendarYear = "2024-25",
+                EffectiveFrom = DateTime.Now,
+                CreatedBy = "Test user",
+                CreatedAt  = DateTime.Now
+            });
+            return list;
+        }
+
+        protected static IEnumerable<CalculatorRunPomDataDetail> GetCalculatorRunPomDataDetails()
+        {
+            var list = new List<CalculatorRunPomDataDetail>();
+            list.Add(new CalculatorRunPomDataDetail
+            {
+                Id= 1,
+                OrganisationId = 1,
+                SubsidaryId = "SUBSID1",
+                SubmissionPeriod = "2023-P3",
+                PackagingActivity = null,
+                PackagingType = "CW",
+                PackagingClass = "O1",
+                PackagingMaterial = "PC",
+                PackagingMaterialWeight = 1000,
+                LoadTimeStamp = DateTime.Now,
+                CalculatorRunPomDataMasterId = 1,
+                SubmissionPeriodDesc = "July to December 2023",
+                CalculatorRunPomDataMaster = BaseControllerTest.GetCalculatorRunPomDataMaster().ToList()[0]
+            });
+            return list;
+        }
+
+        protected static IEnumerable<CalculatorRunOrganisationDataMaster> GetCalculatorRunOrganisationDataMaster()
+        {
+            var list = new List<CalculatorRunOrganisationDataMaster>();
+            list.Add(new CalculatorRunOrganisationDataMaster
+            {
+                CalendarYear = "2024-25",
+                EffectiveFrom = DateTime.Now,
+                CreatedBy = "Test user",
+                CreatedAt = DateTime.Now
+            });
+            return list;
+        }
+
+        protected static IEnumerable<CalculatorRunOrganisationDataDetail> GetCalculatorRunOrganisationDataDetails()
+        {
+            var list = new List<CalculatorRunOrganisationDataDetail>();
+            list.Add(new CalculatorRunOrganisationDataDetail
+            {
+                Id = 1,
+                OrganisationId = 1,
+                SubsidaryId = "SUBSID1",
+                OrganisationName = "UPU LIMITED",
+                LoadTimeStamp= DateTime.Now,
+                CalculatorRunOrganisationDataMasterId = 1,
+                SubmissionPeriodDesc = "January to June 2023",
+                CalculatorRunOrganisationDataMaster = BaseControllerTest.GetCalculatorRunOrganisationDataMaster().ToList()[0]
+            });
             return list;
         }
     }

src/EPR.Calculator.API.UnitTests/CalResultsTests.cs

@@ -0,0 +1,85 @@
+using EPR.Calculator.API.Builder;
+using EPR.Calculator.API.Controllers;
+using EPR.Calculator.API.Data;
+using EPR.Calculator.API.Dtos;
+using EPR.Calculator.API.Exporter;
+using EPR.Calculator.API.Models;
+using EPR.Calculator.API.Services;
+using EPR.Calculator.API.Validators;
+using EPR.Calculator.API.Wrapper;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+
+namespace EPR.Calculator.API.UnitTests
+{
+    [TestClass]
+    public class CalcResultServiceTests
+    {
+        private Mock<ICalcResultBuilder> mockCalcResultBuilder;
+        private Mock<ICalcResultsExporter<CalcResult>> mockExporter;
+        private Mock<ICalcResultDetailBuilder> mockDetailBuilder;
+        private Mock<ICalcResultLapcapDataBuilder> mockLapcapBuilder;
+
+        private Mock<ApplicationDBContext> mockContext;
+        private CalculatorInternalController controller;
+        private CalcResultBuilder calcResultBuilder;
+        private CalcResultDetailBuilder detailBuilder;
+        private CalcResultsExporter exporter;
+        protected ApplicationDBContext? dbContext;
+        protected IOrgAndPomWrapper? wrapper;
+
+        [TestInitialize]
+        public void Setup()
+        {
+            mockCalcResultBuilder = new Mock<ICalcResultBuilder>();
+            mockExporter = new Mock<ICalcResultsExporter<CalcResult>>();
+            wrapper = new Mock<IOrgAndPomWrapper>().Object;
+            var transposePomAndOrgDataService = new Mock<ITransposePomAndOrgDataService>();
+            controller = new CalculatorInternalController(
+               dbContext,
+               new RpdStatusDataValidator(wrapper),
+               wrapper,
+               mockCalcResultBuilder.Object,
+               mockExporter.Object,
+               transposePomAndOrgDataService.Object
+            );
+
+            mockDetailBuilder = new Mock<ICalcResultDetailBuilder>();
+            mockLapcapBuilder = new Mock<ICalcResultLapcapDataBuilder>();
+            calcResultBuilder = new CalcResultBuilder(mockDetailBuilder.Object, mockLapcapBuilder.Object);
+
+            mockContext = new Mock<ApplicationDBContext>();
+            detailBuilder = new CalcResultDetailBuilder(mockContext.Object);
+
+        }
+
+        [TestMethod]
+        public void PrepareCalcResults_ShouldReturnCreatedStatus()
+        {
+            var requestDto = new CalcResultsRequestDto();
+            var calcResult = new CalcResult();
+            mockCalcResultBuilder.Setup(b => b.Build(requestDto)).Returns(calcResult);
+
+            var result = controller.PrepareCalcResults(requestDto) as ObjectResult;
+
+            Assert.IsNotNull(result);
+            Assert.AreEqual(201, result.StatusCode);
+            mockExporter.Verify(e => e.Export(calcResult), Times.Once);
+        }
+
+        [TestMethod]
+        public void Build_ShouldReturnCalcResultWithDetail()
+        {
+            var requestDto = new CalcResultsRequestDto();
+            var detail = new CalcResultDetail();
+            mockDetailBuilder.Setup(d => d.Construct(requestDto)).Returns(detail);
+
+            var result = calcResultBuilder.Build(requestDto);
+
+            Assert.IsNotNull(result);
+            Assert.AreEqual(detail, result.CalcResultDetail);
+        }
+    }
+}
+