Skip to content
This repository was archived by the owner on Jul 28, 2025. It is now read-only.

Commit 4816b4f

Browse files
alex-clayton-1alex-clayton-1
committed
refactor: Renamed method/function and modified error messages
1 parent 67bec63 commit 4816b4f

File tree

3 files changed

+36
-36
lines changed

3 files changed

+36
-36
lines changed

‎src/ServiceLayer.API/Functions/BSSelectFunctions.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ namespace ServiceLayer.API.Functions;
1313

1414
public class BSSelectFunctions(ILogger<BSSelectFunctions> logger, EventGridPublisherClient eventGridPublisherClient)
1515
{
16-
[Function("CreateEpisodeEvent")]
17-
public async Task<IActionResult> CreateEpisodeEvent([HttpTrigger(AuthorizationLevel.Anonymous, "post", Route = "bsselect/episodes")] HttpRequestData req)
16+
[Function("BSSelectIngressEpisode")]
17+
public async Task<IActionResult> IngressEpisode([HttpTrigger(AuthorizationLevel.Anonymous, "post", Route = "bsselect/episodes/ingress")] HttpRequestData req)
1818
{
1919
BSSelectEpisode? bssEpisodeEvent;
2020

@@ -53,7 +53,7 @@ public async Task<IActionResult> CreateEpisodeEvent([HttpTrigger(AuthorizationLe
5353

5454
var cloudEvent = new CloudEvent(
5555
"ServiceLayer",
56-
"CreatePathwayEnrolment",
56+
"EpisodeEvent",
5757
createPathwayEnrolment
5858
);
5959

@@ -71,7 +71,7 @@ public async Task<IActionResult> CreateEpisodeEvent([HttpTrigger(AuthorizationLe
7171
}
7272
catch (Exception ex)
7373
{
74-
logger.LogError(ex, "Failed to send CreateBrestScreeningPathwayEnrolment event");
74+
logger.LogError(ex, "Failed to send event to Event Grid");
7575
return new StatusCodeResult(500);
7676
}
7777
}

‎src/ServiceLayer.API/Models/BSSelectEpisode.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ namespace ServiceLayer.API.Models;
66
public class BSSelectEpisode
77
{
88
[JsonPropertyName("episode_id")]
9-
[Required(ErrorMessage = "The episode_id is required")]
9+
[Required(ErrorMessage = "episode_id is required")]
1010
public string? EpisodeId { get; set; }
1111

1212
[JsonPropertyName("nhs_number")]
13-
[Required(ErrorMessage = "The nhs_number is required")]
14-
[RegularExpression(@"^\d{10}$", ErrorMessage = "The nhs_number must be exactly 10 digits")]
13+
[Required(ErrorMessage = "nhs_number is required")]
14+
[RegularExpression(@"^\d{10}$", ErrorMessage = "nhs_number must be exactly 10 digits")]
1515
public string? NhsNumber { get; set; }
1616

1717
[JsonPropertyName("date_of_birth")]
18-
[Required(ErrorMessage = "The date_of_birth is required")]
18+
[Required(ErrorMessage = "date_of_birth is required")]
1919
public DateOnly? DateOfBirth { get; set; }
2020

2121
[JsonPropertyName("first_given_name")]
22-
[Required(ErrorMessage = "The first_given_name is required")]
22+
[Required(ErrorMessage = "first_given_name is required")]
2323
public string? FirstGivenName { get; set; }
2424

2525
[JsonPropertyName("family_name")]
26-
[Required(ErrorMessage = "The family_name is required")]
26+
[Required(ErrorMessage = "family_name is required")]
2727
public string? FamilyName { get; set; }
2828
}

‎tests/ServiceLayer.API.Tests/Functions/BSSelectFunctionsTests.cs‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public async Task CreateEpisodeEvent_ShouldSendEventAndReturnOk_WhenRequestIsVal
3939
_mockEventGridPublisherClient.Setup(x => x.SendEventAsync(It.IsAny<CloudEvent>(), It.IsAny<CancellationToken>())).ReturnsAsync(mockResponse);
4040

4141
// Act
42-
var response = await _functions.CreateEpisodeEvent(request);
42+
var response = await _functions.IngressEpisode(request);
4343

4444
// Assert
4545
Assert.IsType<OkResult>(response);
@@ -53,7 +53,7 @@ public async Task CreateEpisodeEvent_ShouldReturnBadRequest_WhenRequestBodyEmpty
5353
var request = _setupRequest.CreateMockHttpRequest(null);
5454

5555
// Act
56-
var response = await _functions.CreateEpisodeEvent(request);
56+
var response = await _functions.IngressEpisode(request);
5757

5858
// Assert
5959
var result = Assert.IsType<BadRequestObjectResult>(response);
@@ -75,11 +75,11 @@ public async Task CreateEpisodeEvent_ShouldReturnBadRequest_WhenEpisodeIdIsMissi
7575
var request = _setupRequest.CreateMockHttpRequest(episode);
7676

7777
// Act
78-
var response = await _functions.CreateEpisodeEvent(request);
78+
var response = await _functions.IngressEpisode(request);
7979

8080
// Assert
8181
var result = Assert.IsType<BadRequestObjectResult>(response);
82-
Assert.Equal("The episode_id is required", result.Value);
82+
Assert.Equal("episode_id is required", result.Value);
8383
_mockEventGridPublisherClient.Verify(x => x.SendEventAsync(It.IsAny<CloudEvent>(), It.IsAny<CancellationToken>()), Times.Never());
8484
}
8585

@@ -101,11 +101,11 @@ public async Task CreateEpisodeEvent_ShouldReturnBadRequest_WhenEpisodeIdIsEmpty
101101
var request = _setupRequest.CreateMockHttpRequest(episode);
102102

103103
// Act
104-
var response = await _functions.CreateEpisodeEvent(request);
104+
var response = await _functions.IngressEpisode(request);
105105

106106
// Assert
107107
var result = Assert.IsType<BadRequestObjectResult>(response);
108-
Assert.Equal("The episode_id is required", result.Value);
108+
Assert.Equal("episode_id is required", result.Value);
109109
_mockEventGridPublisherClient.Verify(x => x.SendEventAsync(It.IsAny<CloudEvent>(), It.IsAny<CancellationToken>()), Times.Never());
110110
}
111111

@@ -123,11 +123,11 @@ public async Task CreateEpisodeEvent_ShouldReturnBadRequest_WhenNhsNumberIsMissi
123123
var request = _setupRequest.CreateMockHttpRequest(episode);
124124

125125
// Act
126-
var response = await _functions.CreateEpisodeEvent(request);
126+
var response = await _functions.IngressEpisode(request);
127127

128128
// Assert
129129
var result = Assert.IsType<BadRequestObjectResult>(response);
130-
Assert.Equal("The nhs_number is required", result.Value);
130+
Assert.Equal("nhs_number is required", result.Value);
131131
_mockEventGridPublisherClient.Verify(x => x.SendEventAsync(It.IsAny<CloudEvent>(), It.IsAny<CancellationToken>()), Times.Never());
132132
}
133133

@@ -149,11 +149,11 @@ public async Task CreateEpisodeEvent_ShouldReturnBadRequest_WhenNhsNumberIsEmpty
149149
var request = _setupRequest.CreateMockHttpRequest(episode);
150150

151151
// Act
152-
var response = await _functions.CreateEpisodeEvent(request);
152+
var response = await _functions.IngressEpisode(request);
153153

154154
// Assert
155155
var result = Assert.IsType<BadRequestObjectResult>(response);
156-
Assert.Equal("The nhs_number is required", result.Value);
156+
Assert.Equal("nhs_number is required", result.Value);
157157
_mockEventGridPublisherClient.Verify(x => x.SendEventAsync(It.IsAny<CloudEvent>(), It.IsAny<CancellationToken>()), Times.Never());
158158
}
159159

@@ -175,11 +175,11 @@ public async Task CreateEpisodeEvent_ShouldReturnBadRequest_WhenNhsNumberIsInval
175175
var request = _setupRequest.CreateMockHttpRequest(episode);
176176

177177
// Act
178-
var response = await _functions.CreateEpisodeEvent(request);
178+
var response = await _functions.IngressEpisode(request);
179179

180180
// Assert
181181
var result = Assert.IsType<BadRequestObjectResult>(response);
182-
Assert.Equal("The nhs_number must be exactly 10 digits", result.Value);
182+
Assert.Equal("nhs_number must be exactly 10 digits", result.Value);
183183
_mockEventGridPublisherClient.Verify(x => x.SendEventAsync(It.IsAny<CloudEvent>(), It.IsAny<CancellationToken>()), Times.Never());
184184
}
185185

@@ -197,11 +197,11 @@ public async Task CreateEpisodeEvent_ShouldReturnBadRequest_WhenDateOfBirthIsMis
197197
var request = _setupRequest.CreateMockHttpRequest(episode);
198198

199199
// Act
200-
var response = await _functions.CreateEpisodeEvent(request);
200+
var response = await _functions.IngressEpisode(request);
201201

202202
// Assert
203203
var result = Assert.IsType<BadRequestObjectResult>(response);
204-
Assert.Equal("The date_of_birth is required", result.Value);
204+
Assert.Equal("date_of_birth is required", result.Value);
205205
_mockEventGridPublisherClient.Verify(x => x.SendEventAsync(It.IsAny<CloudEvent>(), It.IsAny<CancellationToken>()), Times.Never());
206206
}
207207

