refactor: #1294: Move match prediction debug models to debug client m…

…odels namespace.
Anthony-Nolan · May 2, 2024 · 840107c · 840107c
1 parent f544488
commit 840107c
Show file tree

Hide file tree

Showing 41 changed files with 57 additions and 66 deletions.
diff --git a/...otypeFrequencySet/FrequencySetMetadata.cs → ...s/MatchPrediction/FrequencySetMetadata.cs b/...otypeFrequencySet/FrequencySetMetadata.cs → ...s/MatchPrediction/FrequencySetMetadata.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet
+namespace Atlas.Common.Public.Models.MatchPrediction
 {
     /// <summary>
     /// This is the data used to determine which frequency set to use, for both Donors and Patients.

diff --git a/...ction/Models/MatchPredictionParameters.cs → ...chPrediction/MatchPredictionParameters.cs b/...ction/Models/MatchPredictionParameters.cs → ...chPrediction/MatchPredictionParameters.cs
@@ -1,8 +1,7 @@
 using Atlas.Common.Public.Models.GeneticData;
-using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace Atlas.MatchPrediction.Models
+namespace Atlas.Common.Public.Models.MatchPrediction
 {
     /// <summary>
     /// Parameters controlling Match Prediction behaviour (in addition to <see cref="SubjectData"/>)
@@ -33,4 +32,4 @@ public MatchPredictionParameters(ISet<Locus> allowedLoci, string matchingAlgorit
             MatchingAlgorithmHlaNomenclatureVersion = matchingAlgorithmHlaNomenclatureVersion;
         }
     }
-}
+}
diff --git a/...Models/Debug/GenotypeImputationRequest.cs → ...chPrediction/GenotypeImputationRequest.cs b/...Models/Debug/GenotypeImputationRequest.cs → ...chPrediction/GenotypeImputationRequest.cs
@@ -1,13 +1,13 @@
-using Atlas.MatchPrediction.Models;
+using Atlas.Common.Public.Models.MatchPrediction;
 
