Fix cibuild (database isolation)

Bart Koelman · Bart Koelman · commit b17c4d092d5f · 2020-05-12T15:53:57.000+02:00
diff --git a/Build.ps1 b/Build.ps1
@@ -29,6 +29,9 @@ CheckLastExitCode
 
 # Workaround: running 'dotnet test -c Release' fails for yet unknown reasons on AppVeyor, so we run tests one by one.
 
+dotnet test ./test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj -c Release --no-build
+CheckLastExitCode
+
 dotnet test ./test/JsonApiDotNetCoreExampleTests/JsonApiDotNetCoreExampleTests.csproj -c Release --no-build
 CheckLastExitCode
 
@@ -41,9 +44,6 @@ CheckLastExitCode
 dotnet test ./test/UnitTests/UnitTests.csproj -c Release --no-build
 CheckLastExitCode
 
-dotnet test ./test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj -c Release --no-build
-CheckLastExitCode
-
 Write-Output "APPVEYOR_REPO_TAG: $env:APPVEYOR_REPO_TAG"
 
 If($env:APPVEYOR_REPO_TAG -eq $true) {
@@ -62,7 +62,7 @@ If($env:APPVEYOR_REPO_TAG -eq $true) {
     }
 }
 Else { 
-    Write-Output "VERSION-SUFFIX: alpha1-$revision"
+    Write-Output "VERSION-SUFFIX: alpha5-$revision"
     Write-Output "RUNNING dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=alpha1-$revision"
     dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=alpha1-$revision --include-symbols
     CheckLastExitCode
diff --git a/appveyor.yml b/appveyor.yml
@@ -2,13 +2,8 @@ version: '{build}'
 os: Visual Studio 2019
 
 environment:
-  POSTGRES_PORT: tcp://localhost:5432
-  POSTGRES_ENV_POSTGRES_USER: postgres
-  POSTGRES_ENV_POSTGRES_PASSWORD: Password12!
-  POSTGRES_ENV_POSTGRES_DB: JsonApiDotNetCoreExample
   PGUSER: postgres
   PGPASSWORD: Password12!
-  Data:DefaultConnection: "Host=localhost;Port=5432;Database=JsonApiDotNetCoreExample;User ID=postgres;Password=Password12!"
   ACCESS_TOKEN:
     secure: g1T332Uarmdgtkftchpafa8tDP/7eM4O0BD6iu1wu+zR224IyH5R8pb4sTChr4Ia
 
@@ -63,10 +58,9 @@ init:
   - SET PATH=C:\Program Files\PostgreSQL\9.6\bin\;%PATH%
 
 services:  
-  - postgresql
+  - postgresql96
 
 build_script:
-- ps: createdb JsonApiDotNetCoreExample
 - ps: dotnet --version
 - ps: .\Build.ps1
 
diff --git a/src/Examples/JsonApiDotNetCoreExample/Startups/NoDefaultPageSizeStartup.cs b/src/Examples/JsonApiDotNetCoreExample/Startups/NoDefaultPageSizeStartup.cs
@@ -9,7 +9,9 @@ namespace JsonApiDotNetCoreExample
     /// </summary>
     public sealed class NoDefaultPageSizeStartup : TestStartup
     {
-        public NoDefaultPageSizeStartup(IWebHostEnvironment env) : base(env) { }
+        public NoDefaultPageSizeStartup(IWebHostEnvironment env) : base(env)
+        {
+        }
 
         protected override void ConfigureJsonApiOptions(JsonApiOptions options)
         {
diff --git a/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs b/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs
@@ -16,7 +16,7 @@ namespace JsonApiDotNetCoreExample
 {
     public class Startup
     {
-        public readonly IConfiguration Config;
+        private readonly string _connectionString;
 
         public Startup(IWebHostEnvironment env)
         {
@@ -25,7 +25,10 @@ public Startup(IWebHostEnvironment env)
                 .AddJsonFile("appsettings.json", optional: true, reloadOnChange: false)
                 .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
                 .AddEnvironmentVariables();
-            Config = builder.Build();
+            var configuration = builder.Build();
+            
+            string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
+            _connectionString = configuration["Data:DefaultConnection"].Replace("###", postgresPassword);
         }
 
         public virtual void ConfigureServices(IServiceCollection services)
@@ -40,7 +43,7 @@ public virtual void ConfigureServices(IServiceCollection services)
                 {
                     options
                         .EnableSensitiveDataLogging()
-                        .UseNpgsql(GetDbConnectionString(), innerOptions => innerOptions.SetPostgresVersion(new Version(9,6)));
+                        .UseNpgsql(_connectionString, innerOptions => innerOptions.SetPostgresVersion(new Version(9,6)));
                 }, ServiceLifetime.Transient)
                 .AddJsonApi<AppDbContext>(ConfigureJsonApiOptions, discovery => discovery.AddCurrentAssembly());
             
@@ -72,7 +75,5 @@ public void Configure(
             context.Database.EnsureCreated();
             app.UseJsonApi();
         }
-
-        public string GetDbConnectionString() => Config["Data:DefaultConnection"];
     }
 }
diff --git a/src/Examples/JsonApiDotNetCoreExample/appsettings.json b/src/Examples/JsonApiDotNetCoreExample/appsettings.json
@@ -1,6 +1,6 @@
 {
     "Data": {
-        "DefaultConnection": "Host=localhost;Port=5432;Database=JsonApiDotNetCoreExample;User ID=postgres;Password=postgres"
+        "DefaultConnection": "Host=localhost;Port=5432;Database=JsonApiDotNetCoreExample;User ID=postgres;Password=###"
     },
     "Logging": {
         "LogLevel": {
diff --git a/src/Examples/NoEntityFrameworkExample/Controllers/WorkItemsController.cs b/src/Examples/NoEntityFrameworkExample/Controllers/WorkItemsController.cs
@@ -6,12 +6,12 @@
 
 namespace NoEntityFrameworkExample.Controllers
 {
-    public sealed class TodoItemsController : JsonApiController<TodoItem>
+    public sealed class WorkItemsController : JsonApiController<WorkItem>
     {
-        public TodoItemsController(
+        public WorkItemsController(
             IJsonApiOptions jsonApiOptions,
             ILoggerFactory loggerFactory,
-            IResourceService<TodoItem> resourceService)
+            IResourceService<WorkItem> resourceService)
             : base(jsonApiOptions, loggerFactory, resourceService)
         { }
     }
diff --git a/src/Examples/NoEntityFrameworkExample/Data/AppDbContext.cs b/src/Examples/NoEntityFrameworkExample/Data/AppDbContext.cs
@@ -5,7 +5,7 @@ namespace NoEntityFrameworkExample.Data
 {
     public sealed class AppDbContext : DbContext
     {
-        public DbSet<TodoItem> TodoItems { get; set; }
+        public DbSet<WorkItem> WorkItems { get; set; }
 
         public AppDbContext(DbContextOptions<AppDbContext> options)
             : base(options)
diff --git a/src/Examples/NoEntityFrameworkExample/Models/TodoItem.cs b/src/Examples/NoEntityFrameworkExample/Models/TodoItem.cs
diff --git a/src/Examples/NoEntityFrameworkExample/Models/WorkItem.cs b/src/Examples/NoEntityFrameworkExample/Models/WorkItem.cs
@@ -0,0 +1,20 @@
+using System;
+using JsonApiDotNetCore.Models;
+
+namespace NoEntityFrameworkExample.Models
+{
+    public sealed class WorkItem : Identifiable
+    {
+        [Attr]
+        public bool IsBlocked { get; set; }
+
+        [Attr]
+        public string Title { get; set; }
+
+        [Attr]
+        public long DurationInHours { get; set; }
+
+        [Attr]
+        public Guid ProjectId { get; set; } = Guid.NewGuid();
+    }
+}
diff --git a/src/Examples/NoEntityFrameworkExample/Services/WorkItemService.cs b/src/Examples/NoEntityFrameworkExample/Services/WorkItemService.cs
@@ -11,25 +11,26 @@
 
 namespace NoEntityFrameworkExample.Services
 {
-    public sealed class TodoItemService : IResourceService<TodoItem>
+    public sealed class WorkItemService : IResourceService<WorkItem>
     {
         private readonly string _connectionString;
 
-        public TodoItemService(IConfiguration configuration)
+        public WorkItemService(IConfiguration configuration)
         {
-            _connectionString = configuration["Data:DefaultConnection"];
+            string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
+            _connectionString = configuration["Data:DefaultConnection"].Replace("###", postgresPassword);
         }
 
-        public async Task<IEnumerable<TodoItem>> GetAsync()
+        public async Task<IEnumerable<WorkItem>> GetAsync()
         {
             return await QueryAsync(async connection =>
-                await connection.QueryAsync<TodoItem>(@"select * from ""TodoItems"""));
+                await connection.QueryAsync<WorkItem>(@"select * from ""WorkItems"""));
         }
 
-        public async Task<TodoItem> GetAsync(int id)
+        public async Task<WorkItem> GetAsync(int id)
         {
             var query = await QueryAsync(async connection =>
-                await connection.QueryAsync<TodoItem>(@"select * from ""TodoItems"" where ""Id""=@id", new { id }));
+                await connection.QueryAsync<WorkItem>(@"select * from ""WorkItems"" where ""Id""=@id", new { id }));
 
             return query.Single();
         }
@@ -39,28 +40,28 @@ public Task<object> GetRelationshipAsync(int id, string relationshipName)
             throw new NotImplementedException();
         }
 
-        public Task<TodoItem> GetRelationshipsAsync(int id, string relationshipName)
+        public Task<WorkItem> GetRelationshipsAsync(int id, string relationshipName)
         {
             throw new NotImplementedException();
         }
 
-        public async Task<TodoItem> CreateAsync(TodoItem entity)
+        public async Task<WorkItem> CreateAsync(WorkItem entity)
         {
             return (await QueryAsync(async connection =>
             {
-                var query = @"insert into ""TodoItems"" (""Description"", ""IsLocked"", ""Ordinal"", ""UniqueId"") values (@description, @isLocked, @ordinal, @uniqueId) returning ""Id"", ""Description"", ""IsLocked"", ""Ordinal"", ""UniqueId""";
-                var result = await connection.QueryAsync<TodoItem>(query, new { description = entity.Description, ordinal = entity.Ordinal, uniqueId = entity.UniqueId, isLocked = entity.IsLocked });
+                var query = @"insert into ""WorkItems"" (""Title"", ""IsBlocked"", ""DurationInHours"", ""ProjectId"") values (@description, @isLocked, @ordinal, @uniqueId) returning ""Id"", ""Title"", ""IsBlocked"", ""DurationInHours"", ""ProjectId""";
+                var result = await connection.QueryAsync<WorkItem>(query, new { description = entity.Title, ordinal = entity.DurationInHours, uniqueId = entity.ProjectId, isLocked = entity.IsBlocked });
                 return result;
             })).SingleOrDefault();
         }
 
         public async Task DeleteAsync(int id)
         {
             await QueryAsync(async connection =>
-                await connection.QueryAsync<TodoItem>(@"delete from ""TodoItems"" where ""Id""=@id", new { id }));
+                await connection.QueryAsync<WorkItem>(@"delete from ""WorkItems"" where ""Id""=@id", new { id }));
         }
 
-        public Task<TodoItem> UpdateAsync(int id, TodoItem entity)
+        public Task<WorkItem> UpdateAsync(int id, WorkItem entity)
         {
             throw new NotImplementedException();
         }
diff --git a/src/Examples/NoEntityFrameworkExample/Startup.cs b/src/Examples/NoEntityFrameworkExample/Startup.cs
@@ -17,18 +17,19 @@ public class Startup
 
         public Startup(IConfiguration configuration)
         {
-            _connectionString = configuration["Data:DefaultConnection"];
+            string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
+            _connectionString = configuration["Data:DefaultConnection"].Replace("###", postgresPassword);
         }
 
         // This method gets called by the runtime. Use this method to add services to the container.
-        public virtual void ConfigureServices(IServiceCollection services)
+        public void ConfigureServices(IServiceCollection services)
         {
             services.AddJsonApi(
                 options => options.Namespace = "api/v1",
-                resources: builder => builder.AddResource<TodoItem>("todoItems")
+                resources: builder => builder.AddResource<WorkItem>("workItems")
             );
 
-            services.AddScoped<IResourceService<TodoItem>, TodoItemService>();
+            services.AddScoped<IResourceService<WorkItem>, WorkItemService>();
 
             services.AddDbContext<AppDbContext>(options =>
             {
diff --git a/src/Examples/NoEntityFrameworkExample/appsettings.json b/src/Examples/NoEntityFrameworkExample/appsettings.json
@@ -1,6 +1,6 @@
 {
     "Data": {
-        "DefaultConnection": "Host=localhost;Port=5432;Database=NoEntityFrameworkExample;User ID=postgres;Password=postgres"
+        "DefaultConnection": "Host=localhost;Port=5432;Database=NoEntityFrameworkExample;User ID=postgres;Password=###"
     },
     "Logging": {
         "LogLevel": {
diff --git a/test/NoEntityFrameworkTests/WorkItemTests.cs b/test/NoEntityFrameworkTests/WorkItemTests.cs

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,9 @@ namespace JsonApiDotNetCoreExample`
`9`	`9`	`/// </summary>`
`10`	`10`	`public sealed class NoDefaultPageSizeStartup : TestStartup`
`11`	`11`	`{`
`12`		`- public NoDefaultPageSizeStartup(IWebHostEnvironment env) : base(env) { }`
	`12`	`+ public NoDefaultPageSizeStartup(IWebHostEnvironment env) : base(env)`
	`13`	`+ {`
	`14`	`+ }`
`13`	`15`
`14`	`16`	`protected override void ConfigureJsonApiOptions(JsonApiOptions options)`
`15`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace JsonApiDotNetCoreExample`
`16`	`16`	`{`
`17`	`17`	`public class Startup`
`18`	`18`	`{`
`19`		`- public readonly IConfiguration Config;`
	`19`	`+ private readonly string _connectionString;`
`20`	`20`
`21`	`21`	`public Startup(IWebHostEnvironment env)`
`22`	`22`	`{`
`@@ -25,7 +25,10 @@ public Startup(IWebHostEnvironment env)`
`25`	`25`	`.AddJsonFile("appsettings.json", optional: true, reloadOnChange: false)`
`26`	`26`	`.AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)`
`27`	`27`	`.AddEnvironmentVariables();`
`28`		`- Config = builder.Build();`
	`28`	`+ var configuration = builder.Build();`
	`29`	`+`
	`30`	`+ string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";`
	`31`	`+ _connectionString = configuration["Data:DefaultConnection"].Replace("###", postgresPassword);`
`29`	`32`	`}`
`30`	`33`
`31`	`34`	`public virtual void ConfigureServices(IServiceCollection services)`
`@@ -40,7 +43,7 @@ public virtual void ConfigureServices(IServiceCollection services)`
`40`	`43`	`{`
`41`	`44`	`options`
`42`	`45`	`.EnableSensitiveDataLogging()`
`43`		`- .UseNpgsql(GetDbConnectionString(), innerOptions => innerOptions.SetPostgresVersion(new Version(9,6)));`
	`46`	`+ .UseNpgsql(_connectionString, innerOptions => innerOptions.SetPostgresVersion(new Version(9,6)));`
`44`	`47`	`}, ServiceLifetime.Transient)`
`45`	`48`	`.AddJsonApi<AppDbContext>(ConfigureJsonApiOptions, discovery => discovery.AddCurrentAssembly());`
`46`	`49`
`@@ -72,7 +75,5 @@ public void Configure(`
`72`	`75`	`context.Database.EnsureCreated();`
`73`	`76`	`app.UseJsonApi();`
`74`	`77`	`}`
`75`		`-`
`76`		`- public string GetDbConnectionString() => Config["Data:DefaultConnection"];`
`77`	`78`	`}`
`78`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"Data": {`
`3`		`- "DefaultConnection": "Host=localhost;Port=5432;Database=JsonApiDotNetCoreExample;User ID=postgres;Password=postgres"`
	`3`	`+ "DefaultConnection": "Host=localhost;Port=5432;Database=JsonApiDotNetCoreExample;User ID=postgres;Password=###"`
`4`	`4`	`},`
`5`	`5`	`"Logging": {`
`6`	`6`	`"LogLevel": {`
Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,12 @@`
`6`	`6`
`7`	`7`	`namespace NoEntityFrameworkExample.Controllers`
`8`	`8`	`{`
`9`		`- public sealed class TodoItemsController : JsonApiController<TodoItem>`
	`9`	`+ public sealed class WorkItemsController : JsonApiController<WorkItem>`
`10`	`10`	`{`
`11`		`- public TodoItemsController(`
	`11`	`+ public WorkItemsController(`
`12`	`12`	`IJsonApiOptions jsonApiOptions,`
`13`	`13`	`ILoggerFactory loggerFactory,`
`14`		`- IResourceService<TodoItem> resourceService)`
	`14`	`+ IResourceService<WorkItem> resourceService)`
`15`	`15`	`: base(jsonApiOptions, loggerFactory, resourceService)`
`16`	`16`	`{ }`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace NoEntityFrameworkExample.Data`
`5`	`5`	`{`
`6`	`6`	`public sealed class AppDbContext : DbContext`
`7`	`7`	`{`
`8`		`- public DbSet<TodoItem> TodoItems { get; set; }`
	`8`	`+ public DbSet<WorkItem> WorkItems { get; set; }`
`9`	`9`
`10`	`10`	`public AppDbContext(DbContextOptions<AppDbContext> options)`
`11`	`11`	`: base(options)`
Original file line number	Diff line number	Diff line change
`@@ -11,25 +11,26 @@`
`11`	`11`
`12`	`12`	`namespace NoEntityFrameworkExample.Services`
`13`	`13`	`{`
`14`		`- public sealed class TodoItemService : IResourceService<TodoItem>`
	`14`	`+ public sealed class WorkItemService : IResourceService<WorkItem>`
`15`	`15`	`{`
`16`	`16`	`private readonly string _connectionString;`
`17`	`17`
`18`		`- public TodoItemService(IConfiguration configuration)`
	`18`	`+ public WorkItemService(IConfiguration configuration)`
`19`	`19`	`{`
`20`		`- _connectionString = configuration["Data:DefaultConnection"];`
	`20`	`+ string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";`
	`21`	`+ _connectionString = configuration["Data:DefaultConnection"].Replace("###", postgresPassword);`
`21`	`22`	`}`
`22`	`23`
`23`		`- public async Task<IEnumerable<TodoItem>> GetAsync()`
	`24`	`+ public async Task<IEnumerable<WorkItem>> GetAsync()`
`24`	`25`	`{`
`25`	`26`	`return await QueryAsync(async connection =>`
`26`		`- await connection.QueryAsync<TodoItem>(@"select * from ""TodoItems"""));`
	`27`	`+ await connection.QueryAsync<WorkItem>(@"select * from ""WorkItems"""));`
`27`	`28`	`}`
`28`	`29`
`29`		`- public async Task<TodoItem> GetAsync(int id)`
	`30`	`+ public async Task<WorkItem> GetAsync(int id)`
`30`	`31`	`{`
`31`	`32`	`var query = await QueryAsync(async connection =>`
`32`		`- await connection.QueryAsync<TodoItem>(@"select * from ""TodoItems"" where ""Id""=@id", new { id }));`
	`33`	`+ await connection.QueryAsync<WorkItem>(@"select * from ""WorkItems"" where ""Id""=@id", new { id }));`
`33`	`34`
`34`	`35`	`return query.Single();`
`35`	`36`	`}`
`@@ -39,28 +40,28 @@ public Task<object> GetRelationshipAsync(int id, string relationshipName)`
`39`	`40`	`throw new NotImplementedException();`
`40`	`41`	`}`
`41`	`42`
`42`		`- public Task<TodoItem> GetRelationshipsAsync(int id, string relationshipName)`
	`43`	`+ public Task<WorkItem> GetRelationshipsAsync(int id, string relationshipName)`
`43`	`44`	`{`
`44`	`45`	`throw new NotImplementedException();`
`45`	`46`	`}`
`46`	`47`
`47`		`- public async Task<TodoItem> CreateAsync(TodoItem entity)`
	`48`	`+ public async Task<WorkItem> CreateAsync(WorkItem entity)`
`48`	`49`	`{`
`49`	`50`	`return (await QueryAsync(async connection =>`
`50`	`51`	`{`
`51`		`- var query = @"insert into ""TodoItems"" (""Description"", ""IsLocked"", ""Ordinal"", ""UniqueId"") values (@description, @isLocked, @ordinal, @uniqueId) returning ""Id"", ""Description"", ""IsLocked"", ""Ordinal"", ""UniqueId""";`
`52`		`- var result = await connection.QueryAsync<TodoItem>(query, new { description = entity.Description, ordinal = entity.Ordinal, uniqueId = entity.UniqueId, isLocked = entity.IsLocked });`
	`52`	`+ var query = @"insert into ""WorkItems"" (""Title"", ""IsBlocked"", ""DurationInHours"", ""ProjectId"") values (@description, @isLocked, @ordinal, @uniqueId) returning ""Id"", ""Title"", ""IsBlocked"", ""DurationInHours"", ""ProjectId""";`
	`53`	`+ var result = await connection.QueryAsync<WorkItem>(query, new { description = entity.Title, ordinal = entity.DurationInHours, uniqueId = entity.ProjectId, isLocked = entity.IsBlocked });`
`53`	`54`	`return result;`
`54`	`55`	`})).SingleOrDefault();`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`public async Task DeleteAsync(int id)`
`58`	`59`	`{`
`59`	`60`	`await QueryAsync(async connection =>`
`60`		`- await connection.QueryAsync<TodoItem>(@"delete from ""TodoItems"" where ""Id""=@id", new { id }));`
	`61`	`+ await connection.QueryAsync<WorkItem>(@"delete from ""WorkItems"" where ""Id""=@id", new { id }));`
`61`	`62`	`}`
`62`	`63`
`63`		`- public Task<TodoItem> UpdateAsync(int id, TodoItem entity)`
	`64`	`+ public Task<WorkItem> UpdateAsync(int id, WorkItem entity)`
`64`	`65`	`{`
`65`	`66`	`throw new NotImplementedException();`
`66`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,18 +17,19 @@ public class Startup`
`17`	`17`
`18`	`18`	`public Startup(IConfiguration configuration)`
`19`	`19`	`{`
`20`		`- _connectionString = configuration["Data:DefaultConnection"];`
	`20`	`+ string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";`
	`21`	`+ _connectionString = configuration["Data:DefaultConnection"].Replace("###", postgresPassword);`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`// This method gets called by the runtime. Use this method to add services to the container.`
`24`		`- public virtual void ConfigureServices(IServiceCollection services)`
	`25`	`+ public void ConfigureServices(IServiceCollection services)`
`25`	`26`	`{`
`26`	`27`	`services.AddJsonApi(`
`27`	`28`	`options => options.Namespace = "api/v1",`
`28`		`- resources: builder => builder.AddResource<TodoItem>("todoItems")`
	`29`	`+ resources: builder => builder.AddResource<WorkItem>("workItems")`
`29`	`30`	`);`
`30`	`31`
`31`		`- services.AddScoped<IResourceService<TodoItem>, TodoItemService>();`
	`32`	`+ services.AddScoped<IResourceService<WorkItem>, WorkItemService>();`
`32`	`33`
`33`	`34`	`services.AddDbContext<AppDbContext>(options =>`
`34`	`35`	`{`