FOR REVIEW ONLY: Change queries enhancements for supporting deletes and key changes and API Publisher

Application/EdFi.Ods.Api/Container/Modules/ApplicationModule.cs

@@ -259,10 +259,6 @@ void RegisterModels()
                     .AsSelf()
                     .SingleInstance();
 
-                builder.RegisterGeneric(typeof(GetDeletedResourceModelByIds<,,>))
-                    .AsSelf()
-                    .SingleInstance();
-
                 builder.RegisterGeneric(typeof(ValidateResourceModel<,,,>))
                     .AsSelf()
                     .SingleInstance();
@@ -296,11 +292,6 @@ void RegisterPipeLineStepProviders()
                     .As<IPipelineStepsProvider>()
                     .SingleInstance();
 
-                builder.RegisterType<GetDeletedResourceIdsPipelineStepsProvider>()
-                    .As<IGetDeletedResourceIdsPipelineStepsProvider>()
-                    .As<IPipelineStepsProvider>()
-                    .SingleInstance();
-
                 builder.RegisterType<PutPipelineStepsProvider>()
                     .As<IPutPipelineStepsProvider>()
                     .As<IPipelineStepsProvider>()

Application/EdFi.Ods.Api/Container/Modules/PostgresSpecificModule.cs

@@ -3,14 +3,19 @@
 // The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
 // See the LICENSE and NOTICES files in the project root for more information.
 
+using System.Data.Common;
 using Autofac;
 using EdFi.Common.Configuration;
 using EdFi.Ods.Common.Configuration;
 using EdFi.Ods.Common.Container;
 using EdFi.Ods.Common.Infrastructure.Activities;
 using EdFi.Ods.Common.Infrastructure.Configuration;
 using EdFi.Ods.Common.Infrastructure.PostgreSql;
+using EdFi.Ods.Generator.Database.Engines.PostgreSql;
+using EdFi.Ods.Generator.Database.NamingConventions;
 using EdFi.Ods.Security.Authorization;
+using Npgsql;
+using SqlKata.Compilers;
 
 namespace EdFi.Ods.Api.Container.Modules
 {
@@ -34,6 +39,16 @@ public override void ApplyConfigurationSpecificRegistrations(ContainerBuilder bu
             builder.RegisterType<PostgreSqlDatabaseEngineNHibernateConfigurationActivity>()
                 .As<INHibernateConfigurationActivity>()
                 .SingleInstance();
+
+            builder.RegisterInstance(NpgsqlFactory.Instance)
+                .As<DbProviderFactory>();
+
+            builder.Register<Compiler>(ctx => new PostgresCompiler());
+
+            // Register PostgreSQL naming convention
+            builder.RegisterType<PostgreSqlDatabaseNamingConvention>()
+                .As<IDatabaseNamingConvention>()
+                .SingleInstance();
         }
     }
 }

Application/EdFi.Ods.Api/Container/Modules/SqlServerSpecificModule.cs

@@ -3,14 +3,19 @@
 // The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
 // See the LICENSE and NOTICES files in the project root for more information.
 
+using System.Data.Common;
+using System.Data.SqlClient;
 using Autofac;
 using EdFi.Common.Configuration;
 using EdFi.Ods.Common.Configuration;
 using EdFi.Ods.Common.Container;
 using EdFi.Ods.Common.Infrastructure.Activities;
 using EdFi.Ods.Common.Infrastructure.Configuration;
 using EdFi.Ods.Common.Infrastructure.SqlServer;
+using EdFi.Ods.Generator.Database.Engines.SqlServer;
+using EdFi.Ods.Generator.Database.NamingConventions;
 using EdFi.Ods.Security.Authorization;
