Skip to content

Commit 3e778b8

Browse files
Merge branch 'main' into feat/user-auth
2 parents b1055a1 + 1980619 commit 3e778b8

28 files changed

Lines changed: 104 additions & 62 deletions

File tree

application/CohortManager/src/Functions/CaasIntegration/RetrieveMeshFile/RetrieveMeshFileConfig.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ public class RetrieveMeshFileConfig
66
{
77
public string? MeshApiBaseUrl { get; set; }
88
[Required]
9-
public string BSSMailBox { get; set; }
9+
public required string BSSMailBox { get; set; }
1010
[Required]
1111
public string? MeshPassword { get; set; }
1212
[Required]
13-
public string MeshSharedKey { get; set; }
13+
public required string MeshSharedKey { get; set; }
1414
public string? MeshKeyPassphrase { get; set; }
1515
public string? MeshKeyName { get; set; }
1616
public string KeyVaultConnectionString { get; set; }
1717
[Required]
18-
public string caasfolder_STORAGE { get; set; }
18+
public required string caasfolder_STORAGE { get; set; }
1919
public string? ServerSideCerts { get; set; }
2020
public string? MeshCertName { get; set; }
2121
public bool? BypassServerCertificateValidation { get; set; }

application/CohortManager/src/Functions/CaasIntegration/receiveCaasFile/receiveCaasFileConfig.cs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,24 @@ namespace NHS.Screening.ReceiveCaasFile;
55
public class ReceiveCaasFileConfig
66
{
77
[Required]
8-
public string DemographicDataServiceURL { get; set; }
8+
public required string DemographicDataServiceURL { get; set; }
99
[Required]
10-
public string ScreeningLkpDataServiceURL { get; set; }
10+
public required string ScreeningLkpDataServiceURL { get; set; }
1111
[Required]
12-
public string DemographicURI { get; set; }
12+
public required string DemographicURI { get; set; }
1313
[Required]
14-
public int BatchSize { get; set; }
14+
public required int BatchSize { get; set; }
1515
public bool AllowDeleteRecords { get; set; }
1616
[Required]
17-
public int maxNumberOfChecks { get; set; }
17+
public required int maxNumberOfChecks { get; set; }
1818
[Required]
19-
public string caasfolder_STORAGE { get; set; }
19+
public required string caasfolder_STORAGE { get; set; }
2020
[Required]
21-
public string inboundBlobName { get; set; }
21+
public required string inboundBlobName { get; set; }
2222
[Required]
23-
public string ServiceBusConnectionString_client_internal { get; set; }
24-
public string GetOrchestrationStatusURL { get; set; }
23+
public required string ServiceBusConnectionString_client_internal { get; set; }
2524
[Required]
26-
public string ParticipantManagementTopic { get; set; }
25+
public required string GetOrchestrationStatusURL { get; set; }
26+
[Required]
27+
public required string ParticipantManagementTopic { get; set; }
2728
}

application/CohortManager/src/Functions/CohortDistributionServices/RetrieveCohortDistribution/RetrieveCohortDistributionConfig.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ public class RetrieveCohortDistributionConfig
66
{
77

88
[Required]
9-
public string ExceptionFunctionURL { get; set; }
9+
public required string ExceptionFunctionURL { get; set; }
1010
[Required]
11-
public string CohortDistributionDataServiceURL { get; set; }
11+
public required string CohortDistributionDataServiceURL { get; set; }
1212
[Required]
13-
public string BsSelectRequestAuditDataService { get; set; }
13+
public required string BsSelectRequestAuditDataService { get; set; }
1414
public int MaxRowCount { get; set; } = 1_000;
1515
public bool RetrieveSupersededRecordsLast { get; set; } = false;
1616

application/CohortManager/src/Functions/CohortDistributionServices/RetrieveCohortRequestAudit/RetrieveCohortRequestAuditConfig.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ public class RetrieveCohortRequestAuditConfig
66
{
77

88
[Required]
9-
public string ExceptionFunctionURL { get; set; }
9+
public required string ExceptionFunctionURL { get; set; }
1010
[Required]
11-
public string CohortDistributionDataServiceURL { get; set; }
11+
public required string CohortDistributionDataServiceURL { get; set; }
1212
[Required]
13-
public string BsSelectRequestAuditDataService { get; set; }
13+
public required string BsSelectRequestAuditDataService { get; set; }
1414

1515
}

application/CohortManager/src/Functions/CohortDistributionServices/TransformDataService/TransformDataServiceConfig.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ namespace NHS.CohortManager.CohortDistributionService;
55
public class TransformDataServiceConfig
66
{
77
[Required]
8-
public string ExceptionFunctionURL { get; set; }
8+
public required string ExceptionFunctionURL { get; set; }
99
[Required]
10-
public string BsSelectOutCodeUrl { get; set; }
10+
public required string BsSelectOutCodeUrl { get; set; }
1111
[Required]
12-
public string BsSelectGpPracticeUrl { get; set; }
12+
public required string BsSelectGpPracticeUrl { get; set; }
1313
[Required]
14-
public string LanguageCodeUrl { get; set; }
14+
public required string LanguageCodeUrl { get; set; }
1515
[Required]
16-
public string ExcludedSMULookupUrl { get; set; }
16+
public required string ExcludedSMULookupUrl { get; set; }
1717
[Required]
18-
public string CurrentPostingUrl { get; set; }
18+
public required string CurrentPostingUrl { get; set; }
1919
public int CacheTimeOutHours { get; set; } = 24;
2020
}

application/CohortManager/src/Functions/DemographicServices/DemographicDurableFunction/DemographicDurableFunctionConfig.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ namespace NHS.CohortManager.DemographicServices;
55
public class DemographicDurableFunctionConfig
66
{
77
[Required]
8-
public string DemographicDataServiceURL { get; set; }
9-
8+
public required string DemographicDataServiceURL {get; set;}
109
[Required]
11-
public int MaxRetryCount { get; set; }
10+
public required int MaxRetryCount { get; set; }
11+
1212
}

application/CohortManager/src/Functions/DemographicServices/ManageNemsSubscription/ManageNemsSubscriptionConfig.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,35 @@ public class ManageNemsSubscriptionConfig
1313
/// Production: Contact NHS Digital for production URLs
1414
/// </summary>
1515
[Required(ErrorMessage = "NemsFhirEndpoint is required")]
16-
public string NemsFhirEndpoint { get; set; } = string.Empty;
16+
public required string NemsFhirEndpoint { get; set; }
1717

1818
/// <summary>
1919
/// Your organization's ASID (Application Service Instance Identifier)
2020
/// Example: "200000002527"
2121
/// </summary>
2222
[Required(ErrorMessage = "NemsFromAsid is required")]
23-
public string NemsFromAsid { get; set; } = string.Empty;
23+
public required string NemsFromAsid { get; set; }
2424

2525
/// <summary>
2626
/// Target ASID (usually same as FromAsid for NEMS)
2727
/// Example: "200000002527"
2828
/// </summary>
2929
[Required(ErrorMessage = "NemsToAsid is required")]
30-
public string NemsToAsid { get; set; } = string.Empty;
30+
public required string NemsToAsid { get; set; }
3131

3232
/// <summary>
3333
/// Your organization's ODS code
3434
/// Example: "T8T9T"
3535
/// </summary>
3636
[Required(ErrorMessage = "NemsOdsCode is required")]
37-
public string NemsOdsCode { get; set; } = string.Empty;
37+
public required string NemsOdsCode { get; set; }
3838

3939
/// <summary>
4040
/// Your MESH mailbox ID (CRITICAL: Use full mailbox ID, not just ODS code)
4141
/// Example: "T8T9TOT001" (NOT just "T8T9T")
4242
/// </summary>
4343
[Required(ErrorMessage = "NemsMeshMailboxId is required")]
44-
public string NemsMeshMailboxId { get; set; } = string.Empty;
44+
public required string NemsMeshMailboxId { get; set; }
4545

4646
/// <summary>
4747
/// Azure Key Vault connection string for certificate storage

application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/RetrievePDSDemographicConfig.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class RetrievePDSDemographicConfig
2525

2626
[Required]
2727
public required string ServiceBusConnectionString_client_internal { get; set; }
28-
28+
[Required]
2929
public required bool UseFakePDSServices { get; set; } = false;
3030

3131
public string ClientId { get; set; } = string.Empty;

application/CohortManager/src/Functions/ExceptionHandling/CreateException/CreateExceptionConfig.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace NHS.Screening.CreateException;
55
public class CreateExceptionConfig
66
{
77
[Required]
8-
public string ExceptionManagementDataServiceURL {get; set;}
8+
public required string ExceptionManagementDataServiceURL {get; set;}
99
[Required]
10-
public string DemographicDataServiceURL {get; set;}
10+
public required string DemographicDataServiceURL {get; set;}
1111
}

application/CohortManager/src/Functions/ExceptionHandling/UpdateException/UpdateExceptionConfig.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ namespace NHS.Screening.UpdateException;
55
public class UpdateExceptionConfig
66
{
77
[Required]
8-
public string ExceptionManagementDataServiceURL {get; set;}
8+
public required string ExceptionManagementDataServiceURL {get; set;}
99
}

0 commit comments

Comments
 (0)