Merge pull request #850 from cabinetoffice/feature/dp-739-pdf-categor…

…y-connected-person-data-added Feature/dp 739 pdf category connected person data added
cabinetoffice · Oct 28, 2024 · e4f6c07 · e4f6c07
2 parents 4830fc1 + b0f670a
commit e4f6c07
Show file tree

Hide file tree

Showing 6 changed files with 119 additions and 66 deletions.
diff --git a/Frontend/CO.CDP.OrganisationApp/Pages/Users/UserRemoveConfirmation.cshtml.cs b/Frontend/CO.CDP.OrganisationApp/Pages/Users/UserRemoveConfirmation.cshtml.cs
@@ -1,9 +1,9 @@
 using CO.CDP.Organisation.WebApiClient;
-using Microsoft.AspNetCore.Mvc;
-using System.ComponentModel.DataAnnotations;
-using CO.CDP.OrganisationApp.Models;
 using CO.CDP.OrganisationApp.Constants;
+using CO.CDP.OrganisationApp.Models;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System.ComponentModel.DataAnnotations;
 
 namespace CO.CDP.OrganisationApp.Pages.Users;
 

diff --git a/Services/CO.CDP.DataSharing.WebApi.Tests/DataSharingFactory.cs b/Services/CO.CDP.DataSharing.WebApi.Tests/DataSharingFactory.cs
@@ -147,7 +147,8 @@ public static BasicInformation CreateMockBasicInformation()
                 RegisteredLegalForm = "Private Limited",
                 LawRegistered = "UK",
                 RegistrationDate = DateTimeOffset.UtcNow.AddYears(-10)
-            }
+            },
+            OrganisationName = "Organisation Name"
         };
     }
 

diff --git a/Services/CO.CDP.DataSharing.WebApi.Tests/UseCase/GetSharedDataFileUseCaseTests.cs b/Services/CO.CDP.DataSharing.WebApi.Tests/UseCase/GetSharedDataFileUseCaseTests.cs
@@ -76,4 +76,29 @@ public async Task Execute_WhenDoesNotHaveAccessToOrganisation_ThrowsUserUnauthor
 
         await act.Should().ThrowAsync<UserUnauthorizedException>();
     }
+
+    [Fact]
+    public async Task DataService_ShouldReturnBasicInformationWithOrganisationName()
+    {
+        var organisationId = Guid.NewGuid();
+        var sharecode = "valid-sharecode";
+        var expectedOrganisationName = "Organisation Name";
+
+        var sharedSupplierInformation = new SharedSupplierInformation
+        {
+            OrganisationId = organisationId,
+            BasicInformation = DataSharingFactory.CreateMockBasicInformation(),
+            ConnectedPersonInformation = DataSharingFactory.CreateMockConnectedPersonInformation(),
+            FormAnswerSetForPdfs = DataSharingFactory.CreateMockFormAnswerSetForPdfs(),
+            AttachedDocuments = []
+        };
+
+        _dataService.Setup(service => service.GetSharedSupplierInformationAsync(sharecode))
+            .ReturnsAsync(sharedSupplierInformation);
+
+        var result = await _dataService.Object.GetSharedSupplierInformationAsync(sharecode);
+
+        result.Should().NotBeNull();
+        result.BasicInformation.OrganisationName.Should().Be(expectedOrganisationName);
+    }
 }
diff --git a/Services/CO.CDP.DataSharing.WebApi/DataService/DataService.cs b/Services/CO.CDP.DataSharing.WebApi/DataService/DataService.cs
@@ -54,7 +54,7 @@ public IEnumerable<FormAnswerSetForPdf> MapFormAnswerSetsForPdf(
                     case FormQuestionType.YesOrNo:
                         {
                             pdfAnswerSet.QuestionAnswers.Add(new Tuple<string, string>($"{answer.Question.Title}",
-                                answer.OptionValue ?? "No"));
+                                answer.OptionValue ?? "Not specified"));
                             break;
                         }
                     case FormQuestionType.Date:
@@ -66,20 +66,20 @@ public IEnumerable<FormAnswerSetForPdf> MapFormAnswerSetsForPdf(
                     case FormQuestionType.Url:
                         {
                             pdfAnswerSet.QuestionAnswers.Add(new Tuple<string, string>($"{answer.Question.Title}",
-                               answer.TextValue ?? ""));
+                               answer.TextValue ?? "Not specified"));
                             break;
                         }
                     case FormQuestionType.FileUpload:
                         {
                             pdfAnswerSet.QuestionAnswers.Add(new Tuple<string, string>($"{answer.Question.Title}",
-                               answer.TextValue ?? "No"));
+                               answer.TextValue ?? "Not specified"));
                             break;
                         }
                     case FormQuestionType.Text:
                     case FormQuestionType.MultiLine:
                         {
                             pdfAnswerSet.QuestionAnswers.Add(new Tuple<string, string>($"{answer.Question.Title}:",
-                                answer.TextValue ?? ""));
+                                answer.TextValue ?? "Not specified"));
                             break;
                         }
                 }
@@ -102,7 +102,6 @@ public static BasicInformation MapToBasicInformation(Organisation organisation)
                 {
                     StreetAddress = a.Address.StreetAddress,
                     Locality = a.Address.Locality,
-                    Region = a.Address.Region,
                     PostalCode = a.Address.PostalCode,
                     CountryName = a.Address.CountryName,
                     Country = a.Address.Country,
@@ -118,7 +117,6 @@ public static BasicInformation MapToBasicInformation(Organisation organisation)
                 {
                     StreetAddress = a.Address.StreetAddress,
                     Locality = a.Address.Locality,
-                    Region = a.Address.Region,
                     PostalCode = a.Address.PostalCode,
                     CountryName = a.Address.CountryName,
                     Country = a.Address.Country,
@@ -162,7 +160,8 @@ public static BasicInformation MapToBasicInformation(Organisation organisation)
             WebsiteAddress = websiteAddress,
             EmailAddress = emailAddress,
             OrganisationType = organisationType,
-            LegalForm = legalForm
+            LegalForm = legalForm,
+            OrganisationName = organisation.Name
         };
     }
 

diff --git a/Services/CO.CDP.DataSharing.WebApi/Model/BasicInformation.cs b/Services/CO.CDP.DataSharing.WebApi/Model/BasicInformation.cs
@@ -12,6 +12,7 @@ public record BasicInformation
     public string? EmailAddress { get; init; }
     public OrganisationType OrganisationType { get; init; }
     public BasicLegalForm? LegalForm { get; init; }
+    public string? OrganisationName { get; init; }
 }
 
 public record BasicLegalForm