@@ -221,11 +221,11 @@ public async Task CreateEpisodeEvent_ShouldReturnBadRequest_WhenDateOfBirthIsEmp
221221
var request = _setupRequest.CreateMockHttpRequest(episode);
222222

223223
// Act
224-
var response = await _functions.CreateEpisodeEvent(request);
224+
var response = await _functions.IngressEpisode(request);
225225

226226
// Assert
227227
var result = Assert.IsType<BadRequestObjectResult>(response);
228-
Assert.Equal("The date_of_birth is required", result.Value);
228+
Assert.Equal("date_of_birth is required", result.Value);
229229
_mockEventGridPublisherClient.Verify(x => x.SendEventAsync(It.IsAny<CloudEvent>(), It.IsAny<CancellationToken>()), Times.Never());
230230
}
231231

@@ -243,11 +243,11 @@ public async Task CreateEpisodeEvent_ShouldReturnBadRequest_WhenFirstGivenNameIs
243243
var request = _setupRequest.CreateMockHttpRequest(episode);
244244

245245
// Act
246-
var response = await _functions.CreateEpisodeEvent(request);
246+
var response = await _functions.IngressEpisode(request);
247247

248248
// Assert
249249
var result = Assert.IsType<BadRequestObjectResult>(response);
250-
Assert.Equal("The first_given_name is required", result.Value);
250+
Assert.Equal("first_given_name is required", result.Value);
251251
_mockEventGridPublisherClient.Verify(x => x.SendEventAsync(It.IsAny<CloudEvent>(), It.IsAny<CancellationToken>()), Times.Never());
252252
}
253253