+using SqlKata.Compilers;
 
 namespace EdFi.Ods.Api.Container.Modules
 {
@@ -34,6 +39,16 @@ public override void ApplyConfigurationSpecificRegistrations(ContainerBuilder bu
             builder.RegisterType<SqlServerDatabaseEngineNHibernateConfigurationActivity>()
                 .As<INHibernateConfigurationActivity>()
                 .SingleInstance();
+
+            builder.RegisterInstance(SqlClientFactory.Instance)
+                .As<DbProviderFactory>();
+
+            builder.Register<Compiler>(ctx => new SqlServerCompiler());
+
+            // Register SQL Server SQL naming convention
+            builder.RegisterType<SqlServerDatabaseNamingConvention>()
+                .As<IDatabaseNamingConvention>()
+                .SingleInstance();
         }
     }
 }

Application/EdFi.Ods.Api/Controllers/DataManagementControllerBase.cs

@@ -14,7 +14,6 @@
 using EdFi.Ods.Api.Filters;
 using EdFi.Ods.Api.Infrastructure.Pipelines.Factories;
 using EdFi.Ods.Api.Infrastructure.Pipelines.Get;
-using EdFi.Ods.Api.Infrastructure.Pipelines.GetDeletedResource;
 using EdFi.Ods.Api.Infrastructure.Pipelines.GetMany;
 using EdFi.Ods.Api.Infrastructure.Pipelines.Put;
 using EdFi.Ods.Common;
@@ -62,7 +61,6 @@ public abstract class DataManagementControllerBase<TResourceReadModel, TResource
         protected Lazy<DeletePipeline> DeletePipeline;
         protected Lazy<GetPipeline<TResourceReadModel, TAggregateRoot>> GetByIdPipeline;
 
-        protected Lazy<GetDeletedResourcePipeline<TAggregateRoot>> GetDeletedResourcePipeline;
         protected Lazy<GetManyPipeline<TResourceReadModel, TAggregateRoot>> GetManyPipeline;
 
         protected Lazy<PutPipeline<TResourceWriteModel, TAggregateRoot>> PutPipeline;
