Skip to content

Commit

Permalink
Merge branch 'develop' into Pidp-1056-Back-to-top-misalignment
Browse files Browse the repository at this point in the history
  • Loading branch information
@AdityaMantripragada
AdityaMantripragada authored Oct 8, 2024
2 parents 4f92560 + 2c701ad commit ed18314
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 318 deletions.
1 change: 1 addition & 0 deletions backend/services.plr-intake.tests/.vscode/settings.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"dotnet.defaultSolution": "../pidp-backend.sln",
"editor.bracketPairColorization.enabled": true,
"editor.formatOnPaste": true,
"editor.formatOnType": true,
Expand Down
386 changes: 77 additions & 309 deletions backend/services.plr-intake.tests/Features/Intake/IntakeService.cs
View file
Original file line number Diff line number Diff line change
@@ -1,309 +1,77 @@
// namespace PlrIntake.Features.Intake;

// using Microsoft.EntityFrameworkCore;
// using Microsoft.Extensions.Logging;
// using System;
// using System.Collections.Generic;
// using System.Globalization;
// using System.IO;
// using System.ServiceModel;
// using System.Text.RegularExpressions;
// using System.Threading.Tasks;
// using System.Xml;
// using System.Xml.Linq;

// using PlrIntake.Data;
// using PlrIntake.Models;

// [ServiceContract(Namespace = IntakeServiceOperationTuner.Uri)]
// public interface IIntakeService
// {
// [OperationContract(Name = "PRPM_IN301030CA")]
// Task AddBcProviderAsync();

// [OperationContract(Name = "PRPM_IN303030CA")]
// Task UpdateBcProviderAsync();
// }

// public class IntakeService : IIntakeService
// {
// private const string Prefix = IntakeServiceOperationTuner.Prefix;

// private readonly ILogger<IntakeService> logger;
// private readonly PlrDbContext context;
// private readonly XmlNamespaceManager nsManager;

// public IntakeService(
// ILogger<IntakeService> logger,
// PlrDbContext context)
// {
// this.logger = logger;
// this.context = context;

// this.nsManager = new XmlNamespaceManager(new NameTable());
// this.nsManager.AddNamespace(Prefix, IntakeServiceOperationTuner.Uri);
// }

// //We expect that the DocumentRoot will be set in the IntakeServiceOperationTuner.
// public XElement DocumentRoot { get; set; } = default!;

// public async Task AddBcProviderAsync()
// {
// this.logger.LogInformation("Add BC Provider message received.");

// var record = this.ReadDistributionMessage(this.DocumentRoot.ToString());
// var recordId = await this.CreateOrUpdateRecordAsync(record, false);
// this.logger.LogDebug("Id of row created: " + recordId);
// }

// public async Task UpdateBcProviderAsync()
// {
// this.logger.LogInformation("Update BC Provider message received.");

// var record = this.ReadDistributionMessage(this.DocumentRoot.ToString());
// var recordId = await this.CreateOrUpdateRecordAsync(record, true);
// this.logger.LogDebug("Id of row updated: " + recordId);
// }

// public void LogWarning(string warningMessage) => this.logger.LogWarning(warningMessage);

// private PlrRecord ReadDistributionMessage(string messageContent)
// {
// var doc = new XmlDocument();
// var strReader = new StringReader(messageContent);
// doc.Load(strReader);
// XmlNode documentRoot = doc.DocumentElement!;

// var messageId = this.ReadNodeData($"//{Prefix}:id[@root='2.16.840.1.113883.3.40.1.5']/@extension", documentRoot);
// if (messageId == null)
// {
// this.logger.LogError("No ID was found for the message {messageContent}", messageContent);
// throw new ArgumentException("Message id missing.");
// }
// var internalProviderCode = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:id[@root='2.16.840.1.113883.3.40.2.8']/@extension", documentRoot, messageId);
// if (internalProviderCode == null)
// {
// this.logger.LogError("Mandatory IPC was not found for the message '{id}'", messageId);
// throw new ArgumentException("IPC missing.");
// }
// this.logger.LogInformation($"Message received with ID {messageId} for provider with IPC of {internalProviderCode}.");

// // Ignore CPN, IPC, and MPID respectively
// const string nonCollegeIdXPathExpr = "not (@root='2.16.840.1.113883.3.40.2.3') and not (@root='2.16.840.1.113883.3.40.2.8') and not (@root='2.16.840.1.113883.3.40.2.11')";
// const string postalWorkplaceUseExpr = "@use='PST WP'";
// var result = new PlrRecord();