@@ -269,11 +269,11 @@ public async Task CreateEpisodeEvent_ShouldReturnBadRequest_WhenFirstGivenNameIs
269269
var request = _setupRequest.CreateMockHttpRequest(episode);
270270

271271
// Act
272-
var response = await _functions.CreateEpisodeEvent(request);
272+
var response = await _functions.IngressEpisode(request);
273273

274274
// Assert
275275
var result = Assert.IsType<BadRequestObjectResult>(response);
276-
Assert.Equal("The first_given_name is required", result.Value);
276+
Assert.Equal("first_given_name is required", result.Value);
277277
_mockEventGridPublisherClient.Verify(x => x.SendEventAsync(It.IsAny<CloudEvent>(), It.IsAny<CancellationToken>()), Times.Never());
278278
}
279279

@@ -291,11 +291,11 @@ public async Task CreateEpisodeEvent_ShouldReturnBadRequest_WhenFamilyNameIsMiss
291291
var request = _setupRequest.CreateMockHttpRequest(episode);
292292

293293
// Act
294-
var response = await _functions.CreateEpisodeEvent(request);
294+
var response = await _functions.IngressEpisode(request);
295295

296296
// Assert
297297
var result = Assert.IsType<BadRequestObjectResult>(response);
298-
Assert.Equal("The family_name is required", result.Value);
298+
Assert.Equal("family_name is required", result.Value);
299299
_mockEventGridPublisherClient.Verify(x => x.SendEventAsync(It.IsAny<CloudEvent>(), It.IsAny<CancellationToken>()), Times.Never());
300300
}
301301

@@ -317,11 +317,11 @@ public async Task CreateEpisodeEvent_ShouldReturnBadRequest_WhenFamilyNameIsEmpt
317317
var request = _setupRequest.CreateMockHttpRequest(episode);
318318

319319
// Act
320-
var response = await _functions.CreateEpisodeEvent(request);
320+
var response = await _functions.IngressEpisode(request);
321321

322322
// Assert
323323
var result = Assert.IsType<BadRequestObjectResult>(response);
324-
Assert.Equal("The family_name is required", result.Value);
324+
Assert.Equal("family_name is required", result.Value);
325325
_mockEventGridPublisherClient.Verify(x => x.SendEventAsync(It.IsAny<CloudEvent>(), It.IsAny<CancellationToken>()), Times.Never());
326326
}
327327

@@ -342,7 +342,7 @@ public async Task CreateEpisodeEvent_ShouldReturnInternalServerError_WhenEventFa
342342
_mockEventGridPublisherClient.Setup(x => x.SendEventAsync(It.IsAny<CloudEvent>(), It.IsAny<CancellationToken>())).ReturnsAsync(mockResponse);
343343

344344
// Act
345-
var response = await _functions.CreateEpisodeEvent(request);
345+
var response = await _functions.IngressEpisode(request);
346346

347347
// Assert
348348
var result = Assert.IsType<StatusCodeResult>(response);
@@ -368,7 +368,7 @@ public async Task CreateEpisodeEvent_ShouldReturnInternalServerError_WhenSendEve
368368
.ThrowsAsync(new RequestFailedException("Failed to send event to Event Grid"));
369369

370370
// Act
371-
var response = await _functions.CreateEpisodeEvent(request);
371+
var response = await _functions.IngressEpisode(request);
372372

373373
// Assert
374374
var result = Assert.IsType<StatusCodeResult>(response);

0 commit comments

Comments
 (0)