-namespace Atlas.MatchPrediction.Functions.Models.Debug
+namespace Atlas.Debug.Client.Models.MatchPrediction
 {
     public class GenotypeImputationRequest
     {
         public SubjectInfo SubjectInfo { get; set; }
 
         /// <summary>
-        /// <inheritdoc cref="MatchPrediction.Models.MatchPredictionParameters"/>
+        /// <inheritdoc cref="Common.Public.Models.MatchPrediction.MatchPredictionParameters"/>
         /// </summary>
         public MatchPredictionParameters MatchPredictionParameters { get; set; }
     }

diff --git a/...odels/Debug/GenotypeImputationResponse.cs → ...hPrediction/GenotypeImputationResponse.cs b/...odels/Debug/GenotypeImputationResponse.cs → ...hPrediction/GenotypeImputationResponse.cs
@@ -1,7 +1,7 @@
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
-using Atlas.MatchPrediction.Models;
+using Atlas.Client.Models.Search.Results.MatchPrediction;
+using Atlas.Common.Public.Models.MatchPrediction;
 
-namespace Atlas.MatchPrediction.Functions.Models.Debug
+namespace Atlas.Debug.Client.Models.MatchPrediction
 {
     public class GenotypeImputationResponse
     {

diff --git a/...ns/Models/Debug/GenotypeMatcherRequest.cs → ...MatchPrediction/GenotypeMatcherRequest.cs b/...ns/Models/Debug/GenotypeMatcherRequest.cs → ...MatchPrediction/GenotypeMatcherRequest.cs
@@ -1,11 +1,11 @@
-using Atlas.MatchPrediction.Models;
+using Atlas.Common.Public.Models.MatchPrediction;
 
-namespace Atlas.MatchPrediction.Functions.Models.Debug
+namespace Atlas.Debug.Client.Models.MatchPrediction
 {
     public class GenotypeMatcherRequest
     {
         /// <summary>
-        /// <inheritdoc cref="MatchPrediction.Models.MatchPredictionParameters"/> 
+        /// <inheritdoc cref="Common.Public.Models.MatchPrediction.MatchPredictionParameters"/> 
         /// </summary>
         public MatchPredictionParameters MatchPredictionParameters { get; set; }
 

diff --git a/...s/Models/Debug/GenotypeMatcherResponse.cs → ...atchPrediction/GenotypeMatcherResponse.cs b/...s/Models/Debug/GenotypeMatcherResponse.cs → ...atchPrediction/GenotypeMatcherResponse.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
-using Atlas.MatchPrediction.Models;
+using Atlas.Client.Models.Search.Results.MatchPrediction;
+using Atlas.Common.Public.Models.MatchPrediction;
 
-namespace Atlas.MatchPrediction.Functions.Models.Debug
+namespace Atlas.Debug.Client.Models.MatchPrediction
 {
     public class GenotypeMatcherResponse
     {

diff --git a/...ion.Functions/Models/Debug/SubjectInfo.cs → ...ent.Models/MatchPrediction/SubjectInfo.cs b/...ion.Functions/Models/Debug/SubjectInfo.cs → ...ent.Models/MatchPrediction/SubjectInfo.cs
@@ -1,7 +1,7 @@
 using Atlas.Common.Public.Models.GeneticData.PhenotypeInfo.TransferModels;
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
+using Atlas.Common.Public.Models.MatchPrediction;
 
-namespace Atlas.MatchPrediction.Functions.Models.Debug
+namespace Atlas.Debug.Client.Models.MatchPrediction
 {
     public class SubjectInfo
     {

diff --git a/Atlas.Functions/Services/MatchPredictionInputBuilder.cs b/Atlas.Functions/Services/MatchPredictionInputBuilder.cs
@@ -7,9 +7,9 @@
 using Atlas.Common.ApplicationInsights.Timing;
 using Atlas.Common.Public.Models.GeneticData;
 using Atlas.Common.Public.Models.GeneticData.PhenotypeInfo.TransferModels;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.Functions.Settings;
 using Atlas.MatchPrediction.ExternalInterface;
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
 using Atlas.MatchPrediction.ExternalInterface.Models.MatchProbability;
 using EnumStringValues;
 using Microsoft.Extensions.Options;

diff --git a/Atlas.MatchPrediction.Functions/Functions/Debug/GenotypeImputationFunctions.cs b/Atlas.MatchPrediction.Functions/Functions/Debug/GenotypeImputationFunctions.cs
@@ -1,9 +1,9 @@
 using System.IO;
 using System.Threading.Tasks;
 using Atlas.Common.Public.Models.GeneticData.PhenotypeInfo.TransferModels;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.Common.Utils.Http;
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
-using Atlas.MatchPrediction.Functions.Models.Debug;
+using Atlas.Debug.Client.Models.MatchPrediction;
 using Atlas.MatchPrediction.Functions.Services.Debug;
 using Atlas.MatchPrediction.Models;
 using Atlas.MatchPrediction.Services.HaplotypeFrequencies;
@@ -13,7 +13,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Azure.WebJobs;
 using Microsoft.Azure.WebJobs.Extensions.Http;
-using MoreLinq;
 using Newtonsoft.Json;
 
 namespace Atlas.MatchPrediction.Functions.Functions.Debug
@@ -52,7 +51,7 @@ public class GenotypeImputationFunctions
             {
                 HlaTyping = input.SubjectInfo.HlaTyping.ToPhenotypeInfo().PrettyPrint(),
                 MatchPredictionParameters = input.MatchPredictionParameters,
-                HaplotypeFrequencySet = frequencySet,
+                HaplotypeFrequencySet = frequencySet.ToClientHaplotypeFrequencySet(),
                 GenotypeCount = imputedGenotypes.GenotypeLikelihoods.Count,
                 SumOfLikelihoods = imputedGenotypes.SumOfLikelihoods,
                 GenotypeLikelihoods = imputedGenotypes.GenotypeLikelihoods.ToSingleDelimitedString()

diff --git a/Atlas.MatchPrediction.Functions/Functions/Debug/GenotypeLikelihoodFunctions.cs b/Atlas.MatchPrediction.Functions/Functions/Debug/GenotypeLikelihoodFunctions.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using System.Threading.Tasks;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.Common.Utils.Http;
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
 using Atlas.MatchPrediction.ExternalInterface.Models.MatchPredictionSteps.GenotypeLikelihood;
 using Atlas.MatchPrediction.Services.GenotypeLikelihood;
 using Atlas.MatchPrediction.Services.HaplotypeFrequencies;

diff --git a/Atlas.MatchPrediction.Functions/Functions/Debug/MatchCalculationFunctions.cs b/Atlas.MatchPrediction.Functions/Functions/Debug/MatchCalculationFunctions.cs
@@ -2,8 +2,8 @@
 using System.Threading.Tasks;
 using Atlas.Common.Public.Models.GeneticData.PhenotypeInfo.TransferModels;
 using Atlas.Common.Utils.Http;
+using Atlas.Debug.Client.Models.MatchPrediction;
 using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
-using Atlas.MatchPrediction.Functions.Models.Debug;
 using Atlas.MatchPrediction.Functions.Services.Debug;
 using Atlas.MatchPrediction.Models;
 using Atlas.MatchPrediction.Services.HaplotypeFrequencies;
@@ -69,7 +69,7 @@ public class MatchCalculationFunctions
                 subjectResult.IsUnrepresented,
                 subjectResult.GenotypeCount,
                 subjectResult.SumOfLikelihoods,
-                set, 
+                set.ToClientHaplotypeFrequencySet(), 
                 subjectInfo.HlaTyping.ToPhenotypeInfo().PrettyPrint());
         }
 

diff --git a/Atlas.MatchPrediction.Functions/Functions/HaplotypeFrequencySetFunctions.cs b/Atlas.MatchPrediction.Functions/Functions/HaplotypeFrequencySetFunctions.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Atlas.Common.AzureEventGrid;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.MatchPrediction.ExternalInterface;
 using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
 using Atlas.MatchPrediction.Models;

diff --git a/...rationTests/MatchPrediction/IndividualSteps/GenotypeLikelihood/GenotypeLikelihoodTests.cs b/...rationTests/MatchPrediction/IndividualSteps/GenotypeLikelihood/GenotypeLikelihoodTests.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Atlas.Common.GeneticData;
 using Atlas.Common.Public.Models.GeneticData;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.Common.Test.SharedTestHelpers.Builders;
 using Atlas.MatchPrediction.Config;
 using Atlas.MatchPrediction.Data.Models;
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
 using Atlas.MatchPrediction.Services.GenotypeLikelihood;
 using Atlas.MatchPrediction.Services.HaplotypeFrequencies;
 using Atlas.MatchPrediction.Services.HaplotypeFrequencies.Import;

diff --git a/...ion/IndividualSteps/HaplotypeFrequencySetSelection/HaplotypeFrequencySetSelectionTests.cs b/...ion/IndividualSteps/HaplotypeFrequencySetSelection/HaplotypeFrequencySetSelectionTests.cs
@@ -6,6 +6,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 using System.Threading.Tasks;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.HlaMetadataDictionary.Test.IntegrationTests.TestHelpers.FileBackedStorageStubs;
 
 namespace Atlas.MatchPrediction.Test.Integration.IntegrationTests.MatchPrediction.IndividualSteps.HaplotypeFrequencySetSelection

diff --git a/...atchPrediction/IndividualSteps/PhenotypeExpansion/CompressedPhenotypeExpanderTestsBase.cs b/...atchPrediction/IndividualSteps/PhenotypeExpansion/CompressedPhenotypeExpanderTestsBase.cs
@@ -3,11 +3,11 @@
 using System.Threading.Tasks;
 using Atlas.Common.Public.Models.GeneticData;
 using Atlas.Common.Public.Models.GeneticData.PhenotypeInfo;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.Common.Test.SharedTestHelpers.Builders;
 using Atlas.HlaMetadataDictionary.Test.IntegrationTests.TestHelpers.FileBackedStorageStubs;
 using Atlas.MatchPrediction.Config;
 using Atlas.MatchPrediction.Data.Models;
-using Atlas.MatchPrediction.Models;
 using Atlas.MatchPrediction.Models.FileSchema;
 using Atlas.MatchPrediction.Services.CompressedPhenotypeExpansion;
 using Atlas.MatchPrediction.Test.Integration.Resources.Alleles;

diff --git a/...eps/PhenotypeExpansion/CompressedPhenotypeExpanderTestsWhereMatchingHlaVersionProvided.cs b/...eps/PhenotypeExpansion/CompressedPhenotypeExpanderTestsWhereMatchingHlaVersionProvided.cs
@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
 using Atlas.Common.Public.Models.GeneticData;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.Common.Test.SharedTestHelpers.Builders;
 using Atlas.HlaMetadataDictionary.Test.IntegrationTests.TestHelpers.FileBackedStorageStubs;
-using Atlas.MatchPrediction.Models;
 using Atlas.MatchPrediction.Services.CompressedPhenotypeExpansion;
 using Atlas.MatchPrediction.Test.Integration.Resources.Alleles;
 using FluentAssertions;

diff --git a/...s/PhenotypeExpansion/CompressedPhenotypeExpanderTestsWhereNoMatchingHlaVersionProvided.cs b/...s/PhenotypeExpansion/CompressedPhenotypeExpanderTestsWhereNoMatchingHlaVersionProvided.cs
@@ -1,12 +1,12 @@
 using System.Threading.Tasks;
 using Atlas.Common.Public.Models.GeneticData;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.Common.Test.SharedTestHelpers.Builders;
 using Atlas.MatchPrediction.Services.CompressedPhenotypeExpansion;
 using Atlas.MatchPrediction.Test.Integration.Resources.Alleles;
 using FluentAssertions;
 using NUnit.Framework;
 using static Atlas.MatchPrediction.Test.Integration.Resources.Alleles.Alleles;
-using Atlas.MatchPrediction.Models;
 
 namespace Atlas.MatchPrediction.Test.Integration.IntegrationTests.MatchPrediction.IndividualSteps.PhenotypeExpansion
 {

diff --git a/...ation/IntegrationTests/MatchPrediction/MatchProbability/HaplotypeFrequencySetSelection.cs b/...ation/IntegrationTests/MatchPrediction/MatchProbability/HaplotypeFrequencySetSelection.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Atlas.Common.GeneticData;
 using Atlas.Common.Public.Models.GeneticData;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.MatchPrediction.Data.Models;
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
 using Atlas.MatchPrediction.Test.Integration.Resources.Alleles;
 using Atlas.MatchPrediction.Test.TestHelpers.Builders.MatchProbabilityInputs;
 using FluentAssertions;

diff --git a/...st.Integration/IntegrationTests/MatchPrediction/MatchProbability/MatchProbabilityTests.cs b/...st.Integration/IntegrationTests/MatchPrediction/MatchProbability/MatchProbabilityTests.cs
@@ -1,14 +1,12 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Atlas.Common.GeneticData;
-using Atlas.Common.GeneticData.PhenotypeInfo;
 using Atlas.Common.Public.Models.GeneticData;
 using Atlas.Common.Public.Models.GeneticData.PhenotypeInfo;
 using Atlas.Common.Public.Models.GeneticData.PhenotypeInfo.TransferModels;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.Common.Test.SharedTestHelpers.Builders;
 using Atlas.Common.Utils.Extensions;
 using Atlas.MatchPrediction.Data.Models;
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
 using Atlas.MatchPrediction.ExternalInterface.Models.MatchProbability;
 using Atlas.MatchPrediction.Test.Integration.Resources.Alleles;
 using Atlas.MatchPrediction.Test.TestHelpers.Builders;

diff --git a/...ntegration/IntegrationTests/MatchPrediction/MatchProbability/MatchProbabilityTestsBase.cs b/...ntegration/IntegrationTests/MatchPrediction/MatchProbability/MatchProbabilityTestsBase.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Atlas.Common.Public.Models.GeneticData.PhenotypeInfo;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.Common.Test.SharedTestHelpers.Builders;
 using Atlas.HlaMetadataDictionary.Test.IntegrationTests.TestHelpers.FileBackedStorageStubs;
 using Atlas.MatchPrediction.Data.Models;
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
 using Atlas.MatchPrediction.ExternalInterface.Models.MatchProbability;
 using Atlas.MatchPrediction.Models.FileSchema;
 using Atlas.MatchPrediction.Services.MatchProbability;

diff --git a/...st.Integration/IntegrationTests/MatchPrediction/MatchProbability/PerformanceBenchmarks.cs b/...st.Integration/IntegrationTests/MatchPrediction/MatchProbability/PerformanceBenchmarks.cs
@@ -1,10 +1,9 @@
 using System.Reflection;
 using System.Threading.Tasks;
-using Atlas.Common.GeneticData;
 using Atlas.Common.Public.Models.GeneticData;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.Common.Test.SharedTestHelpers;
 using Atlas.Common.Test.SharedTestHelpers.Builders;
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
 using Atlas.MatchPrediction.ExternalInterface.Models.MatchProbability;
 using Atlas.MatchPrediction.Services.HaplotypeFrequencies;
 using Atlas.MatchPrediction.Services.HaplotypeFrequencies.Import;

diff --git a/...chPrediction.Test.Integration/IntegrationTests/MatchPrediction/Snapshots/FrequencySets.cs b/...chPrediction.Test.Integration/IntegrationTests/MatchPrediction/Snapshots/FrequencySets.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.MatchPrediction.Test.Integration.TestHelpers;
 using Atlas.MatchPrediction.Test.TestHelpers.Builders.MatchProbabilityInputs;
 using NUnit.Framework;

diff --git a/...tion.Test.Integration/IntegrationTests/MatchPrediction/Snapshots/SmallGGroupHaplotypes.cs b/...tion.Test.Integration/IntegrationTests/MatchPrediction/Snapshots/SmallGGroupHaplotypes.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.MatchPrediction.Test.Integration.TestHelpers;
 using Atlas.MatchPrediction.Test.TestHelpers.Builders.MatchProbabilityInputs;
 using NUnit.Framework;

diff --git a/...ediction.Test.Integration/IntegrationTests/MatchPrediction/Snapshots/SnapshotTestsBase.cs b/...ediction.Test.Integration/IntegrationTests/MatchPrediction/Snapshots/SnapshotTestsBase.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 using System.Reflection;
 using System.Threading.Tasks;
-using Atlas.Common.GeneticData;
 using Atlas.Common.Public.Models.GeneticData;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.Common.Test.SharedTestHelpers;
 using Atlas.Common.Test.SharedTestHelpers.Builders;
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
 using Atlas.MatchPrediction.ExternalInterface.Models.MatchProbability;
 using Atlas.MatchPrediction.Services.HaplotypeFrequencies;
 using Atlas.MatchPrediction.Services.HaplotypeFrequencies.Import;

diff --git a/Atlas.MatchPrediction.Test.Integration/TestHelpers/HaplotypeFrequencyImporter.cs b/Atlas.MatchPrediction.Test.Integration/TestHelpers/HaplotypeFrequencyImporter.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.MatchPrediction.Data.Models;
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
 using Atlas.MatchPrediction.Models.FileSchema;
 using Atlas.MatchPrediction.Services.HaplotypeFrequencies;
 using Atlas.MatchPrediction.Services.HaplotypeFrequencies.Import;

diff --git a/Atlas.MatchPrediction.Test.Validation/Services/Exercise3/MatchPredictionRequester.cs b/Atlas.MatchPrediction.Test.Validation/Services/Exercise3/MatchPredictionRequester.cs
@@ -1,7 +1,6 @@
 using Atlas.Common.Public.Models.GeneticData;
 using Atlas.Common.Public.Models.GeneticData.PhenotypeInfo.TransferModels;
 using Atlas.MatchPrediction.ExternalInterface.Models;
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
 using Atlas.MatchPrediction.Test.Validation.Data.Models;
 using Atlas.MatchPrediction.Test.Validation.Data.Repositories;
 using Atlas.MatchPrediction.Test.Validation.Models;
@@ -14,6 +13,7 @@
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Atlas.Common.Public.Models.MatchPrediction;
 using MatchPredictionRequest = Atlas.MatchPrediction.Test.Validation.Data.Models.MatchPredictionRequest;
 
 namespace Atlas.MatchPrediction.Test.Validation.Services.Exercise3

diff --git a/Atlas.MatchPrediction.Test/Services/MatchProbability/GenotypeMatcherTests.cs b/Atlas.MatchPrediction.Test/Services/MatchProbability/GenotypeMatcherTests.cs
@@ -13,6 +13,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Atlas.Common.Public.Models.MatchPrediction;
 
 namespace Atlas.MatchPrediction.Test.Services.MatchProbability
 {

diff --git a/Atlas.MatchPrediction.Test/TestHelpers/Builders/FrequencySetMetadataBuilder.cs b/Atlas.MatchPrediction.Test/TestHelpers/Builders/FrequencySetMetadataBuilder.cs
@@ -1,4 +1,4 @@
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
+using Atlas.Common.Public.Models.MatchPrediction;
 using LochNessBuilder;
 
 namespace Atlas.MatchPrediction.Test.TestHelpers.Builders

diff --git a/Atlas.MatchPrediction.Test/TestHelpers/Builders/MatchProbabilityInputs/DonorInputBuilder.cs b/Atlas.MatchPrediction.Test/TestHelpers/Builders/MatchProbabilityInputs/DonorInputBuilder.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
-using Atlas.Common.GeneticData.PhenotypeInfo;
 using Atlas.Common.Public.Models.GeneticData.PhenotypeInfo;
 using Atlas.Common.Public.Models.GeneticData.PhenotypeInfo.TransferModels;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.Common.Test.SharedTestHelpers;
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
 using Builder = LochNessBuilder.Builder<Atlas.MatchPrediction.ExternalInterface.Models.MatchProbability.DonorInput>;
 
 namespace Atlas.MatchPrediction.Test.TestHelpers.Builders.MatchProbabilityInputs

diff --git a/...n.Test/TestHelpers/Builders/MatchProbabilityInputs/MatchProbabilityRequestInputBuilder.cs b/...n.Test/TestHelpers/Builders/MatchProbabilityInputs/MatchProbabilityRequestInputBuilder.cs
@@ -1,9 +1,7 @@
-using Atlas.Common.GeneticData;
-using Atlas.Common.GeneticData.PhenotypeInfo;
 using Atlas.Common.Public.Models.GeneticData;
 using Atlas.Common.Public.Models.GeneticData.PhenotypeInfo;
 using Atlas.Common.Public.Models.GeneticData.PhenotypeInfo.TransferModels;
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
+using Atlas.Common.Public.Models.MatchPrediction;
 using LochNessBuilder;
 using Builder = LochNessBuilder.Builder<Atlas.MatchPrediction.ExternalInterface.Models.MatchProbability.IdentifiedMatchProbabilityRequest>;
 

diff --git a/...st/TestHelpers/Builders/MatchProbabilityInputs/SingleDonorMatchProbabilityInputBuilder.cs b/...st/TestHelpers/Builders/MatchProbabilityInputs/SingleDonorMatchProbabilityInputBuilder.cs
@@ -1,9 +1,7 @@
-using Atlas.Common.GeneticData;
-using Atlas.Common.GeneticData.PhenotypeInfo;
 using Atlas.Common.Public.Models.GeneticData;
 using Atlas.Common.Public.Models.GeneticData.PhenotypeInfo;
 using Atlas.Common.Public.Models.GeneticData.PhenotypeInfo.TransferModels;
-using Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet;
+using Atlas.Common.Public.Models.MatchPrediction;
 using Atlas.MatchPrediction.ExternalInterface.Models.MatchProbability;
 using LochNessBuilder;
 using Builder = LochNessBuilder.Builder<Atlas.MatchPrediction.ExternalInterface.Models.MatchProbability.SingleDonorMatchProbabilityInput>;

diff --git a/...s.MatchPrediction/ExternalInterface/Models/HaplotypeFrequencySet/HaplotypeFrequencySet.cs b/...s.MatchPrediction/ExternalInterface/Models/HaplotypeFrequencySet/HaplotypeFrequencySet.cs
@@ -9,7 +9,7 @@ public class HaplotypeFrequencySet
         public string Name { get; set; }
         public int PopulationId { get; set; }
 
-        internal Client.Models.Search.Results.MatchPrediction.HaplotypeFrequencySet ToClientHaplotypeFrequencySet()
+        public Client.Models.Search.Results.MatchPrediction.HaplotypeFrequencySet ToClientHaplotypeFrequencySet()
         {
             return new Client.Models.Search.Results.MatchPrediction.HaplotypeFrequencySet
             {

diff --git a/...chPrediction/ExternalInterface/Models/HaplotypeFrequencySet/HaplotypeFrequencySetInput.cs b/...chPrediction/ExternalInterface/Models/HaplotypeFrequencySet/HaplotypeFrequencySetInput.cs
@@ -1,4 +1,6 @@
-namespace Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet
+using Atlas.Common.Public.Models.MatchPrediction;
+
+namespace Atlas.MatchPrediction.ExternalInterface.Models.HaplotypeFrequencySet
 {
     public class HaplotypeFrequencySetInput
     {