// // Primary attributes for PRIME
// result.Ipc = internalProviderCode;
// // At this point, IdentifierType as OID
// result.IdentifierType = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:id[{nonCollegeIdXPathExpr}]/@root", documentRoot, messageId);
// result.CollegeId = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:id[{nonCollegeIdXPathExpr}]/@extension", documentRoot, messageId);
// result.ProviderRoleType = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:code/@code", documentRoot, messageId);
// result.FirstName = this.ReadNodeData($"//{Prefix}:healthCarePrincipalPerson/{Prefix}:name[@use='L']/{Prefix}:given[1]", documentRoot, messageId);
// result.SecondName = this.ReadNodeData($"//{Prefix}:healthCarePrincipalPerson/{Prefix}:name[@use='L']/{Prefix}:given[2]", documentRoot, messageId);
// result.ThirdName = this.ReadNodeData($"//{Prefix}:healthCarePrincipalPerson/{Prefix}:name[@use='L']/{Prefix}:given[3]", documentRoot, messageId);
// result.LastName = this.ReadNodeData($"//{Prefix}:healthCarePrincipalPerson/{Prefix}:name[@use='L']/{Prefix}:family", documentRoot, messageId);
// result.DateOfBirth = ParseHL7v3DateTime(this.ReadNodeData($"//{Prefix}:healthCarePrincipalPerson/{Prefix}:birthTime/@value", documentRoot, messageId));
// result.StatusCode = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:statusCode/@code", documentRoot, messageId);
// result.StatusReasonCode = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:subjectOf2/{Prefix}:roleActivation/{Prefix}:reasonCode/@code", documentRoot, messageId);
// result.ConditionCode = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:responsibleFor/{Prefix}:privilege/{Prefix}:code/@code", documentRoot, messageId);
// result.ConditionStartDate = ParseHL7v3DateTime(this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:responsibleFor/{Prefix}:privilege/{Prefix}:effectiveTime/{Prefix}:low/@value", documentRoot, messageId));
// result.ConditionEndDate = ParseHL7v3DateTime(this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:responsibleFor/{Prefix}:privilege/{Prefix}:effectiveTime/{Prefix}:high/@value", documentRoot, messageId));

// // Secondary attributes for PRIME
// result.Cpn = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:id[@root='2.16.840.1.113883.3.40.2.3']/@extension", documentRoot, messageId);
// result.Address1Line1 = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:addr[{postalWorkplaceUseExpr}]/{Prefix}:streetAddressLine[1]", documentRoot, messageId);
// result.Address1Line2 = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:addr[{postalWorkplaceUseExpr}]/{Prefix}:streetAddressLine[2]", documentRoot, messageId);
// result.Address1Line3 = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:addr[{postalWorkplaceUseExpr}]/{Prefix}:streetAddressLine[3]", documentRoot, messageId);
// result.City1 = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:addr[{postalWorkplaceUseExpr}]/{Prefix}:city", documentRoot, messageId);
// result.Province1 = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:addr[{postalWorkplaceUseExpr}]/{Prefix}:state", documentRoot, messageId);
// result.Country1 = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:addr[{postalWorkplaceUseExpr}]/{Prefix}:country", documentRoot, messageId);
// result.PostalCode1 = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:addr[{postalWorkplaceUseExpr}]/{Prefix}:postalCode", documentRoot, messageId);
// result.Address1StartDate = ParseHL7v3DateTime(this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:addr[{postalWorkplaceUseExpr}]/{Prefix}:useablePeriod/{Prefix}:low/@value", documentRoot, messageId));

// // According to PLR team, Credentials will have a `reference` child node (i.e. designation text) ...
// var credentials = this.ReadMultiNodeData($"//{Prefix}:healthCareProvider/{Prefix}:relatedTo/{Prefix}:qualifiedEntity/{Prefix}:code[{Prefix}:originalText/{Prefix}:reference]/@code", documentRoot, messageId)
// ?? Enumerable.Empty<string>();
// result.Credentials = credentials.Select(x => new Credential(x)).ToList();

// var emailData = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:telecom[@use='WP' and starts-with(@value, 'mailto')]/@value", documentRoot, messageId);
// if (emailData != null)
// {
// result.Email = RemoveHL7v3TelecomType(emailData);
// }

