Skip to content

fix: RetrieveCohortDistribution API updated to check if a superseded by nhs number has existing record #1762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephhou merged 9 commits into from
Dec 12, 2025
Merged

fix: RetrieveCohortDistribution API updated to check if a superseded by nhs number has existing record #1762

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f92b73d
fix: Added logic to check a superseded by nhs number has an existing …
stephhou Nov 17, 2025
e53a3a9
Merge branch 'main' into fix/DTOSS-11459-supserseded-nhs-number-adds
stephhou Nov 26, 2025
6858047
Merge branch 'main' into fix/DTOSS-11459-supserseded-nhs-number-adds
stephhou Nov 28, 2025
16e9fb2
feat: updates to branch to include Feature flag for releasing change
stephhou Nov 28, 2025
82a3a63
Tidied up comments
stephhou Dec 1, 2025
68aec34
Merge branch 'main' into fix/DTOSS-11459-supserseded-nhs-number-adds
stephhou Dec 2, 2025
82a081d
fix: changes made to address sonarcloud warnings
stephhou Dec 2, 2025
f82db4a
chore: made variable names clearer
stephhou Dec 3, 2025
dea91ef
Merge branch 'main' into fix/DTOSS-11459-supserseded-nhs-number-adds
stephhou Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 61 additions & 20 deletions application/CohortManager/src/Functions/Shared/Data/Database/CreateCohortDistributionData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,37 +23,84 @@ public CreateCohortDistributionData(IDataServiceClient<CohortDistribution> cohor
_bsSelectRequestAuditDataServiceClient = bsSelectRequestAuditDataServiceClient;
}


public async Task<List<CohortDistributionParticipantDto>> GetUnextractedCohortDistributionParticipants(int rowCount)
{
var participantsList = await _cohortDistributionDataServiceClient.GetByFilter(x => x.IsExtracted.Equals(0) && x.RequestId == Guid.Empty);
var participantsToBeExtracted = await GetRegularUnextractedParticipants(rowCount)
?? await GetSupersededParticipants(rowCount);

return await ProcessAndReturnParticipants(participantsToBeExtracted);
}

var participantsToBeExtracted = participantsList.OrderBy(x => x.RecordUpdateDateTime ?? x.RecordInsertDateTime).Take(rowCount).ToList();
//TODO do this filtering on the data services
var CohortDistributionParticipantList = participantsToBeExtracted.Select(x => new CohortDistributionParticipant(x)).ToList();
private async Task<List<CohortDistribution>?> GetRegularUnextractedParticipants(int rowCount)
{
var unextractedParticipants = await _cohortDistributionDataServiceClient.GetByFilter(
x => x.IsExtracted.Equals(0) && x.RequestId == Guid.Empty && x.SupersededNHSNumber == null);

return unextractedParticipants.Any()
? OrderAndTakeParticipants(unextractedParticipants, rowCount)
: null;
}

private async Task<List<CohortDistribution>> GetSupersededParticipants(int rowCount)
{
var supersededParticipants = await _cohortDistributionDataServiceClient.GetByFilter(
x => x.IsExtracted.Equals(0) && x.RequestId == Guid.Empty && x.SupersededNHSNumber != null);

// Get distinct non-null superseded NHS numbers
var supersededNhsNumbers = supersededParticipants
.Select(sp => sp.SupersededNHSNumber)
.Where(nhs => nhs.HasValue)
.Select(nhs => nhs.Value)
.Distinct()
.ToList();

// Find records matching the superseded NHS numbers
var matchingParticipants = await _cohortDistributionDataServiceClient.GetByFilter(
x => supersededNhsNumbers.Contains(x.NHSNumber) && x.IsExtracted.Equals(1));

// Filter superseded participants that have matching records
var filteredParticipants = supersededParticipants.ToList()
.Where(sp => matchingParticipants.Any(mp => mp.NHSNumber == sp.SupersededNHSNumber))
.ToList();

return OrderAndTakeParticipants(filteredParticipants, rowCount);
}

