Skip to content
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.

Sign up for GitHub

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

EES-4046: Add functionality to delete draft releases #5224

Merged
merged 3 commits into from
Sep 23, 2024
Merged

EES-4046: Add functionality to delete draft releases #5224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c751fe
EES-4046: Add backend functionality to hard-delete draft releases.
Sep 6, 2024
d433a2c
EES-4046: Add frontend UI to delete draft releases.
Sep 6, 2024
ba89f85
EES-4046: Update delete permission for readability, delete associated…
Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions ...ucation.ExploreEducationStatistics.Admin.Tests/Controllers/Api/ReleasesControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
#nullable enable
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using GovUk.Education.ExploreEducationStatistics.Admin.Controllers.Api;
using GovUk.Education.ExploreEducationStatistics.Admin.Models;
using GovUk.Education.ExploreEducationStatistics.Admin.Requests;
Expand All @@ -15,7 +12,10 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Moq;
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using static GovUk.Education.ExploreEducationStatistics.Admin.Validators.ValidationErrorMessages;
using static GovUk.Education.ExploreEducationStatistics.Admin.Validators.ValidationUtils;
using static GovUk.Education.ExploreEducationStatistics.Common.Services.CollectionUtils;
Expand Down Expand Up @@ -321,15 +321,13 @@ public async Task DeleteReleaseVersion_Returns_NoContent()
{
var releaseService = new Mock<IReleaseService>(Strict);

var fileId = Guid.NewGuid();

releaseService
.Setup(service => service.DeleteReleaseVersion(_releaseVersionId))
.Setup(service => service.DeleteReleaseVersion(_releaseVersionId, default))
.ReturnsAsync(Unit.Instance);

var controller = BuildController(releaseService: releaseService.Object);

var result = await controller.DeleteReleaseVersion(_releaseVersionId);
var result = await controller.DeleteReleaseVersion(_releaseVersionId, default);
VerifyAllMocks(releaseService);

Assert.IsAssignableFrom<NoContentResult>(result);
Expand All @@ -340,15 +338,13 @@ public async Task DeleteReleaseVersion_Returns_NotFound()
{
var releaseService = new Mock<IReleaseService>(Strict);

var fileId = Guid.NewGuid();

releaseService
.Setup(service => service.DeleteReleaseVersion(_releaseVersionId))
.Setup(service => service.DeleteReleaseVersion(_releaseVersionId, default))
.ReturnsAsync(new NotFoundResult());

var controller = BuildController(releaseService: releaseService.Object);

var result = await controller.DeleteReleaseVersion(_releaseVersionId);
var result = await controller.DeleteReleaseVersion(_releaseVersionId, default);
VerifyAllMocks(releaseService);

result.AssertNotFoundResult();
Expand All @@ -359,10 +355,8 @@ public async Task DeleteReleaseVersion_Returns_ValidationProblem()
{
var releaseService = new Mock<IReleaseService>(Strict);

var fileId = Guid.NewGuid();

releaseService
.Setup(service => service.DeleteReleaseVersion(_releaseVersionId))
.Setup(service => service.DeleteReleaseVersion(_releaseVersionId, default))
.ReturnsAsync(ValidationUtils.ValidationResult(new ErrorViewModel
{
Code = "error code",
Expand All @@ -371,7 +365,7 @@ public async Task DeleteReleaseVersion_Returns_ValidationProblem()

var controller = BuildController(releaseService: releaseService.Object);

var result = await controller.DeleteReleaseVersion(_releaseVersionId);
var result = await controller.DeleteReleaseVersion(_releaseVersionId, default);
VerifyAllMocks(releaseService);

var validationProblem = result.AssertBadRequestWithValidationProblem();
Expand Down
Loading