@@ -87,10 +85,6 @@ protected DataManagementControllerBase(
             GetManyPipeline = new Lazy<GetManyPipeline<TResourceReadModel, TAggregateRoot>>
                 (pipelineFactory.CreateGetManyPipeline<TResourceReadModel, TAggregateRoot>);
 
-            // Change queries resource pipeline for deleted objects.
-            GetDeletedResourcePipeline = new Lazy<GetDeletedResourcePipeline<TAggregateRoot>>
-                (pipelineFactory.CreateGetDeletedResourcePipeline<TResourceReadModel, TAggregateRoot>);
-
             PutPipeline = new Lazy<PutPipeline<TResourceWriteModel, TAggregateRoot>>
                 (pipelineFactory.CreatePutPipeline<TResourceWriteModel, TAggregateRoot>);
 

Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj

@@ -34,11 +34,13 @@
     <PackageReference Include="Remotion.Linq" Version="2.2.0" />
     <PackageReference Include="Remotion.Linq.EagerFetching" Version="2.2.0" />
     <PackageReference Include="Sandwych.QuickGraph.Core" Version="1.0.0" />
+    <PackageReference Include="SqlKata" Version="2.3.7" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Services\Metadata\Resources\*.json" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Utilities\Generator\EdFi.Ods.Generator\EdFi.Ods.Generator.csproj" />
     <ProjectReference Include="..\EdFi.Security.DataAccess\EdFi.Security.DataAccess.csproj" />
     <ProjectReference Include="..\EdFi.Ods.Sandbox\EdFi.Ods.Sandbox.csproj" />
     <ProjectReference Include="..\EdFi.Ods.Common\EdFi.Ods.Common.csproj" />

Application/EdFi.Ods.Api/Helpers/ControllerHelpers.cs

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+// Licensed to the Ed-Fi Alliance under one or more agreements.
+// The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
+// See the LICENSE and NOTICES files in the project root for more information.
+
+using System.Net;
+using Microsoft.AspNetCore.Mvc;
+
+namespace EdFi.Ods.Api.Helpers
+{
+    public static class ControllerHelpers
+    {
+        /// <summary>
+        /// Gets an IActionResult returning a 404 Not Found status with no response body.
+        /// </summary>
+        /// <returns></returns>
+        public static IActionResult NotFound()
+        {
+            return new ObjectResult(null)
+            {
+                StatusCode = (int) HttpStatusCode.NotFound,
+            };
+        }
+    }
+}

Application/EdFi.Ods.Api/Infrastructure/Pipelines/Factories/IPipelineFactory.cs

@@ -4,7 +4,6 @@
 // See the LICENSE and NOTICES files in the project root for more information.
 
 using EdFi.Ods.Api.Infrastructure.Pipelines.Get;
-using EdFi.Ods.Api.Infrastructure.Pipelines.GetDeletedResource;
 using EdFi.Ods.Api.Infrastructure.Pipelines.GetMany;
 using EdFi.Ods.Api.Infrastructure.Pipelines.Put;
 using EdFi.Ods.Common;
@@ -22,9 +21,6 @@ GetManyPipeline<TResourceModel, TEntityModel> CreateGetManyPipeline<TResourceMod
             where TResourceModel : IHasETag
             where TEntityModel : class;
 
-        GetDeletedResourcePipeline<TEntityModel> CreateGetDeletedResourcePipeline<TResourceModel, TEntityModel>()
-            where TEntityModel : class;
-
         PutPipeline<TResourceModel, TEntityModel> CreatePutPipeline<TResourceModel, TEntityModel>()
             where TEntityModel : class, IHasIdentifier, new()
             where TResourceModel : IHasETag;

Application/EdFi.Ods.Api/Infrastructure/Pipelines/Factories/PipelineFactory.cs

@@ -8,13 +8,11 @@
 using System.Linq;
 using EdFi.Common.InversionOfControl;
 using EdFi.Ods.Api.Infrastructure.Pipelines.Get;
-using EdFi.Ods.Api.Infrastructure.Pipelines.GetDeletedResource;
 using EdFi.Ods.Api.Infrastructure.Pipelines.GetMany;
 using EdFi.Ods.Api.Infrastructure.Pipelines.Put;
 using EdFi.Ods.Common;
 using EdFi.Ods.Common.Infrastructure.Pipelines;
 using EdFi.Ods.Common.Infrastructure.Pipelines.Delete;
-using EdFi.Ods.Common.Infrastructure.Pipelines.GetDeletedResource;
 using EdFi.Ods.Common.Infrastructure.Pipelines.GetMany;
 
 namespace EdFi.Ods.Api.Infrastructure.Pipelines.Factories
@@ -25,21 +23,18 @@ public class PipelineFactory : IPipelineFactory
         private readonly IDeletePipelineStepsProvider deletePipelineStepsProvider;
         private readonly IGetBySpecificationPipelineStepsProvider getBySpecificationPipelineStepsProvider;
         private readonly IGetPipelineStepsProvider getPipelineStepsProvider;
-        private readonly IGetDeletedResourceIdsPipelineStepsProvider getDeletedResourceIdsPipelineStepsProvider;
         private readonly IPutPipelineStepsProvider putPipelineStepsProvider;
 
         public PipelineFactory(
             IServiceLocator locator,
             IGetPipelineStepsProvider getPipelineStepsProvider,
             IGetBySpecificationPipelineStepsProvider getBySpecificationPipelineStepsProvider,
-            IGetDeletedResourceIdsPipelineStepsProvider getDeletedResourceIdsPipelineStepsProvider,
             IPutPipelineStepsProvider putPipelineStepsProvider,
             IDeletePipelineStepsProvider deletePipelineStepsProvider)
         {
             _locator = locator;
             this.getPipelineStepsProvider = getPipelineStepsProvider;
             this.getBySpecificationPipelineStepsProvider = getBySpecificationPipelineStepsProvider;
-            this.getDeletedResourceIdsPipelineStepsProvider = getDeletedResourceIdsPipelineStepsProvider;
             this.putPipelineStepsProvider = putPipelineStepsProvider;
             this.deletePipelineStepsProvider = deletePipelineStepsProvider;
         }
@@ -71,18 +66,6 @@ public GetManyPipeline<TResourceModel, TEntityModel> CreateGetManyPipeline<TReso
             return new GetManyPipeline<TResourceModel, TEntityModel>(steps);
         }
 