// // ... but Expertises will never have a `reference` child node
// var expertise = this.ReadMultiNodeData($"//{Prefix}:healthCareProvider/{Prefix}:relatedTo/{Prefix}:qualifiedEntity/{Prefix}:code[not({Prefix}:originalText/{Prefix}:reference)]/@code", documentRoot, messageId)
// ?? Enumerable.Empty<string>();
// result.Expertise = expertise.Select(x => new Expertise(x)).ToList();

// var faxNumberData = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:telecom[@use='WP' and starts-with(@value, 'fax')]/@value", documentRoot, messageId);
// if (faxNumberData != null)
// {
// var faxNumberParts = SplitTelecomNumber(RemoveHL7v3TelecomType(faxNumberData));
// if (faxNumberParts.Length == 2)
// {
// result.FaxAreaCode = faxNumberParts[0];
// result.FaxNumber = faxNumberParts[1];
// }
// else
// {
// result.FaxNumber = faxNumberParts[0];
// }
// }

// result.Gender = this.ReadNodeData($"//{Prefix}:healthCarePrincipalPerson/{Prefix}:administrativeGenderCode/@code", documentRoot, messageId);
// result.MspId = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:id[@root='2.16.840.1.113883.3.40.2.11']/@extension", documentRoot, messageId);
// result.NamePrefix = this.ReadNodeData($"//{Prefix}:healthCarePrincipalPerson/{Prefix}:name[@use='L']/{Prefix}:prefix", documentRoot, messageId);
// result.StatusStartDate = ParseHL7v3DateTime(this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:statusCode/{Prefix}:validTime/{Prefix}:low/@value", documentRoot, messageId));
// result.StatusExpiryDate = ParseHL7v3DateTime(this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:statusCode/{Prefix}:validTime/{Prefix}:high/@value", documentRoot, messageId));
// result.Suffix = this.ReadNodeData($"//{Prefix}:healthCarePrincipalPerson/{Prefix}:name[@use='L']/{Prefix}:suffix", documentRoot, messageId);
// var telephoneNumData = this.ReadNodeData($"//{Prefix}:healthCareProvider/{Prefix}:telecom[@use='WP' and starts-with(@value, 'tel')]/@value", documentRoot, messageId);
// if (telephoneNumData != null)
// {
// var telephoneNumberParts = SplitTelecomNumber(RemoveHL7v3TelecomType(telephoneNumData));
// if (telephoneNumberParts.Length == 2)
// {
// result.TelephoneAreaCode = telephoneNumberParts[0];
// result.TelephoneNumber = telephoneNumberParts[1];
// }
// else
// {
// result.TelephoneNumber = telephoneNumberParts[0];
// }
// }
// return result;
// }

// public static DateTime? ParseHL7v3DateTime(string? dateString)
// {
// if (dateString != null)
// {
// return DateTime.TryParseExact(dateString, "yyyyMMddHHmmss", CultureInfo.InvariantCulture, DateTimeStyles.None, out var date) ? date : null;
// }
// else
// {
// return null;
// }
// }

// public static string RemoveHL7v3TelecomType(string telecomValue)
// {
// var colonIndex = telecomValue.IndexOf(':');
// return colonIndex != -1 ? telecomValue[(colonIndex + 1)..] : telecomValue;
// }

// /// <summary>
// ///
// /// </summary>
// /// <param name="telecomNumber">Expects a 10-digit string but works with other input</param>
// /// <returns>A 2-element array containing area code and local number, if input was a 10-digit string.
// /// Otherwise, simply returns <c>telecomNumber</c> as the single element in the array</returns>
// public static string?[] SplitTelecomNumber(string telecomNumber)
// {
// var allDigitsRegex = new Regex("^[0-9]+$");
// if (telecomNumber != null && telecomNumber.Length == 10 && allDigitsRegex.IsMatch(telecomNumber))
// {
// return new string[] { telecomNumber[0..3], telecomNumber[3..] };
// }
// else
// {
// return new string[] { telecomNumber! };
// }
// }

// private string? ReadNodeData(string xPath, XmlNode documentRoot, string? messageId = null)
// {
// var node = documentRoot.SelectSingleNode(xPath, this.nsManager);
// if (node != null)
// {
// this.logger.LogDebug(node.InnerXml);
// return node.InnerXml;
// }
// else
// {
// this.logger.LogWarning($"{xPath} did not match anything in the message with ID '{messageId}'");
// return null;
// }
// }

