diff --git a/Services/CO.CDP.OrganisationInformation.Persistence/DatabaseShareCodeRepository.cs b/Services/CO.CDP.OrganisationInformation.Persistence/DatabaseShareCodeRepository.cs index 65afe8d0d..9ae6a53cd 100644 --- a/Services/CO.CDP.OrganisationInformation.Persistence/DatabaseShareCodeRepository.cs +++ b/Services/CO.CDP.OrganisationInformation.Persistence/DatabaseShareCodeRepository.cs @@ -39,7 +39,7 @@ public async Task> GetShareCodesAsync(Guid organisati .ThenInclude(f => f.Sections) .ThenInclude(s => s.Questions) .FirstOrDefaultAsync(); - } + } public async Task GetShareCodeDetailsAsync(Guid organisationId, string shareCode) { @@ -63,6 +63,7 @@ join o in context.Organisations on s.OrganisationId equals o.Id QuestionId = fq.Guid, QuestionType = fq.Type, fq.SummaryTitle, + fq.Title, FormAnswer = fa }; @@ -79,7 +80,7 @@ join o in context.Organisations on s.OrganisationId equals o.Id { QuestionId = a.QuestionId, QuestionType = a.QuestionType, - Title = a.SummaryTitle, + Title = string.IsNullOrEmpty(a.SummaryTitle) ? a.Title : a.SummaryTitle, Answer = a.FormAnswer }) }; @@ -88,8 +89,8 @@ join o in context.Organisations on s.OrganisationId equals o.Id public async Task GetShareCodeVerifyAsync(string formVersionId, string shareCode) { // Get FormId and Organisation based on ShareCode and FormVersionId - var query = from s in context.SharedConsents - where + var query = from s in context.SharedConsents + where s.FormVersionId == formVersionId && s.ShareCode == shareCode select s; diff --git a/Services/CO.CDP.OrganisationInformation.Persistence/IShareCodeRepository.cs b/Services/CO.CDP.OrganisationInformation.Persistence/IShareCodeRepository.cs index 001cc5511..5dc202000 100644 --- a/Services/CO.CDP.OrganisationInformation.Persistence/IShareCodeRepository.cs +++ b/Services/CO.CDP.OrganisationInformation.Persistence/IShareCodeRepository.cs @@ -8,4 +8,4 @@ public interface IShareCodeRepository : IDisposable Task GetByShareCode(string sharecode); Task GetShareCodeDetailsAsync(Guid organisationId, string shareCode); Task GetShareCodeVerifyAsync(string formVersionId, string shareCode); -} +} \ No newline at end of file