Skip Create/Update models for views; improve DI setup

Author: pwelter34

sample/Tracker/Tracker.Web/Startup.cs

@@ -1,12 +1,12 @@
-using AutoMapper;
+using AutoMapper;
 using FluentValidation;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Tracker.Core.Data;
 
 namespace Tracker.Web
@@ -28,7 +28,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddDbContext<TrackerContext>(options => options.UseSqlServer(connectionString));
 
             // register AutoMapper profiles
-            services.AddAutoMapper(typeof(TrackerContext));
+            services.AddAutoMapper(cfg => { }, typeof(TrackerContext).Assembly);
 
             // register validation
             services.Scan(x =>

src/EntityFrameworkCore.Generator.Core/ModelGenerator.cs

@@ -512,9 +512,9 @@ private void GetModels(Entity? entity)
 
         if (_options.Model.Read.Generate)
             CreateModel(entity, _options.Model.Read, ModelType.Read);
-        if (_options.Model.Create.Generate)
+        if (!entity.IsView && _options.Model.Create.Generate)
             CreateModel(entity, _options.Model.Create, ModelType.Create);
-        if (_options.Model.Update.Generate)
+        if (!entity.IsView && _options.Model.Update.Generate)
             CreateModel(entity, _options.Model.Update, ModelType.Update);
 
         if (entity.Models.Count > 0)

test/EntityFrameworkCore.Generator.Core.Tests/EntityFrameworkCore.Generator.Core.Tests.csproj

@@ -24,8 +24,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="dbup-sqlserver" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.7" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.7" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">

test/EntityFrameworkCore.Generator.Core.Tests/ModelGeneratorTests.cs

@@ -1,5 +1,6 @@
 using System.Linq;
 
+using EntityFrameworkCore.Generator.Metadata.Generation;
 using EntityFrameworkCore.Generator.Options;
 
 using Microsoft.EntityFrameworkCore.Scaffolding.Metadata;
@@ -149,6 +150,57 @@ public void GenerateModelsCheckNames()
 
     }
 
+    [Fact]
+    public void GenerateViewModelsSkipsCreateAndUpdateModels()
+    {
+        var generatorOptions = new GeneratorOptions();
+        generatorOptions.Model.Read.Generate = true;
+        generatorOptions.Model.Create.Generate = true;
+        generatorOptions.Model.Update.Generate = true;
+
+        var databaseModel = new DatabaseModel
+        {
+            DatabaseName = "TestDatabase",
+            DefaultSchema = "dbo"
+        };
+        var testView = new DatabaseView
+        {
+            Database = databaseModel,
+            Name = "TestView",
+            Schema = "dbo"
+        };
+        databaseModel.Tables.Add(testView);
+
+        var identifierColumn = new DatabaseColumn
+        {
+            Table = testView,
+            Name = "Id",
+            IsNullable = false,
+            StoreType = "int"
+        };
+        testView.Columns.Add(identifierColumn);
+
+        var nameColumn = new DatabaseColumn
+        {
+            Table = testView,
+            Name = "Name",
+            IsNullable = true,
+            StoreType = "varchar(50)"
+        };
+        testView.Columns.Add(nameColumn);
+        var generator = new ModelGenerator(NullLoggerFactory.Instance);
+
+        var typeMappingSource = CreateTypeMappingSource();
+
+        var result = generator.Generate(generatorOptions, databaseModel, typeMappingSource);
+        Assert.Single(result.Entities);
+
+        var firstEntity = result.Entities[0];
+        Assert.True(firstEntity.IsView);
+        Assert.Single(firstEntity.Models);
+        Assert.Equal(ModelType.Read, firstEntity.Models[0].ModelType);
+    }
+
     [Fact]
     public void GenerateWithSymbolInDatabaseName()
     {