Skip to content

Commit

Permalink
Merge pull request #5045 from dfe-analytical-services/dev
Browse files Browse the repository at this point in the history 
Merge dev into Master
  • Loading branch information
@N-moh
N-moh authored Jul 11, 2024
2 parents d6a96a0 + ca0c8c6 commit f3c583d
Show file tree
Hide file tree
Showing 181 changed files with 8,620 additions and 3,559 deletions.
6 changes: 3 additions & 3 deletions infrastructure/templates/public-api/components/functionApp.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ param appServicePlanOS string = 'Linux'
])
param functionAppRuntime string = 'dotnet'

@description('Specifies the additional setting to add to the functionapp.')
param settings object = {}
@description('Specifies the additional setting to add to the Function App')
param appSettings object = {}

@description('A set of tags with which to tag the resource in Azure')
param tagValues object
Expand Down Expand Up @@ -401,7 +401,7 @@ module functionAppSlotSettings 'appServiceSlotConfig.bicep' = {
// site is being viewed.
'SLOT_NAME'
]
commonSettings: union(settings, {
commonSettings: union(appSettings, {

// This tells the Function App where to store its "azure-webjobs-hosts" and "azure-webjobs-secrets" files.
AzureWebJobsStorage: '@Microsoft.KeyVault(VaultName=${keyVaultName};SecretName=${sharedStorageAccountModule.outputs.connectionStringSecretName})'
Expand Down
3 changes: 3 additions & 0 deletions infrastructure/templates/public-api/main.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,9 @@ module dataProcessorFunctionAppModule 'components/functionApp.bicep' = {
path: '/api/HealthCheck'
unhealthyMetricName: '${subscription}PublicDataProcessorUnhealthy'
}
appSettings: {
AppSettings__MetaInsertBatchSize: 1000
}
azureFileShares: [{
storageName: dataFilesFileShareModule.outputs.fileShareName
storageAccountKey: publicApiStorageAccountAccessKey
Expand Down
2,023 changes: 2,023 additions & 0 deletions ...tatistics.Admin.Tests/Controllers/Api/Public.Data/DataSetVersionMappingControllerTests.cs
View file

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions src/GovUk.Education.ExploreEducationStatistics.Admin.Tests/Fixture/TestApplicationFactory.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#nullable enable
using System.Linq;
using System.Threading.Tasks;
using GovUk.Education.ExploreEducationStatistics.Common.Tests.Extensions;
using GovUk.Education.ExploreEducationStatistics.Common.Tests.Fixtures;
Expand Down Expand Up @@ -40,10 +39,12 @@ protected override IHostBuilder CreateHostBuilder()
.ConfigureServices(services =>
{
services.AddDbContext<PublicDataDbContext>(
options => options
.UseNpgsql(
options =>
{
options.UseNpgsql(
_postgreSqlContainer.GetConnectionString(),
psqlOptions => psqlOptions.EnableRetryOnFailure()));
psqlOptions => psqlOptions.EnableRetryOnFailure());
});
using var serviceScope = services.BuildServiceProvider()
.GetRequiredService<IServiceScopeFactory>()
Expand Down
102 changes: 36 additions & 66 deletions ...ics.Admin.Tests/Security/AuthorizationHandlers/ReleaseStatusAuthorizationHandlersTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@
using GovUk.Education.ExploreEducationStatistics.Admin.Services.Interfaces;
using GovUk.Education.ExploreEducationStatistics.Content.Model;
using GovUk.Education.ExploreEducationStatistics.Content.Model.Database;
using GovUk.Education.ExploreEducationStatistics.Content.Model.Repository;
using GovUk.Education.ExploreEducationStatistics.Publisher.Model;
using Microsoft.AspNetCore.Authorization;
using Moq;
using Xunit;
using static GovUk.Education.ExploreEducationStatistics.Admin.Security.SecurityClaimTypes;
using static GovUk.Education.ExploreEducationStatistics.Admin.Tests.Security.AuthorizationHandlers.Utils.
AuthorizationHandlersTestUtil;
Expand All @@ -23,7 +21,8 @@
using static GovUk.Education.ExploreEducationStatistics.Common.Utils.EnumUtil;
using static GovUk.Education.ExploreEducationStatistics.Content.Model.PublicationRole;
using static Moq.MockBehavior;
using ReleaseVersionRepository = GovUk.Education.ExploreEducationStatistics.Content.Model.Repository.ReleaseVersionRepository;
using ReleaseVersionRepository =
GovUk.Education.ExploreEducationStatistics.Content.Model.Repository.ReleaseVersionRepository;

namespace GovUk.Education.ExploreEducationStatistics.Admin.Tests.Security.AuthorizationHandlers
{
Expand Down Expand Up @@ -68,14 +67,11 @@ await GetEnums<ReleaseApprovalStatus>()
var releaseVersion = new ReleaseVersion
{
Id = Guid.NewGuid(),
Publication = new Publication
{
Id = Guid.NewGuid()
},
Publication = new Publication { Id = Guid.NewGuid() },
ApprovalStatus = status
};
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>();
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>(Strict);
releaseStatusRepository.Setup(
s => s.GetAllByOverallStage(
Expand Down Expand Up @@ -137,10 +133,7 @@ await GetEnums<ReleaseApprovalStatus>()
var releaseVersion = new ReleaseVersion
{
Id = Guid.NewGuid(),
Publication = new Publication
{
Id = Guid.NewGuid()
},
Publication = new Publication { Id = Guid.NewGuid() },
ApprovalStatus = status
};
Expand Down Expand Up @@ -169,7 +162,8 @@ await AssertReleaseHandlerSucceedsWithCorrectPublicationRoles<
return CreateHandler(releaseStatusRepository, context);
},
releaseVersion,
Owner, Approver
Owner,
Approver
);
}
else
Expand Down Expand Up @@ -259,14 +253,11 @@ await GetEnums<ReleaseApprovalStatus>()
var releaseVersion = new ReleaseVersion
{
Id = Guid.NewGuid(),
Publication = new Publication
{
Id = Guid.NewGuid()
},
Publication = new Publication { Id = Guid.NewGuid() },
ApprovalStatus = status
};
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>();
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>(Strict);
releaseStatusRepository.Setup(
s => s.GetAllByOverallStage(
Expand Down Expand Up @@ -328,14 +319,11 @@ await GetEnums<ReleaseApprovalStatus>()
var releaseVersion = new ReleaseVersion
{
Id = Guid.NewGuid(),
Publication = new Publication
{
Id = Guid.NewGuid()
},
Publication = new Publication { Id = Guid.NewGuid() },
ApprovalStatus = status
};
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>();
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>(Strict);
releaseStatusRepository.Setup(
s => s.GetAllByOverallStage(
Expand Down Expand Up @@ -450,14 +438,11 @@ await GetEnums<ReleaseApprovalStatus>()
var releaseVersion = new ReleaseVersion
{
Id = Guid.NewGuid(),
Publication = new Publication
{
Id = Guid.NewGuid()
},
Publication = new Publication { Id = Guid.NewGuid() },
ApprovalStatus = status
};
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>();
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>(Strict);
releaseStatusRepository.Setup(
s => s.GetAllByOverallStage(
Expand Down Expand Up @@ -496,14 +481,11 @@ await GetEnums<ReleaseApprovalStatus>()
var releaseVersion = new ReleaseVersion
{
Id = Guid.NewGuid(),
Publication = new Publication
{
Id = Guid.NewGuid()
},
Publication = new Publication { Id = Guid.NewGuid() },
ApprovalStatus = status
};
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>();
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>(Strict);
releaseStatusRepository.Setup(
s => s.GetAllByOverallStage(
Expand Down Expand Up @@ -574,14 +556,20 @@ await GetEnums<ReleaseApprovalStatus>()
var releaseVersion = new ReleaseVersion
{
Id = Guid.NewGuid(),
Publication = new Publication
{
Id = Guid.NewGuid()
},
Publication = new Publication { Id = Guid.NewGuid() },
ApprovalStatus = status
};
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>();
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>(Strict);
releaseStatusRepository.Setup(
s => s.GetAllByOverallStage(
releaseVersion.Id,
ReleasePublishingStatusOverallStage.Started,
ReleasePublishingStatusOverallStage.Complete
)
)
.ReturnsAsync(new List<ReleasePublishingStatus>());
// Assert that users with the specified claims can update the
// Release status if it has not started publishing
Expand Down Expand Up @@ -614,14 +602,11 @@ await GetEnums<ReleaseApprovalStatus>()
var releaseVersion = new ReleaseVersion
{
Id = Guid.NewGuid(),
Publication = new Publication
{
Id = Guid.NewGuid()
},
Publication = new Publication { Id = Guid.NewGuid() },
ApprovalStatus = status
};
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>();
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>(Strict);
releaseStatusRepository.Setup(
s => s.GetAllByOverallStage(
Expand All @@ -631,10 +616,7 @@ await GetEnums<ReleaseApprovalStatus>()
)
)
.ReturnsAsync(
new List<ReleasePublishingStatus>
{
new ReleasePublishingStatus()
}
new List<ReleasePublishingStatus> { new() }
);
// Assert that no users can update a Release status once it has started publishing
Expand Down Expand Up @@ -666,15 +648,12 @@ await GetEnums<ReleaseApprovalStatus>()
var releaseVersion = new ReleaseVersion
{
Id = Guid.NewGuid(),
Publication = new Publication
{
Id = Guid.NewGuid()
},
Publication = new Publication { Id = Guid.NewGuid() },
ApprovalStatus = status,
Published = DateTime.Now
};
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>();
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>(Strict);
releaseStatusRepository.Setup(
s => s.GetAllByOverallStage(
Expand Down Expand Up @@ -714,14 +693,11 @@ await GetEnums<ReleaseApprovalStatus>()
var releaseVersion = new ReleaseVersion
{
Id = Guid.NewGuid(),
Publication = new Publication
{
Id = Guid.NewGuid()
},
Publication = new Publication { Id = Guid.NewGuid() },
ApprovalStatus = status
};
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>();
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>(Strict);
releaseStatusRepository.Setup(
s => s.GetAllByOverallStage(
Expand All @@ -731,10 +707,7 @@ await GetEnums<ReleaseApprovalStatus>()
)
)
.ReturnsAsync(
new List<ReleasePublishingStatus>
{
new ReleasePublishingStatus()
}
new List<ReleasePublishingStatus> { new() }
);
// Assert that no user release roles allow updating a Release status once it has started publishing
Expand Down Expand Up @@ -779,15 +752,12 @@ await GetEnums<ReleaseApprovalStatus>()
var releaseVersion = new ReleaseVersion
{
Id = Guid.NewGuid(),
Publication = new Publication
{
Id = Guid.NewGuid()
},
Publication = new Publication { Id = Guid.NewGuid() },
ApprovalStatus = status,
Published = DateTime.Now,
};
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>();
var releaseStatusRepository = new Mock<IReleasePublishingStatusRepository>(Strict);
releaseStatusRepository.Setup(
s => s.GetAllByOverallStage(
Expand Down
Loading

0 comments on commit f3c583d

Please sign in to comment.