diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/Assembly.cs b/src/API/WesternStatesWater.WestDaat.Accessors/Assembly.cs index 5210ec74..a6405796 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/Assembly.cs +++ b/src/API/WesternStatesWater.WestDaat.Accessors/Assembly.cs @@ -2,6 +2,7 @@ global using System.Collections.Generic; global using System.Linq; global using System.Threading.Tasks; +global using EF = WesternStatesWater.WestDaat.Database.EntityFramework; using System.Resources; [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("WesternStatesWater.WestDaat.Tests.AccessorTests")] diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/IDatabaseContextFactory.cs b/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/IDatabaseContextFactory.cs deleted file mode 100644 index 1a86a827..00000000 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/IDatabaseContextFactory.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework -{ - internal interface IDatabaseContextFactory - { - public DatabaseContext Create(); - } -} diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/Extensions/EntityExtensions.cs b/src/API/WesternStatesWater.WestDaat.Accessors/Extensions/EntityExtensions.cs index 690adf3b..c60a5c3f 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/Extensions/EntityExtensions.cs +++ b/src/API/WesternStatesWater.WestDaat.Accessors/Extensions/EntityExtensions.cs @@ -1,11 +1,10 @@ using Microsoft.EntityFrameworkCore; -using WesternStatesWater.WestDaat.Accessors.EntityFramework; namespace WesternStatesWater.WestDaat.Accessors.Extensions; public static class EntityExtensions { - public static Task GetControlledVocabularyNames(this DbSet table) where TCv : ControlledVocabularyBase + public static Task GetControlledVocabularyNames(this DbSet table) where TCv : EF.ControlledVocabularyBase { return table .AsNoTracking() diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/Mapping/ApiProfile.cs b/src/API/WesternStatesWater.WestDaat.Accessors/Mapping/ApiProfile.cs index 524e46f7..b34b791e 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/Mapping/ApiProfile.cs +++ b/src/API/WesternStatesWater.WestDaat.Accessors/Mapping/ApiProfile.cs @@ -1,8 +1,6 @@ using AutoMapper; using System.Runtime.CompilerServices; -using WesternStatesWater.WestDaat.Accessors.EntityFramework; using WesternStatesWater.WestDaat.Common.DataContracts; -using EF = WesternStatesWater.WestDaat.Accessors.EntityFramework; [assembly: InternalsVisibleTo("WesternStatesWater.WestDaat.Tests.AccessorTests")] @@ -136,7 +134,7 @@ public ApiProfile() .ForMember(dest => dest.WaDEDataMappingProcessUrl, opt => opt.MapFrom(source => source.WaDEDataMappingUrl)) .ForMember(dest => dest.MethodDescription, opt => opt.MapFrom(source => source.MethodDescription)); - CreateMap() + CreateMap() .ForMember(dest => dest.WaDEOverlayUuid, opt => opt.MapFrom(source => source.RegulatoryOverlayUuid)) .ForMember(dest => dest.OverlayNativeID, opt => opt.MapFrom(source => source.RegulatoryOverlayNativeId)) .ForMember(dest => dest.OverlayName, opt => opt.MapFrom(source => source.RegulatoryName)) diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/Mapping/CsvProfile.cs b/src/API/WesternStatesWater.WestDaat.Accessors/Mapping/CsvProfile.cs index 8f5ee230..03f24464 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/Mapping/CsvProfile.cs +++ b/src/API/WesternStatesWater.WestDaat.Accessors/Mapping/CsvProfile.cs @@ -1,7 +1,6 @@ using AutoMapper; using System.Runtime.CompilerServices; using WesternStatesWater.WestDaat.Accessors.CsvModels; -using EF = WesternStatesWater.WestDaat.Accessors.EntityFramework; [assembly: InternalsVisibleTo("WesternStatesWater.WestDaat.Tests.AccessorTests")] diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/SiteAccessor.cs b/src/API/WesternStatesWater.WestDaat.Accessors/SiteAccessor.cs index a1c25f78..7cba9775 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/SiteAccessor.cs +++ b/src/API/WesternStatesWater.WestDaat.Accessors/SiteAccessor.cs @@ -1,7 +1,6 @@ using AutoMapper.QueryableExtensions; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using WesternStatesWater.WestDaat.Accessors.EntityFramework; using WesternStatesWater.WestDaat.Accessors.Mapping; using WesternStatesWater.WestDaat.Common.DataContracts; @@ -9,12 +8,12 @@ namespace WesternStatesWater.WestDaat.Accessors { internal class SiteAccessor : AccessorBase, ISiteAccessor { - public SiteAccessor(ILogger logger, IDatabaseContextFactory databaseContextFactory) : base(logger) + public SiteAccessor(ILogger logger, EF.IDatabaseContextFactory databaseContextFactory) : base(logger) { _databaseContextFactory = databaseContextFactory; } - private readonly IDatabaseContextFactory _databaseContextFactory; + private readonly EF.IDatabaseContextFactory _databaseContextFactory; async Task ISiteAccessor.GetSiteByUuid(string siteUuid) { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/SystemAccessor.cs b/src/API/WesternStatesWater.WestDaat.Accessors/SystemAccessor.cs index 769a4bd6..a18ed7f4 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/SystemAccessor.cs +++ b/src/API/WesternStatesWater.WestDaat.Accessors/SystemAccessor.cs @@ -1,19 +1,19 @@ using AutoMapper.QueryableExtensions; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using WesternStatesWater.WestDaat.Accessors.EntityFramework; using WesternStatesWater.WestDaat.Accessors.Extensions; using WesternStatesWater.WestDaat.Accessors.Mapping; using WesternStatesWater.WestDaat.Common.Constants; using WesternStatesWater.WestDaat.Common.DataContracts; +using WesternStatesWater.WestDaat.Database.EntityFramework.partials; namespace WesternStatesWater.WestDaat.Accessors { internal class SystemAccessor : AccessorBase, ISystemAccessor { - private readonly IDatabaseContextFactory _databaseContextFactory; + private readonly EF.IDatabaseContextFactory _databaseContextFactory; - public SystemAccessor(ILogger logger, IDatabaseContextFactory databaseContextFactory) + public SystemAccessor(ILogger logger, EF.IDatabaseContextFactory databaseContextFactory) : base(logger) { _databaseContextFactory = databaseContextFactory; diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/TestAccessor.cs b/src/API/WesternStatesWater.WestDaat.Accessors/TestAccessor.cs index d7f2c5ee..0a849370 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/TestAccessor.cs +++ b/src/API/WesternStatesWater.WestDaat.Accessors/TestAccessor.cs @@ -1,17 +1,16 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using WesternStatesWater.WestDaat.Accessors.EntityFramework; namespace WesternStatesWater.WestDaat.Accessors { internal class TestAccessor : AccessorBase, ITestAccessor { - public TestAccessor(ILogger logger, IDatabaseContextFactory databaseContextFactory) : base(logger) + public TestAccessor(ILogger logger, EF.IDatabaseContextFactory databaseContextFactory) : base(logger) { _databaseContextFactory = databaseContextFactory; } - private readonly IDatabaseContextFactory _databaseContextFactory; + private readonly EF.IDatabaseContextFactory _databaseContextFactory; public override string TestMe(string input) { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/WaterAllocationAccessor.cs b/src/API/WesternStatesWater.WestDaat.Accessors/WaterAllocationAccessor.cs index ede044a9..08c1b826 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/WaterAllocationAccessor.cs +++ b/src/API/WesternStatesWater.WestDaat.Accessors/WaterAllocationAccessor.cs @@ -8,11 +8,11 @@ using System.Transactions; using NetTopologySuite.Geometries.Utilities; using WesternStatesWater.WestDaat.Accessors.CsvModels; -using WesternStatesWater.WestDaat.Accessors.EntityFramework; using WesternStatesWater.WestDaat.Accessors.Extensions; using WesternStatesWater.WestDaat.Accessors.Mapping; using WesternStatesWater.WestDaat.Common.Configuration; using WesternStatesWater.WestDaat.Common.DataContracts; +using WesternStatesWater.WestDaat.Database.EntityFramework.partials; using WesternStatesWater.WestDaat.Utilities; namespace WesternStatesWater.WestDaat.Accessors @@ -21,13 +21,13 @@ internal class WaterAllocationAccessor : AccessorBase, IWaterAllocationAccessor { private readonly PerformanceConfiguration _performanceConfiguration; - public WaterAllocationAccessor(ILogger logger, IDatabaseContextFactory databaseContextFactory, PerformanceConfiguration performanceConfiguration) : base(logger) + public WaterAllocationAccessor(ILogger logger, EF.IDatabaseContextFactory databaseContextFactory, PerformanceConfiguration performanceConfiguration) : base(logger) { _databaseContextFactory = databaseContextFactory; _performanceConfiguration = performanceConfiguration; } - private readonly IDatabaseContextFactory _databaseContextFactory; + private readonly EF.IDatabaseContextFactory _databaseContextFactory; public async Task GetAnalyticsSummaryInformation(WaterRightsSearchCriteria searchCriteria) { @@ -117,9 +117,9 @@ public async Task FindWaterRights(WaterRightsSearchCri }; } - private static ExpressionStarter BuildWaterRightsSearchPredicate(WaterRightsSearchCriteria searchCriteria, DatabaseContext db) + private static ExpressionStarter BuildWaterRightsSearchPredicate(WaterRightsSearchCriteria searchCriteria, DatabaseContext db) { - var predicate = PredicateBuilder.New(); + var predicate = PredicateBuilder.New(); predicate.And(BuildBeneficialUsesPredicate(searchCriteria)); @@ -138,117 +138,117 @@ private static ExpressionStarter BuildWaterRightsSearchPr return predicate; } - private static ExpressionStarter BuildFromSiteUuids(WaterRightsSearchCriteria searchCriteria, DatabaseContext db) + private static ExpressionStarter BuildFromSiteUuids(WaterRightsSearchCriteria searchCriteria, DatabaseContext db) { - var predicate = PredicateBuilder.New(true); + var predicate = PredicateBuilder.New(true); if (searchCriteria?.WadeSitesUuids != null && searchCriteria.WadeSitesUuids.Any()) { db.Database.ExecuteSqlRaw(Scripts.Scripts.CreateTempUuidTable); - db.BulkInsert(searchCriteria.WadeSitesUuids.Select(a => new TempUuid { Uuid = a }).ToList()); + db.BulkInsert(searchCriteria.WadeSitesUuids.Select(a => new EF.TempUuid { Uuid = a }).ToList()); db.Database.ExecuteSqlRaw(Scripts.Scripts.CreateTempIdTable); db.Database.ExecuteSqlRaw(Scripts.Scripts.FindSiteIdsFromUuids); - predicate = predicate.And(AllocationAmountsFact.HasSitesUuids(db)); + predicate = predicate.And(EF.AllocationAmountsFact.HasSitesUuids(db)); } return predicate; } - private static ExpressionStarter BuildBeneficialUsesPredicate(WaterRightsSearchCriteria searchCriteria) + private static ExpressionStarter BuildBeneficialUsesPredicate(WaterRightsSearchCriteria searchCriteria) { - var predicate = PredicateBuilder.New(true); + var predicate = PredicateBuilder.New(true); if (searchCriteria?.BeneficialUses != null && searchCriteria.BeneficialUses.Any()) { - predicate = predicate.And(AllocationAmountsFact.HasBeneficialUses(searchCriteria.BeneficialUses.ToList())); + predicate = predicate.And(EF.AllocationAmountsFact.HasBeneficialUses(searchCriteria.BeneficialUses.ToList())); } return predicate; } - private static ExpressionStarter BuildDatePredicate(WaterRightsSearchCriteria searchCriteria) + private static ExpressionStarter BuildDatePredicate(WaterRightsSearchCriteria searchCriteria) { - var predicate = PredicateBuilder.New(true); + var predicate = PredicateBuilder.New(true); if (searchCriteria?.MinimumPriorityDate != null || searchCriteria?.MaximumPriorityDate != null) { - predicate.And(AllocationAmountsFact.HasPriorityDateRange(searchCriteria.MinimumPriorityDate, searchCriteria.MaximumPriorityDate)); + predicate.And(EF.AllocationAmountsFact.HasPriorityDateRange(searchCriteria.MinimumPriorityDate, searchCriteria.MaximumPriorityDate)); } return predicate; } - private static ExpressionStarter BuildVolumeAndFlowPredicate(WaterRightsSearchCriteria searchCriteria) + private static ExpressionStarter BuildVolumeAndFlowPredicate(WaterRightsSearchCriteria searchCriteria) { - var predicate = PredicateBuilder.New(true); + var predicate = PredicateBuilder.New(true); if (searchCriteria?.ExemptOfVolumeFlowPriority != null) { - predicate.And(AllocationAmountsFact.IsExemptOfVolumeFlowPriority(searchCriteria.ExemptOfVolumeFlowPriority.Value)); + predicate.And(EF.AllocationAmountsFact.IsExemptOfVolumeFlowPriority(searchCriteria.ExemptOfVolumeFlowPriority.Value)); } if (searchCriteria?.MinimumFlow != null || searchCriteria?.MaximumFlow != null) { - predicate.And(AllocationAmountsFact.HasFlowRateRange(searchCriteria.MinimumFlow, searchCriteria.MaximumFlow)); + predicate.And(EF.AllocationAmountsFact.HasFlowRateRange(searchCriteria.MinimumFlow, searchCriteria.MaximumFlow)); } if (searchCriteria?.MinimumVolume != null || searchCriteria?.MaximumVolume != null) { - predicate.And(AllocationAmountsFact.HasVolumeRange(searchCriteria.MinimumVolume, searchCriteria.MaximumVolume)); + predicate.And(EF.AllocationAmountsFact.HasVolumeRange(searchCriteria.MinimumVolume, searchCriteria.MaximumVolume)); } return predicate; } - private static ExpressionStarter BuildOwnerSearchPredicate(WaterRightsSearchCriteria searchCriteria) + private static ExpressionStarter BuildOwnerSearchPredicate(WaterRightsSearchCriteria searchCriteria) { - var predicate = PredicateBuilder.New(true); + var predicate = PredicateBuilder.New(true); if (searchCriteria?.OwnerClassifications != null && searchCriteria.OwnerClassifications.Any()) { - predicate.And(AllocationAmountsFact.HasOwnerClassification(searchCriteria.OwnerClassifications.ToList())); + predicate.And(EF.AllocationAmountsFact.HasOwnerClassification(searchCriteria.OwnerClassifications.ToList())); } if (!string.IsNullOrWhiteSpace(searchCriteria?.AllocationOwner)) { - predicate.And(AllocationAmountsFact.HasAllocationOwner(searchCriteria.AllocationOwner)); + predicate.And(EF.AllocationAmountsFact.HasAllocationOwner(searchCriteria.AllocationOwner)); } return predicate; } - private static ExpressionStarter BuildSiteDetailsPredicate(WaterRightsSearchCriteria searchCriteria) + private static ExpressionStarter BuildSiteDetailsPredicate(WaterRightsSearchCriteria searchCriteria) { - var predicate = PredicateBuilder.New(true); + var predicate = PredicateBuilder.New(true); if (searchCriteria?.WaterSourceTypes != null && searchCriteria.WaterSourceTypes.Any()) { - predicate.And(AllocationAmountsFact.HasWaterSourceTypes(searchCriteria.WaterSourceTypes.ToList())); + predicate.And(EF.AllocationAmountsFact.HasWaterSourceTypes(searchCriteria.WaterSourceTypes.ToList())); } if (searchCriteria?.States != null && searchCriteria.States.Any()) { - predicate.And(AllocationAmountsFact.HasOrganizationStates(searchCriteria.States.ToList())); + predicate.And(EF.AllocationAmountsFact.HasOrganizationStates(searchCriteria.States.ToList())); } if (!string.IsNullOrWhiteSpace(searchCriteria?.PodOrPou)) { - predicate.And(AllocationAmountsFact.IsPodOrPou(searchCriteria.PodOrPou)); + predicate.And(EF.AllocationAmountsFact.IsPodOrPou(searchCriteria.PodOrPou)); } return predicate; } - private static ExpressionStarter BuildGeometrySearchPredicate(WaterRightsSearchCriteria searchCriteria) + private static ExpressionStarter BuildGeometrySearchPredicate(WaterRightsSearchCriteria searchCriteria) { - var predicate = PredicateBuilder.New(true); + var predicate = PredicateBuilder.New(true); if (searchCriteria?.FilterGeometry != null) { - predicate.And(AllocationAmountsFact.IsWithinGeometry(searchCriteria.FilterGeometry)); + predicate.And(EF.AllocationAmountsFact.IsWithinGeometry(searchCriteria.FilterGeometry)); } return predicate; @@ -470,7 +470,7 @@ internal IEnumerable GetVariables(WaterRightsSearchCriteria searchCri .AsEnumerable(); } - private (DatabaseContext DB, IQueryable AllocationAmounts) GetFilteredWaterAllocations(WaterRightsSearchCriteria searchCriteria) + private (DatabaseContext DB, IQueryable AllocationAmounts) GetFilteredWaterAllocations(WaterRightsSearchCriteria searchCriteria) { var db = _databaseContextFactory.Create(); @@ -486,7 +486,7 @@ internal IEnumerable GetVariables(WaterRightsSearchCriteria searchCri return (db, waterRightDetails); } - private (DatabaseContext DB, IQueryable FilteredSites) GetFilteredSites(WaterRightsSearchCriteria searchCriteria) + private (DatabaseContext DB, IQueryable FilteredSites) GetFilteredSites(WaterRightsSearchCriteria searchCriteria) { var (db, waterRightDetails) = GetFilteredWaterAllocations(searchCriteria); diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/WesternStatesWater.WestDaat.Accessors.csproj b/src/API/WesternStatesWater.WestDaat.Accessors/WesternStatesWater.WestDaat.Accessors.csproj index 7e3bbe94..94ca96d3 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/WesternStatesWater.WestDaat.Accessors.csproj +++ b/src/API/WesternStatesWater.WestDaat.Accessors/WesternStatesWater.WestDaat.Accessors.csproj @@ -37,11 +37,9 @@ + - - - True diff --git a/src/API/WesternStatesWater.WestDaat.Client.Functions/Program.cs b/src/API/WesternStatesWater.WestDaat.Client.Functions/Program.cs index a3956217..bb9aa0ed 100644 --- a/src/API/WesternStatesWater.WestDaat.Client.Functions/Program.cs +++ b/src/API/WesternStatesWater.WestDaat.Client.Functions/Program.cs @@ -4,11 +4,11 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using WesternStatesWater.WestDaat.Accessors; -using WesternStatesWater.WestDaat.Accessors.EntityFramework; using WesternStatesWater.WestDaat.Client.Functions; using WesternStatesWater.WestDaat.Common.Configuration; using WesternStatesWater.WestDaat.Managers; using WesternStatesWater.WestDaat.Contracts.Client; +using WesternStatesWater.WestDaat.Database.EntityFramework; using WesternStatesWater.WestDaat.Engines; using WesternStatesWater.WestDaat.Utilities; @@ -60,9 +60,10 @@ services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); - services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AggBridgeBeneficialUsesFact.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AggBridgeBeneficialUsesFact.cs similarity index 84% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AggBridgeBeneficialUsesFact.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AggBridgeBeneficialUsesFact.cs index 8df73821..f8a49f4c 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AggBridgeBeneficialUsesFact.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AggBridgeBeneficialUsesFact.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class AggBridgeBeneficialUsesFact { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AggregatedAmountsFact.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AggregatedAmountsFact.cs similarity index 97% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AggregatedAmountsFact.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AggregatedAmountsFact.cs index 4f64ce1d..c440ee4a 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AggregatedAmountsFact.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AggregatedAmountsFact.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class AggregatedAmountsFact { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AggregationStatistic.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AggregationStatistic.cs similarity index 81% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AggregationStatistic.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AggregationStatistic.cs index 48a42f43..3ad36d3c 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AggregationStatistic.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AggregationStatistic.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class AggregationStatistic : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AllocationAmountsFact.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AllocationAmountsFact.cs similarity index 98% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AllocationAmountsFact.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AllocationAmountsFact.cs index 4f0bcea9..4d4f76bc 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AllocationAmountsFact.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AllocationAmountsFact.cs @@ -1,9 +1,10 @@ -using LinqKit; +using System.ComponentModel.DataAnnotations; +using LinqKit; using NetTopologySuite.Geometries; using NetTopologySuite.Geometries.Utilities; -using System.ComponentModel.DataAnnotations; +using WesternStatesWater.WestDaat.Database.EntityFramework.partials; -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class AllocationAmountsFact { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AllocationAmountsView.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AllocationAmountsView.cs similarity index 94% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AllocationAmountsView.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AllocationAmountsView.cs index d1f78c8a..06b652ac 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AllocationAmountsView.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AllocationAmountsView.cs @@ -1,6 +1,6 @@ using NetTopologySuite.Geometries; -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework; +namespace WesternStatesWater.WestDaat.Database.EntityFramework; public class AllocationAmountsView { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AllocationBridgeBeneficialUsesFact.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AllocationBridgeBeneficialUsesFact.cs similarity index 84% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AllocationBridgeBeneficialUsesFact.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AllocationBridgeBeneficialUsesFact.cs index 0548e0d5..ef337755 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AllocationBridgeBeneficialUsesFact.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AllocationBridgeBeneficialUsesFact.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class AllocationBridgeBeneficialUsesFact { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AllocationBridgeSitesFact.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AllocationBridgeSitesFact.cs similarity index 84% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AllocationBridgeSitesFact.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AllocationBridgeSitesFact.cs index f22ba90e..0ebae8ec 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/AllocationBridgeSitesFact.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/AllocationBridgeSitesFact.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class AllocationBridgeSitesFact { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ApplicableResourceType.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ApplicableResourceType.cs similarity index 80% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ApplicableResourceType.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ApplicableResourceType.cs index 83b5732d..023b1fbd 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ApplicableResourceType.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ApplicableResourceType.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class ApplicableResourceType : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/BeneficialUsesCV.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/BeneficialUsesCV.cs similarity index 95% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/BeneficialUsesCV.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/BeneficialUsesCV.cs index 8360c7bb..26b83a0d 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/BeneficialUsesCV.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/BeneficialUsesCV.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class BeneficialUsesCV : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ControlledVocabularyBase.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ControlledVocabularyBase.cs similarity index 82% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ControlledVocabularyBase.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ControlledVocabularyBase.cs index f0603996..bde71a41 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ControlledVocabularyBase.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ControlledVocabularyBase.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework; +namespace WesternStatesWater.WestDaat.Database.EntityFramework; public abstract class ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/CoordinateMethod.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/CoordinateMethod.cs similarity index 79% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/CoordinateMethod.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/CoordinateMethod.cs index 24b307d7..71a51269 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/CoordinateMethod.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/CoordinateMethod.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class CoordinateMethod : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/CropType.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/CropType.cs similarity index 90% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/CropType.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/CropType.cs index c5e88239..ac848a2c 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/CropType.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/CropType.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class CropType : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/CustomerType.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/CustomerType.cs similarity index 90% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/CustomerType.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/CustomerType.cs index f51d97dc..53b6eab6 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/CustomerType.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/CustomerType.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class CustomerType : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/DataQualityValue.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/DataQualityValue.cs similarity index 79% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/DataQualityValue.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/DataQualityValue.cs index 4c4baba8..1850da72 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/DataQualityValue.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/DataQualityValue.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class DataQualityValue : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/DatabaseContextFactory.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/DatabaseContextFactory.cs similarity index 67% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/DatabaseContextFactory.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/DatabaseContextFactory.cs index 6f3d03e1..a4f642e9 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/DatabaseContextFactory.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/DatabaseContextFactory.cs @@ -1,8 +1,9 @@ using WesternStatesWater.WestDaat.Common.Configuration; +using WesternStatesWater.WestDaat.Database.EntityFramework.partials; -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { - internal class DatabaseContextFactory : IDatabaseContextFactory + public class DatabaseContextFactory : IDatabaseContextFactory { public DatabaseContextFactory(DatabaseConfiguration configuration) { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/DateDim.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/DateDim.cs similarity index 97% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/DateDim.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/DateDim.cs index 000ea83c..5250c33b 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/DateDim.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/DateDim.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class DateDim { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/Epsgcode.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/Epsgcode.cs similarity index 85% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/Epsgcode.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/Epsgcode.cs index a8ff2084..0e3eeeb3 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/Epsgcode.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/Epsgcode.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class Epsgcode : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/GnisfeatureName.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/GnisfeatureName.cs similarity index 85% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/GnisfeatureName.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/GnisfeatureName.cs index f171b707..1807fb18 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/GnisfeatureName.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/GnisfeatureName.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class GnisfeatureName : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/IDatabaseContextFactory.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/IDatabaseContextFactory.cs new file mode 100644 index 00000000..2cdc1201 --- /dev/null +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/IDatabaseContextFactory.cs @@ -0,0 +1,9 @@ +using WesternStatesWater.WestDaat.Database.EntityFramework.partials; + +namespace WesternStatesWater.WestDaat.Database.EntityFramework +{ + public interface IDatabaseContextFactory + { + public DatabaseContext Create(); + } +} diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ImportErrors.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ImportErrors.cs similarity index 76% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ImportErrors.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ImportErrors.cs index f0206871..d4dc6dcc 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ImportErrors.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ImportErrors.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class ImportErrors { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/IrrigationMethod.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/IrrigationMethod.cs similarity index 90% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/IrrigationMethod.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/IrrigationMethod.cs index 532ab20a..3a759d7d 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/IrrigationMethod.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/IrrigationMethod.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class IrrigationMethod : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/LegalStatus.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/LegalStatus.cs similarity index 82% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/LegalStatus.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/LegalStatus.cs index 2e90006d..68912bbc 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/LegalStatus.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/LegalStatus.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class LegalStatus : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/MethodType.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/MethodType.cs similarity index 78% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/MethodType.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/MethodType.cs index 28c1d53e..0232e7ef 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/MethodType.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/MethodType.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class MethodType : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/MethodsDim.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/MethodsDim.cs similarity index 95% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/MethodsDim.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/MethodsDim.cs index 67dc9c04..d32b1d3c 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/MethodsDim.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/MethodsDim.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class MethodsDim { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/NhdnetworkStatus.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/NhdnetworkStatus.cs similarity index 79% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/NhdnetworkStatus.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/NhdnetworkStatus.cs index b460f366..0a030da5 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/NhdnetworkStatus.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/NhdnetworkStatus.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class NhdnetworkStatus : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/Nhdproduct.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/Nhdproduct.cs similarity index 78% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/Nhdproduct.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/Nhdproduct.cs index cfde36b8..4fd518a7 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/Nhdproduct.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/Nhdproduct.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class Nhdproduct : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/OrganizationsDim.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/OrganizationsDim.cs similarity index 95% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/OrganizationsDim.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/OrganizationsDim.cs index 4eca95d9..b539727d 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/OrganizationsDim.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/OrganizationsDim.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class OrganizationsDim { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/OverlaysView.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/OverlaysView.cs similarity index 77% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/OverlaysView.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/OverlaysView.cs index 4030fe90..571d519b 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/OverlaysView.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/OverlaysView.cs @@ -1,6 +1,6 @@ using NetTopologySuite.Geometries; -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework; +namespace WesternStatesWater.WestDaat.Database.EntityFramework; public class OverlaysView { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/OwnerClassificationCv.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/OwnerClassificationCv.cs similarity index 82% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/OwnerClassificationCv.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/OwnerClassificationCv.cs index 086d0939..32cb8d41 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/OwnerClassificationCv.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/OwnerClassificationCv.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class OwnerClassificationCv : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/PODSiteToPOUSiteFact.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/PODSiteToPOUSiteFact.cs similarity index 86% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/PODSiteToPOUSiteFact.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/PODSiteToPOUSiteFact.cs index 3769d848..5282bc1a 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/PODSiteToPOUSiteFact.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/PODSiteToPOUSiteFact.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class PODSiteToPOUSiteFact { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/PowerType.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/PowerType.cs similarity index 90% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/PowerType.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/PowerType.cs index 875f39b1..75e1273f 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/PowerType.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/PowerType.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class PowerType : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/RegulatoryOverlayBridgeSitesFact.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/RegulatoryOverlayBridgeSitesFact.cs similarity index 85% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/RegulatoryOverlayBridgeSitesFact.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/RegulatoryOverlayBridgeSitesFact.cs index 73874c30..b8192b72 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/RegulatoryOverlayBridgeSitesFact.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/RegulatoryOverlayBridgeSitesFact.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class RegulatoryOverlayBridgeSitesFact { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/RegulatoryOverlayDim.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/RegulatoryOverlayDim.cs similarity index 95% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/RegulatoryOverlayDim.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/RegulatoryOverlayDim.cs index da4cd886..242b037f 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/RegulatoryOverlayDim.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/RegulatoryOverlayDim.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class RegulatoryOverlayDim { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/RegulatoryOverlayType.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/RegulatoryOverlayType.cs similarity index 82% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/RegulatoryOverlayType.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/RegulatoryOverlayType.cs index db9640ba..45bbf2f3 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/RegulatoryOverlayType.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/RegulatoryOverlayType.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public class RegulatoryOverlayType : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/RegulatoryReportingUnitsFact.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/RegulatoryReportingUnitsFact.cs similarity index 89% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/RegulatoryReportingUnitsFact.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/RegulatoryReportingUnitsFact.cs index f9276646..113ce1fa 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/RegulatoryReportingUnitsFact.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/RegulatoryReportingUnitsFact.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class RegulatoryReportingUnitsFact { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/RegulatoryStatus.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/RegulatoryStatus.cs similarity index 55% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/RegulatoryStatus.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/RegulatoryStatus.cs index 54af1954..1c7a8a54 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/RegulatoryStatus.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/RegulatoryStatus.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class RegulatoryStatus : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ReportYearCv.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ReportYearCv.cs similarity index 87% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ReportYearCv.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ReportYearCv.cs index aedf9812..f7667074 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ReportYearCv.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ReportYearCv.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class ReportYearCv : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ReportYearType.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ReportYearType.cs similarity index 80% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ReportYearType.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ReportYearType.cs index d637cb88..4dab2c16 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ReportYearType.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ReportYearType.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class ReportYearType : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ReportingUnitType.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ReportingUnitType.cs similarity index 81% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ReportingUnitType.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ReportingUnitType.cs index e1e19015..ee50725f 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ReportingUnitType.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ReportingUnitType.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class ReportingUnitType : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ReportingUnitsDim.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ReportingUnitsDim.cs similarity index 95% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ReportingUnitsDim.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ReportingUnitsDim.cs index c2c4d38c..a1918cac 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/ReportingUnitsDim.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/ReportingUnitsDim.cs @@ -1,6 +1,6 @@ using NetTopologySuite.Geometries; -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class ReportingUnitsDim { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/SDWISIdentifier.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/SDWISIdentifier.cs similarity index 90% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/SDWISIdentifier.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/SDWISIdentifier.cs index 73119b57..aaa607ee 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/SDWISIdentifier.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/SDWISIdentifier.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class SDWISIdentifier : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/SiteType.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/SiteType.cs similarity index 78% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/SiteType.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/SiteType.cs index d7b9d5ad..c4e7cc31 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/SiteType.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/SiteType.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class SiteType : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/SiteVariableAmountsFact.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/SiteVariableAmountsFact.cs similarity index 97% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/SiteVariableAmountsFact.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/SiteVariableAmountsFact.cs index 77f7d8c2..8f24580b 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/SiteVariableAmountsFact.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/SiteVariableAmountsFact.cs @@ -1,6 +1,6 @@ using NetTopologySuite.Geometries; -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class SiteVariableAmountsFact { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/SitesBridgeBeneficialUsesFact.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/SitesBridgeBeneficialUsesFact.cs similarity index 84% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/SitesBridgeBeneficialUsesFact.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/SitesBridgeBeneficialUsesFact.cs index 8005fd9a..76f62697 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/SitesBridgeBeneficialUsesFact.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/SitesBridgeBeneficialUsesFact.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class SitesBridgeBeneficialUsesFact { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/SitesDim.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/SitesDim.cs similarity index 95% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/SitesDim.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/SitesDim.cs index d5de9002..d7afb353 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/SitesDim.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/SitesDim.cs @@ -1,7 +1,7 @@ -using NetTopologySuite.Geometries; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; +using NetTopologySuite.Geometries; -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class SitesDim { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/State.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/State.cs similarity index 77% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/State.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/State.cs index cad980c7..96242822 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/State.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/State.cs @@ -1,6 +1,4 @@ -using System.ComponentModel.DataAnnotations; - -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class State : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/TempId.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/TempId.cs similarity index 53% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/TempId.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/TempId.cs index 940daeee..36d2a21d 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/TempId.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/TempId.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public class TempId { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/TempUuid.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/TempUuid.cs similarity index 55% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/TempUuid.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/TempUuid.cs index af2be4ab..daa65566 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/TempUuid.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/TempUuid.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public class TempUuid { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/Units.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/Units.cs similarity index 91% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/Units.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/Units.cs index a7277e53..35071aa1 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/Units.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/Units.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class Units : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/Variable.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/Variable.cs similarity index 79% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/Variable.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/Variable.cs index b27b43db..732b9a08 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/Variable.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/Variable.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class Variable : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/VariableSpecific.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/VariableSpecific.cs similarity index 80% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/VariableSpecific.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/VariableSpecific.cs index 16cdafd6..303566d9 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/VariableSpecific.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/VariableSpecific.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class VariableSpecific : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/VariablesDim.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/VariablesDim.cs similarity index 96% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/VariablesDim.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/VariablesDim.cs index c09e33c4..316e3cb3 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/VariablesDim.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/VariablesDim.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class VariablesDim { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/WaterAllocationBasis.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/WaterAllocationBasis.cs similarity index 82% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/WaterAllocationBasis.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/WaterAllocationBasis.cs index 3ca3a35e..dbd8fcad 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/WaterAllocationBasis.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/WaterAllocationBasis.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class WaterAllocationBasis : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/WaterAllocationType.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/WaterAllocationType.cs similarity index 82% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/WaterAllocationType.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/WaterAllocationType.cs index 106872e1..aa385fab 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/WaterAllocationType.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/WaterAllocationType.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class WaterAllocationType : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/WaterQualityIndicator.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/WaterQualityIndicator.cs similarity index 81% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/WaterQualityIndicator.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/WaterQualityIndicator.cs index 04beaef4..49a0321e 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/WaterQualityIndicator.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/WaterQualityIndicator.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class WaterQualityIndicator : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/WaterSourceBridgeSitesFact.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/WaterSourceBridgeSitesFact.cs similarity index 83% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/WaterSourceBridgeSitesFact.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/WaterSourceBridgeSitesFact.cs index 91e87791..1744f5ab 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/WaterSourceBridgeSitesFact.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/WaterSourceBridgeSitesFact.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class WaterSourceBridgeSitesFact { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/WaterSourceType.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/WaterSourceType.cs similarity index 84% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/WaterSourceType.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/WaterSourceType.cs index 673b1b11..d8758acf 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/WaterSourceType.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/WaterSourceType.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class WaterSourceType : ControlledVocabularyBase { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/WaterSourcesDim.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/WaterSourcesDim.cs similarity index 95% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/WaterSourcesDim.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/WaterSourcesDim.cs index 7ebdb43d..08230742 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/WaterSourcesDim.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/WaterSourcesDim.cs @@ -1,6 +1,6 @@ using NetTopologySuite.Geometries; -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework { public partial class WaterSourcesDim { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/partials/DatabaseContext.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/partials/DatabaseContext.cs similarity index 99% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/partials/DatabaseContext.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/partials/DatabaseContext.cs index 55b7499d..1c715605 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/partials/DatabaseContext.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/partials/DatabaseContext.cs @@ -1,10 +1,10 @@ -using Microsoft.Azure.Services.AppAuthentication; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Azure.Services.AppAuthentication; using Microsoft.Data.SqlClient; using Microsoft.EntityFrameworkCore; -using System.Diagnostics.CodeAnalysis; using WesternStatesWater.WestDaat.Common.Configuration; -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework.partials { public partial class DatabaseContext : DbContext { diff --git a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/partials/DatabaseModel.cs b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/partials/DatabaseModel.cs similarity index 55% rename from src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/partials/DatabaseModel.cs rename to src/API/WesternStatesWater.WestDaat.Database/EntityFramework/partials/DatabaseModel.cs index 6e0ddb96..04cba8b7 100644 --- a/src/API/WesternStatesWater.WestDaat.Accessors/EntityFramework/partials/DatabaseModel.cs +++ b/src/API/WesternStatesWater.WestDaat.Database/EntityFramework/partials/DatabaseModel.cs @@ -1,4 +1,4 @@ -namespace WesternStatesWater.WestDaat.Accessors.EntityFramework +namespace WesternStatesWater.WestDaat.Database.EntityFramework.partials { public abstract class DatabaseModel { diff --git a/src/API/WesternStatesWater.WestDaat.Database/WesternStatesWater.WestDaat.Database.csproj b/src/API/WesternStatesWater.WestDaat.Database/WesternStatesWater.WestDaat.Database.csproj new file mode 100644 index 00000000..ba918473 --- /dev/null +++ b/src/API/WesternStatesWater.WestDaat.Database/WesternStatesWater.WestDaat.Database.csproj @@ -0,0 +1,37 @@ + + + + net8.0 + enable + enable + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + diff --git a/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/AccessorTestBase.cs b/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/AccessorTestBase.cs index c5ecb6bb..96e2f2af 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/AccessorTestBase.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/AccessorTestBase.cs @@ -2,9 +2,9 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using System.Transactions; -using WesternStatesWater.WestDaat.Accessors.EntityFramework; using WesternStatesWater.WestDaat.Common; using WesternStatesWater.WestDaat.Common.Configuration; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.AccessorTests { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/SiteAccessorTests.cs b/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/SiteAccessorTests.cs index 545f0fff..8b9f961d 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/SiteAccessorTests.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/SiteAccessorTests.cs @@ -1,5 +1,5 @@ using WesternStatesWater.WestDaat.Accessors; -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; using WesternStatesWater.WestDaat.Tests.Helpers; using WesternStatesWater.WestDaat.Utilities; diff --git a/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/SystemAccessorTests.cs b/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/SystemAccessorTests.cs index a575552a..a2618752 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/SystemAccessorTests.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/SystemAccessorTests.cs @@ -1,5 +1,5 @@ using WesternStatesWater.WestDaat.Accessors; -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; using WesternStatesWater.WestDaat.Tests.Helpers; namespace WesternStatesWater.WestDaat.Tests.AccessorTests diff --git a/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/WaterAllocationAccessorTests.cs b/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/WaterAllocationAccessorTests.cs index 632d7fbe..4dfafcdd 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/WaterAllocationAccessorTests.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/WaterAllocationAccessorTests.cs @@ -1,6 +1,6 @@ using WesternStatesWater.WestDaat.Accessors; using WesternStatesWater.WestDaat.Tests.Helpers; -using EF = WesternStatesWater.WestDaat.Accessors.EntityFramework; +using EF = WesternStatesWater.WestDaat.Database.EntityFramework; using CommonContracts = WesternStatesWater.WestDaat.Common.DataContracts; using WesternStatesWater.WestDaat.Common.DataContracts; using WesternStatesWater.WestDaat.Accessors.Mapping; diff --git a/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/WesternStatesWater.WestDaat.Tests.AccessorTests.csproj b/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/WesternStatesWater.WestDaat.Tests.AccessorTests.csproj index 0e5d3afd..b9ea4a66 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/WesternStatesWater.WestDaat.Tests.AccessorTests.csproj +++ b/src/API/WesternStatesWater.WestDaat.Tests.AccessorTests/WesternStatesWater.WestDaat.Tests.AccessorTests.csproj @@ -25,10 +25,10 @@ - - - - + + + + diff --git a/src/API/WesternStatesWater.WestDaat.Tests.EngineTests/WesternStatesWater.WestDaat.Tests.EngineTests.csproj b/src/API/WesternStatesWater.WestDaat.Tests.EngineTests/WesternStatesWater.WestDaat.Tests.EngineTests.csproj index 2d6e34d0..3fef7125 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.EngineTests/WesternStatesWater.WestDaat.Tests.EngineTests.csproj +++ b/src/API/WesternStatesWater.WestDaat.Tests.EngineTests/WesternStatesWater.WestDaat.Tests.EngineTests.csproj @@ -21,11 +21,11 @@ - - + + - - + + diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/AggregationStatisticFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/AggregationStatisticFaker.cs index 51b6764e..104799bc 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/AggregationStatisticFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/AggregationStatisticFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/AllocationAmountFactFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/AllocationAmountFactFaker.cs index b5f8c090..8c417b89 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/AllocationAmountFactFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/AllocationAmountFactFaker.cs @@ -1,5 +1,5 @@ using System.Diagnostics.CodeAnalysis; -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/AllocationBridgeBeneficialUsesFactFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/AllocationBridgeBeneficialUsesFactFaker.cs index 89c329ee..572797e7 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/AllocationBridgeBeneficialUsesFactFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/AllocationBridgeBeneficialUsesFactFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/AllocationBridgeSiteFactFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/AllocationBridgeSiteFactFaker.cs index bc95e5de..be9f69bc 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/AllocationBridgeSiteFactFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/AllocationBridgeSiteFactFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ApplicableResourceTypeFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ApplicableResourceTypeFaker.cs index 4c9133e7..08059c74 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ApplicableResourceTypeFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ApplicableResourceTypeFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/BeneficialUsesCVFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/BeneficialUsesCVFaker.cs index a990b4e9..4043621a 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/BeneficialUsesCVFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/BeneficialUsesCVFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ControlledVocabularyFakerBase.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ControlledVocabularyFakerBase.cs index 62ddab8a..e8dbac6c 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ControlledVocabularyFakerBase.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ControlledVocabularyFakerBase.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers; diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/CoordinateMethodFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/CoordinateMethodFaker.cs index 3ed2d507..a7faafd6 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/CoordinateMethodFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/CoordinateMethodFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/DateDimFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/DateDimFaker.cs index e38cbe9c..c919a3a0 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/DateDimFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/DateDimFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/EpsgcodeFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/EpsgcodeFaker.cs index fe468dbb..47ec03fb 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/EpsgcodeFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/EpsgcodeFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/GnisfeatureNameFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/GnisfeatureNameFaker.cs index 923ca71d..b613cd44 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/GnisfeatureNameFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/GnisfeatureNameFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/IrrigationMethodCVFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/IrrigationMethodCVFaker.cs index 88e18b11..d9d5cd1d 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/IrrigationMethodCVFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/IrrigationMethodCVFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/LegalStatusCVFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/LegalStatusCVFaker.cs index f753b8e5..713da404 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/LegalStatusCVFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/LegalStatusCVFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/MethodTypeFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/MethodTypeFaker.cs index ac543910..3069755c 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/MethodTypeFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/MethodTypeFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/MethodsDimFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/MethodsDimFaker.cs index 38977fdd..cab46566 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/MethodsDimFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/MethodsDimFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/OrganizationsDimFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/OrganizationsDimFaker.cs index 3d21162a..23d6a7f1 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/OrganizationsDimFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/OrganizationsDimFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/OverlayDimFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/OverlayDimFaker.cs index becfa348..808afba0 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/OverlayDimFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/OverlayDimFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers; diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/OverlayTypeFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/OverlayTypeFaker.cs index a432de78..1af5120a 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/OverlayTypeFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/OverlayTypeFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers; diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/OwnerClassificationCvFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/OwnerClassificationCvFaker.cs index 1c129fb4..2dde65c0 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/OwnerClassificationCvFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/OwnerClassificationCvFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/RegulatoryStatusCVFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/RegulatoryStatusCVFaker.cs index 2657e5dd..eee74511 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/RegulatoryStatusCVFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/RegulatoryStatusCVFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers; diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ReportYearTypeFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ReportYearTypeFaker.cs index f759878b..019ca1c8 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ReportYearTypeFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ReportYearTypeFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ReportingUnitDimFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ReportingUnitDimFaker.cs index c3af2fbd..45cd843a 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ReportingUnitDimFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ReportingUnitDimFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; using WesternStatesWater.WestDaat.Tests.Helpers.Geometry; namespace WesternStatesWater.WestDaat.Tests.Helpers; diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ReportingUnitTypeCVFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ReportingUnitTypeCVFaker.cs index 1e18d981..98fdbb74 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ReportingUnitTypeCVFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ReportingUnitTypeCVFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers; diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ReportingUnitsFactFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ReportingUnitsFactFaker.cs index b517d5ee..c0ed6dd9 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ReportingUnitsFactFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/ReportingUnitsFactFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers; diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/SiteTypeFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/SiteTypeFaker.cs index fe42ba31..10a90f60 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/SiteTypeFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/SiteTypeFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/SiteVariableAmountsFactFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/SiteVariableAmountsFactFaker.cs index 329db3d5..02ac5d1d 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/SiteVariableAmountsFactFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/SiteVariableAmountsFactFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers; diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/SitesDimFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/SitesDimFaker.cs index 3137eaa1..b92d26e6 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/SitesDimFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/SitesDimFaker.cs @@ -1,5 +1,5 @@ using System.Diagnostics.CodeAnalysis; -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; using WesternStatesWater.WestDaat.Tests.Helpers.Geometry; namespace WesternStatesWater.WestDaat.Tests.Helpers diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/StateFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/StateFaker.cs index b2a54adf..e7568152 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/StateFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/StateFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/UnitsFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/UnitsFaker.cs index 169e5538..13451e03 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/UnitsFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/UnitsFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/VariableFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/VariableFaker.cs index e8e3a65c..955ff052 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/VariableFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/VariableFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/VariableSpecificFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/VariableSpecificFaker.cs index db8c64c7..3a274542 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/VariableSpecificFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/VariableSpecificFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/VariablesDimFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/VariablesDimFaker.cs index 3c2cbf98..3a1a7c06 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/VariablesDimFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/VariablesDimFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterAllocationTypeCVFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterAllocationTypeCVFaker.cs index 17ad17d9..1c8b6fbc 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterAllocationTypeCVFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterAllocationTypeCVFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers; diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterQualityIndicatorFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterQualityIndicatorFaker.cs index b3e4a3fe..de194566 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterQualityIndicatorFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterQualityIndicatorFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterSourceBridgeSiteFactFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterSourceBridgeSiteFactFaker.cs index 3b772010..d67bf001 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterSourceBridgeSiteFactFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterSourceBridgeSiteFactFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterSourceDimFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterSourceDimFaker.cs index 49d9aa1a..5fbae4e3 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterSourceDimFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterSourceDimFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterSourceTypeFaker.cs b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterSourceTypeFaker.cs index f15f513e..62f62ed4 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterSourceTypeFaker.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WaterSourceTypeFaker.cs @@ -1,4 +1,4 @@ -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; namespace WesternStatesWater.WestDaat.Tests.Helpers { diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WesternStatesWater.WestDaat.Tests.Helpers.csproj b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WesternStatesWater.WestDaat.Tests.Helpers.csproj index ea57fc64..2d4ce3cd 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WesternStatesWater.WestDaat.Tests.Helpers.csproj +++ b/src/API/WesternStatesWater.WestDaat.Tests.Helpers/WesternStatesWater.WestDaat.Tests.Helpers.csproj @@ -16,9 +16,9 @@ - - - + + + diff --git a/src/API/WesternStatesWater.WestDaat.Tests.IntegrationTests/WesternStatesWater.WestDaat.Tests.IntegrationTests.csproj b/src/API/WesternStatesWater.WestDaat.Tests.IntegrationTests/WesternStatesWater.WestDaat.Tests.IntegrationTests.csproj index 70684618..af3b4ba7 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.IntegrationTests/WesternStatesWater.WestDaat.Tests.IntegrationTests.csproj +++ b/src/API/WesternStatesWater.WestDaat.Tests.IntegrationTests/WesternStatesWater.WestDaat.Tests.IntegrationTests.csproj @@ -14,13 +14,13 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + - + diff --git a/src/API/WesternStatesWater.WestDaat.Tests.ManagerTests/WesternStatesWater.WestDaat.Tests.ManagerTests.csproj b/src/API/WesternStatesWater.WestDaat.Tests.ManagerTests/WesternStatesWater.WestDaat.Tests.ManagerTests.csproj index 0d63af10..ae6b6f14 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.ManagerTests/WesternStatesWater.WestDaat.Tests.ManagerTests.csproj +++ b/src/API/WesternStatesWater.WestDaat.Tests.ManagerTests/WesternStatesWater.WestDaat.Tests.ManagerTests.csproj @@ -24,11 +24,11 @@ - - + + - - + + diff --git a/src/API/WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests/AllocationTests.cs b/src/API/WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests/AllocationTests.cs index b4a9cd3b..76ecdae4 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests/AllocationTests.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests/AllocationTests.cs @@ -2,7 +2,7 @@ using FluentAssertions; using GeoJSON.Text.Feature; using NetTopologySuite.Geometries; -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; using WesternStatesWater.WestDaat.Tests.Helpers; using WesternStatesWater.WestDaat.Tools.MapboxTilesetCreate; diff --git a/src/API/WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests/MapboxTilesetTestBase.cs b/src/API/WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests/MapboxTilesetTestBase.cs index c3a4e5ab..245e816c 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests/MapboxTilesetTestBase.cs +++ b/src/API/WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests/MapboxTilesetTestBase.cs @@ -1,7 +1,8 @@ using System.Transactions; using Microsoft.Extensions.Configuration; -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework; using WesternStatesWater.WestDaat.Common.Configuration; +using WesternStatesWater.WestDaat.Database.EntityFramework.partials; namespace WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests; diff --git a/src/API/WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests/WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests.csproj b/src/API/WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests/WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests.csproj index eb6661a0..35156922 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests/WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests.csproj +++ b/src/API/WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests/WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests.csproj @@ -12,10 +12,10 @@ - - - - + + + + diff --git a/src/API/WesternStatesWater.WestDaat.Tests.Utilities.Tests/WesternStatesWater.WestDaat.Tests.UtilitiesTests.csproj b/src/API/WesternStatesWater.WestDaat.Tests.Utilities.Tests/WesternStatesWater.WestDaat.Tests.UtilitiesTests.csproj index 7892f552..1789c5fd 100644 --- a/src/API/WesternStatesWater.WestDaat.Tests.Utilities.Tests/WesternStatesWater.WestDaat.Tests.UtilitiesTests.csproj +++ b/src/API/WesternStatesWater.WestDaat.Tests.Utilities.Tests/WesternStatesWater.WestDaat.Tests.UtilitiesTests.csproj @@ -7,17 +7,17 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/API/WesternStatesWater.WestDaat.Tools.MapboxTilesetCreate/MapboxTileset.cs b/src/API/WesternStatesWater.WestDaat.Tools.MapboxTilesetCreate/MapboxTileset.cs index 91644fd1..a19f956c 100644 --- a/src/API/WesternStatesWater.WestDaat.Tools.MapboxTilesetCreate/MapboxTileset.cs +++ b/src/API/WesternStatesWater.WestDaat.Tools.MapboxTilesetCreate/MapboxTileset.cs @@ -3,7 +3,7 @@ using System.Text.Json; using GeoJSON.Text.Feature; using Microsoft.EntityFrameworkCore; -using WesternStatesWater.WestDaat.Accessors.EntityFramework; +using WesternStatesWater.WestDaat.Database.EntityFramework.partials; using WesternStatesWater.WestDaat.Utilities; namespace WesternStatesWater.WestDaat.Tools.MapboxTilesetCreate; diff --git a/src/API/WesternStatesWater.WestDaat.Tools.MapboxTilesetCreate/Program.cs b/src/API/WesternStatesWater.WestDaat.Tools.MapboxTilesetCreate/Program.cs index 600469db..3f26827f 100644 --- a/src/API/WesternStatesWater.WestDaat.Tools.MapboxTilesetCreate/Program.cs +++ b/src/API/WesternStatesWater.WestDaat.Tools.MapboxTilesetCreate/Program.cs @@ -3,9 +3,9 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using WesternStatesWater.WestDaat.Accessors; -using WesternStatesWater.WestDaat.Accessors.EntityFramework; using WesternStatesWater.WestDaat.Common.Configuration; using WesternStatesWater.WestDaat.Contracts.Client; +using WesternStatesWater.WestDaat.Database.EntityFramework; using WesternStatesWater.WestDaat.Engines; using WesternStatesWater.WestDaat.Managers; using WesternStatesWater.WestDaat.Utilities; @@ -31,9 +31,7 @@ static async Task Main(string[] args) services.AddScoped(_ => config.GetNldiConfiguration()); services.AddScoped(_ => config.GetBlobStorageConfiguration()); services.AddScoped(_ => config.GetPerformanceConfiguration()); - services - .AddTransient(); + services.AddTransient(); services.AddScoped(); services.AddScoped(); services.AddScoped(); diff --git a/src/API/WesternStatesWater.WestDaat.sln b/src/API/WesternStatesWater.WestDaat.sln index 43200711..a877dfc6 100644 --- a/src/API/WesternStatesWater.WestDaat.sln +++ b/src/API/WesternStatesWater.WestDaat.sln @@ -27,7 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "6. Common", "6. Common", "{ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WesternStatesWater.WestDaat.Common", "WesternStatesWater.WestDaat.Common\WesternStatesWater.WestDaat.Common.csproj", "{B4DB2035-1815-406B-9C93-74CA2AD618C1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "7. Database", "7. Database", "{BC8B9A41-7FCD-4248-B608-AE11A5B5A372}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "7. Data", "7. Data", "{BC8B9A41-7FCD-4248-B608-AE11A5B5A372}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "9. Tests", "9. Tests", "{6312C581-2A47-430B-AEB9-B0FA1D83F751}" EndProject @@ -53,6 +53,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WesternStatesWater.WestDaat EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests", "WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests\WesternStatesWater.WestDaat.Tests.MapboxTilesetCreateTests.csproj", "{3BA6F160-1CE7-4328-B546-33274602BED5}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WesternStatesWater.WestDaat.Database", "WesternStatesWater.WestDaat.Database\WesternStatesWater.WestDaat.Database.csproj", "{932F01EB-A315-43E3-B3A1-C45DAD1D30DB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -123,6 +125,10 @@ Global {3BA6F160-1CE7-4328-B546-33274602BED5}.Debug|Any CPU.Build.0 = Debug|Any CPU {3BA6F160-1CE7-4328-B546-33274602BED5}.Release|Any CPU.ActiveCfg = Release|Any CPU {3BA6F160-1CE7-4328-B546-33274602BED5}.Release|Any CPU.Build.0 = Release|Any CPU + {932F01EB-A315-43E3-B3A1-C45DAD1D30DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {932F01EB-A315-43E3-B3A1-C45DAD1D30DB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {932F01EB-A315-43E3-B3A1-C45DAD1D30DB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {932F01EB-A315-43E3-B3A1-C45DAD1D30DB}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -144,6 +150,7 @@ Global {5E195A8E-3E0A-4D51-ADBF-F864668265BC} = {93C6F30C-6287-40F1-907C-8C0CFDA23482} {25C64908-689E-4D52-B814-A41021918B88} = {93C6F30C-6287-40F1-907C-8C0CFDA23482} {3BA6F160-1CE7-4328-B546-33274602BED5} = {6312C581-2A47-430B-AEB9-B0FA1D83F751} + {932F01EB-A315-43E3-B3A1-C45DAD1D30DB} = {BC8B9A41-7FCD-4248-B608-AE11A5B5A372} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {76EF2099-5BC9-4F48-8EBA-524560067EC3} diff --git a/src/API/WesternStatesWater.WestDaat.tools.JSONLDGenerator/Program.cs b/src/API/WesternStatesWater.WestDaat.tools.JSONLDGenerator/Program.cs index 6d4761ea..48d8df5b 100644 --- a/src/API/WesternStatesWater.WestDaat.tools.JSONLDGenerator/Program.cs +++ b/src/API/WesternStatesWater.WestDaat.tools.JSONLDGenerator/Program.cs @@ -7,6 +7,7 @@ using WesternStatesWater.WestDaat.Accessors; using WesternStatesWater.WestDaat.Common.Configuration; using WesternStatesWater.WestDaat.Common.DataContracts; +using WesternStatesWater.WestDaat.Database.EntityFramework; using WesternStatesWater.WestDaat.Utilities; namespace WesternStatesWater.WestDaat.Tools.JSONLDGenerator @@ -30,7 +31,7 @@ static async Task Main(string[] args) services.AddScoped(_ => config.GetDatabaseConfiguration()); services.AddScoped(_ => config.GetBlobStorageConfiguration()); services.AddScoped(_ => config.GetPerformanceConfiguration()); - services.AddTransient(); + services.AddTransient(); services.AddScoped(); services.AddScoped(); services.AddScoped();