-
Notifications
You must be signed in to change notification settings - Fork 0
fix(raps): accept a create body without a role template id #320
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
rlorenzo
wants to merge
2
commits into
main
Choose a base branch
from
fix/raps-role-template-create-400
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+150
−1
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| using System.Text.Json; | ||
| using Viper.Areas.RAPS.Models; | ||
|
|
||
| namespace Viper.test.RAPS | ||
| { | ||
| // Controller tests build the model in C#, so only these catch a body shape that 400s | ||
| // during model binding, before the action runs. | ||
| public class RoleTemplateCreateUpdateTests | ||
| { | ||
| [Fact] | ||
| public void CreateBody_OmittingTheId_StillBinds() | ||
| { | ||
| // The create form has no id yet, so JSON.stringify drops roleTemplateId entirely. | ||
| var model = Deserialize(@"{""templateName"":""Reception"",""description"":""Front desk staff""}"); | ||
|
|
||
| Assert.Null(model.RoleTemplateId); | ||
| Assert.Equal("Reception", model.TemplateName); | ||
| Assert.Equal("Front desk staff", model.Description); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void UpdateBody_KeepsTheId() | ||
| { | ||
| var model = Deserialize(@"{""roleTemplateId"":5,""templateName"":""Reception""}"); | ||
|
|
||
| Assert.Equal(5, model.RoleTemplateId); | ||
| } | ||
|
|
||
| // JsonSerializerOptions.Web matches how MVC binds JSON bodies. | ||
| private static RoleTemplateCreateUpdate Deserialize(string body) | ||
| { | ||
| RoleTemplateCreateUpdate? model = JsonSerializer.Deserialize<RoleTemplateCreateUpdate>(body, JsonSerializerOptions.Web); | ||
|
|
||
| Assert.NotNull(model); | ||
| return model; | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| using Microsoft.AspNetCore.Mvc; | ||
| using Microsoft.Data.Sqlite; | ||
| using Microsoft.EntityFrameworkCore; | ||
| using Viper.Areas.RAPS.Controllers; | ||
| using Viper.Areas.RAPS.Models; | ||
| using Viper.Classes.SQLContext; | ||
| using Viper.Models.RAPS; | ||
|
|
||
| namespace Viper.test.RAPS | ||
| { | ||
| public class RoleTemplateCrudTests | ||
| { | ||
| [Theory] | ||
| [InlineData("Front desk staff", "Front desk staff")] | ||
| [InlineData(null, "")] | ||
| public async Task PostRoleTemplate_Creates_WhenBodyOmitsTheId(string? description, string expected) | ||
| { | ||
| using var connection = await OpenConnectionAsync(); | ||
| using var context = await CreateContextAsync(connection); | ||
| var controller = CreateController(context); | ||
|
|
||
| var result = await controller.PostRoleTemplate("VIPER", new RoleTemplateCreateUpdate | ||
| { | ||
| TemplateName = "Reception", | ||
| Description = description | ||
| }); | ||
|
|
||
| var saved = Assert.IsType<RoleTemplate>(Assert.IsType<CreatedAtActionResult>(result.Result).Value); | ||
| Assert.True(saved.RoleTemplateId > 0); | ||
| Assert.Equal("Reception", saved.TemplateName); | ||
| Assert.Equal(expected, saved.Description); | ||
| } | ||
|
|
||
| [Fact] | ||
| public async Task PutRoleTemplate_Updates_WhenBodyIdMatchesRoute() | ||
| { | ||
| using var connection = await OpenConnectionAsync(); | ||
| using var context = await CreateContextAsync(connection); | ||
| var existing = await SeedTemplateAsync(context); | ||
| var controller = CreateController(context); | ||
|
|
||
| var result = await controller.PutRoleTemplate("VIPER", existing.RoleTemplateId, new RoleTemplateCreateUpdate | ||
| { | ||
| RoleTemplateId = existing.RoleTemplateId, | ||
| TemplateName = "Renamed", | ||
| Description = "Updated" | ||
| }); | ||
|
|
||
| Assert.IsType<NoContentResult>(result); | ||
|
|
||
| // Reload untracked: asserting on the tracked entity would pass on an in-memory | ||
| // mutation even if the save never reached the database. | ||
| context.ChangeTracker.Clear(); | ||
| RoleTemplate reloaded = await context.RoleTemplates.AsNoTracking() | ||
| .SingleAsync(t => t.RoleTemplateId == existing.RoleTemplateId, TestContext.Current.CancellationToken); | ||
| Assert.Equal("Renamed", reloaded.TemplateName); | ||
| Assert.Equal("Updated", reloaded.Description); | ||
| } | ||
|
|
||
| [Fact] | ||
| public async Task PutRoleTemplate_ReturnsBadRequest_WhenBodyOmitsTheId() | ||
| { | ||
| // Nullable for the create form, but an update still has to agree with the route id. | ||
| using var connection = await OpenConnectionAsync(); | ||
| using var context = await CreateContextAsync(connection); | ||
| var existing = await SeedTemplateAsync(context); | ||
| var controller = CreateController(context); | ||
|
|
||
| var result = await controller.PutRoleTemplate("VIPER", existing.RoleTemplateId, new RoleTemplateCreateUpdate | ||
| { | ||
| TemplateName = "Renamed" | ||
| }); | ||
|
|
||
| Assert.IsType<BadRequestResult>(result); | ||
| } | ||
|
|
||
| private static async Task<SqliteConnection> OpenConnectionAsync() | ||
| { | ||
| var connection = new SqliteConnection("Filename=:memory:"); | ||
| await connection.OpenAsync(TestContext.Current.CancellationToken); | ||
| return connection; | ||
| } | ||
|
|
||
| private static async Task<RAPSContext> CreateContextAsync(SqliteConnection connection) | ||
| { | ||
| var options = new DbContextOptionsBuilder<RAPSContext>() | ||
| .UseSqlite(connection) | ||
| .Options; | ||
| var context = new RAPSContext(options); | ||
| await context.Database.EnsureCreatedAsync(TestContext.Current.CancellationToken); | ||
| return context; | ||
| } | ||
|
|
||
| // The AAUD context only reaches the cache service, which neither create nor update touches. | ||
| private static RoleTemplatesController CreateController(RAPSContext context) | ||
| { | ||
| var aaudContext = new AAUDContext(new DbContextOptionsBuilder<AAUDContext>() | ||
| .UseInMemoryDatabase("AAUD_" + Guid.NewGuid()).Options); | ||
| return new RoleTemplatesController(context, aaudContext); | ||
| } | ||
|
|
||
| private static async Task<RoleTemplate> SeedTemplateAsync(RAPSContext context) | ||
| { | ||
| var template = new RoleTemplate { TemplateName = "Reception", Description = "Front desk staff" }; | ||
| context.RoleTemplates.Add(template); | ||
| await context.SaveChangesAsync(TestContext.Current.CancellationToken); | ||
| return template; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.