-        public GetDeletedResourcePipeline<TEntityModel> CreateGetDeletedResourcePipeline<TResourceModel, TEntityModel>()
-            where TEntityModel : class
-        {
-            var stepsTypes = getDeletedResourceIdsPipelineStepsProvider.GetSteps();
-
-            var steps =
-                ResolvePipelineSteps<GetDeletedResourceContext<TEntityModel>, GetDeletedResourceResult, TResourceModel,
-                    TEntityModel>(stepsTypes);
-
-            return new GetDeletedResourcePipeline<TEntityModel>(steps);
-        }
-
         public PutPipeline<TResourceModel, TEntityModel> CreatePutPipeline<TResourceModel, TEntityModel>()
             where TEntityModel : class, IHasIdentifier, new()
             where TResourceModel : IHasETag

Application/EdFi.Ods.Api/Infrastructure/Pipelines/Factories/PipelineStepsProviders.cs

@@ -42,20 +42,6 @@ public Type[] GetSteps()
         }
     }
 
-    /// <summary>
-    /// Provides the core Ed-Fi ODS API steps for "GetTrackedDelete" access.
-    /// </summary>
-    public class GetDeletedResourceIdsPipelineStepsProvider : IGetDeletedResourceIdsPipelineStepsProvider
-    {
-        public Type[] GetSteps()
-        {
-            return new[]
-            {
-                typeof(GetDeletedResourceModelByIds<,,>),
-                   };
-        }
-    }
-
     /// <summary>
     /// Provides the core Ed-Fi ODS API steps for "Upsert" persistence.
     /// </summary>

Application/EdFi.Ods.Api/Repositories/InstanceSecurityRepository.cs

@@ -4,6 +4,7 @@
 using EdFi.Common;
 using EdFi.Ods.Api.Caching;
 using EdFi.Ods.Common.Context;
+using EdFi.Ods.Common.Exceptions;
 using EdFi.Security.DataAccess.Models;
 using Action = EdFi.Security.DataAccess.Models.Action;
 
@@ -53,7 +54,14 @@ public virtual Action GetActionByName(string actionName)
             var instanceSecurityRepoCacheObject = InstanceSecurityRepositoryCache.GetCache()
                 .GetSecurityRepository(instanceId);
 
-            return instanceSecurityRepoCacheObject.Actions.First(a => a.ActionName.Equals(actionName, StringComparison.InvariantCultureIgnoreCase));
+            var action = instanceSecurityRepoCacheObject.Actions.FirstOrDefault(a => a.ActionName.Equals(actionName, StringComparison.InvariantCultureIgnoreCase));
+
+            if (action == null)
+            {
+                throw new ApiSecurityConfigurationException($"Action '{actionName}' not found in the security metadata.");
+            }
+
+            return action;
         }
 
         public virtual AuthorizationStrategy GetAuthorizationStrategyByName(string authorizationStrategyName)

Application/EdFi.Ods.Common/Extensions/ResourceExtensions.cs

@@ -3,6 +3,7 @@
 // The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
 // See the LICENSE and NOTICES files in the project root for more information.
 
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
@@ -199,8 +200,10 @@ public static string SchemaUriSegment(this Resource resource) => resource
         /// </summary>
         /// <param name="resourceClass">The resource class that is being inspected.</param>
         /// <returns><b>true</b> if the resource class has a discriminator; otherwise <b>false</b>.</returns>
+        [Obsolete("This extension method doesn't make sense in the context of a resource that is derived and combines multiple entities. The Discriminator is an Entity-specific concept. Be explicit, and use the Entity's HasDiscriminator extension method instead.")]
         public static bool HasDiscriminator(this ResourceClassBase resourceClass)
         {
+            // NOTE: This returns unexpected values for resources that are derived.
             return resourceClass.Entity?.HasDiscriminator() == true;
         }