// private string[]? ReadMultiNodeData(string xPath, XmlNode documentRoot, string? messageId = null)
// {
// var nodes = documentRoot.SelectNodes(xPath, this.nsManager)!;
// if (nodes.Count != 0)
// {
// var results = new List<string>();
// foreach (XmlNode node in nodes)
// {
// this.logger.LogDebug(node.InnerXml);
// results.Add(node.InnerXml);
// }
// return results.ToArray();
// }
// else
// {
// this.logger.LogWarning($"{xPath} did not match anything in the message with ID '{messageId}'");
// return null;
// }
// }

// private async Task<int> CreateOrUpdateRecordAsync(PlrRecord record, bool expectExists)
// {
// await this.TranslateIdentifierTypeAsync(record);

// var existingRecord = await this.context.PlrRecords
// .SingleOrDefaultAsync(rec => rec.Ipc == record.Ipc);

// if (existingRecord == null)
// {
// this.context.PlrRecords.Add(record);

// if (expectExists)
// {
// this.logger.LogWarning("Expected PLR Provider with IPC of {ipc} to exist but it cannot be found", record.Ipc);
// }
// }
// else
// {
// record.Id = existingRecord.Id;
// this.context.Entry(existingRecord).CurrentValues.SetValues(record);
// existingRecord.Credentials = record.Credentials;
// existingRecord.Expertise = record.Expertise;

// if (!expectExists)
// {
// this.logger.LogWarning("Did not expect PLR Provider with IPC of {ipc} to exist but it was found with ID of {id}", record.Ipc, existingRecord.Id);
// }
// }

// try
// {
// await this.context.SaveChangesAsync();
// }
// catch (Exception e)
// {
// this.logger.LogError(e, "Error updating PLR Provider with with IPC of {ipc}", record.Ipc);
// return -1;
// }

// return existingRecord == null
// ? record.Id
// : existingRecord.Id;
// }

// private async Task TranslateIdentifierTypeAsync(PlrRecord record)
// {
// var identifierType = await this.context.IdentifierTypes
// .SingleOrDefaultAsync(identifier => identifier.Oid == record.IdentifierType);

// if (identifierType != null)
// {
// // Translate from "2.16.840.1.113883.3.40.2.20" to "RNPID", for example
// record.IdentifierType = identifierType.Name;
// }
// else
// {
// this.logger.LogError("PLR Provider with IPC of {ipc} had an Identifier OID of {oid} that could not be translated", record.Ipc, record.IdentifierType);
// }
// }
// }
namespace PlrIntakeTests.Features.Intake;

using PlrIntake.Features.Intake;
using PlrIntake.Models;
using PlrIntakeTests.TestingExtensions;
using Xunit;


public class IntakeServiceTests : InMemoryDbTest
{
[Fact]
public async Task CreateOrUpdateRecordAsync_RecordDoesNotExist_AddsRecord()
{
// Arrange
var cpn = "CPN";
var record = new PlrRecord
{
Ipc = "IPC1",
Cpn = cpn,
IdentifierType = "CPSID",
CollegeId = "12345",
ProviderRoleType = "ProviderRoleType",
StatusCode = "StatusCode",
StatusStartDate = DateTime.Today,
StatusReasonCode = "StatusReasonCode"
};

var service = this.MockDependenciesFor<IntakeService>();

// Act
var result = await service.CreateOrUpdateRecordAsync(record, false);

// Assert
Assert.Equal(record.Id, result);
Assert.Single(this.TestDb.StatusChageLogs
.Where(log => log.PlrRecordId == record.Id && log.ShouldBeProcessed));
}

[Fact]
public async Task CreateOrUpdateRecordAsync_RecordExists_UpdatesRecord()
{
// Arrange
var cpn = "CPN";
var record = this.TestDb.Has(new PlrRecord
{
Ipc = "IPC1",
Cpn = cpn,
IdentifierType = "CPSID",
CollegeId = "12345",
ProviderRoleType = "ProviderRoleType",
StatusCode = "StatusCode",
StatusStartDate = DateTime.Today - TimeSpan.FromDays(7),
StatusReasonCode = "StatusReasonCode"
});

var newRecord = new PlrRecord
{
Ipc = "IPC1",
Cpn = cpn,
IdentifierType = "CPSID",
CollegeId = "12345",
ProviderRoleType = "ProviderRoleType",
StatusCode = "BadStatusCode",
StatusStartDate = DateTime.Today,
StatusReasonCode = "BadStatusReasonCode"
};

var service = this.MockDependenciesFor<IntakeService>();

// Act
var result = await service.CreateOrUpdateRecordAsync(newRecord, true);

// Assert
Assert.Equal(record.Id, result);
}

}
Loading

0 comments on commit ed18314

Please sign in to comment.