Merge branch 'master' of https://github.com/loresoft/EntityFrameworkCore.Generator

Author: pwelter34

.github/workflows/docs.yml

@@ -34,7 +34,7 @@ jobs:
 
       - name: Upload Documentation
         if: success()
-        uses: actions/upload-pages-artifact@v4
+        uses: actions/upload-pages-artifact@v5
         with:
           name: github-pages
           path: "site/"
@@ -51,7 +51,7 @@ jobs:
     steps:
       - name: Deploy Documentation
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v5
 
     environment:
       name: github-pages

.github/workflows/dotnet.yml

@@ -71,7 +71,7 @@ jobs:
 
       - name: Upload Packages
         if: success() && github.event_name != 'pull_request'
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: packages
           path: "${{env.BUILD_PATH}}"

.github/workflows/merge.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Dependabot Metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2
+        uses: dependabot/fetch-metadata@v3
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

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

@@ -514,9 +514,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/ModelGeneratorTests.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Data;
 
+using EntityFrameworkCore.Generator.Metadata.Generation;
 using EntityFrameworkCore.Generator.Options;
 
 using Microsoft.Extensions.Logging.Abstractions;
@@ -94,6 +95,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()
     {