private static List<CohortDistribution> OrderAndTakeParticipants(IEnumerable<CohortDistribution> participants, int rowCount)
{
return participants
.OrderBy(x => (x.RecordUpdateDateTime ?? x.RecordInsertDateTime) ?? DateTime.MinValue)
.Take(rowCount)
.ToList();
}

private async Task<List<CohortDistributionParticipantDto>> ProcessAndReturnParticipants(List<CohortDistribution> participantsToBeExtracted)
{
var cohortDistributionParticipantList = participantsToBeExtracted
.Select(x => new CohortDistributionParticipant(x))
.ToList();

var requestId = Guid.NewGuid();
if (await MarkCohortDistributionParticipantsAsExtracted(participantsToBeExtracted, requestId))
{
await LogRequestAudit(requestId, (int)HttpStatusCode.OK);
var success = await MarkCohortDistributionParticipantsAsExtracted(participantsToBeExtracted, requestId);

return CohortDistributionParticipantDto(CohortDistributionParticipantList, requestId);
}
var statusCode = success ? (int)HttpStatusCode.OK
: (cohortDistributionParticipantList.Count == 0 ? (int)HttpStatusCode.NoContent : (int)HttpStatusCode.InternalServerError);

var statusCode = CohortDistributionParticipantList.Count == 0 ? (int)HttpStatusCode.NoContent : (int)HttpStatusCode.InternalServerError;
await LogRequestAudit(requestId, statusCode);

return new List<CohortDistributionParticipantDto>();
return success
? CohortDistributionParticipantDto(cohortDistributionParticipantList, requestId)
: new List<CohortDistributionParticipantDto>();
}

public async Task<List<CohortDistributionParticipantDto>> GetCohortDistributionParticipantsByRequestId(Guid requestId)
{
var requestIdString = requestId.ToString();

if (requestId == Guid.Empty)
{
CohortDistributionParticipantDto(new List<CohortDistributionParticipant>());
}

// TODO we should probably tidy this up and make it better.
var participantsList = await _cohortDistributionDataServiceClient.GetByFilter(x => x.RequestId == requestId);
return CohortDistributionParticipantDto(participantsList.Select(x => new CohortDistributionParticipant(x)).ToList());
Expand Down Expand Up @@ -141,16 +188,14 @@ private async Task<bool> MarkCohortDistributionParticipantsAsExtracted(List<Coho

var extractedParticipants = cohortParticipants.Select(x => x.CohortDistributionId);



foreach (var participantId in extractedParticipants)
{

var participant = await _cohortDistributionDataServiceClient.GetSingle(participantId.ToString());
participant.IsExtracted = 1;
participant.RequestId = requestId;

var updatedRecord = await _cohortDistributionDataServiceClient.Update(participant);

if (!updatedRecord)
{
return false;
Expand Down Expand Up @@ -205,8 +250,6 @@ private List<CohortRequestAudit> BuildCohortRequestAudits(IEnumerable<BsSelectRe
}).OrderBy(x => x.CreatedDateTime).ToList();
}



private static Expression<Func<BsSelectRequestAudit, bool>> BuildCohortRequestAuditQuery(string? requestId, string? statusCode, DateTime? dateFrom)
{
var conditions = new List<Expression<Func<BsSelectRequestAudit, bool>>>();
Expand All @@ -231,7 +274,6 @@ private static Expression<Func<BsSelectRequestAudit, bool>> BuildCohortRequestAu
conditions.Add(predicate);
}


Expression<Func<BsSelectRequestAudit, bool>> finalPredicate;
if (conditions.Count > 0)
{
Expand All @@ -253,7 +295,6 @@ private static Expression<Func<T, bool>> CombineWithAnd<T>(List<Expression<Func<
return firstExpression;
}


var body = expressions
.Skip(1)
.Aggregate(
Expand Down
Loading
Loading