Skip to content

Commit

Permalink
remove assessment (#550)
Browse files Browse the repository at this point in the history
  • Loading branch information
johnml1135 authored Dec 3, 2024
1 parent aa7f31f commit 3bbda03
Show file tree
Hide file tree
Showing 51 changed files with 37 additions and 4,389 deletions.
7 changes: 0 additions & 7 deletions Serval.sln
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Machine.JobServer",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Machine.Shared.Tests", "src\Machine\test\Serval.Machine.Shared.Tests\Serval.Machine.Shared.Tests.csproj", "{B0D23A55-AB09-4C2C-B309-F4BEB3BC968D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Assessment", "src\Serval\src\Serval.Assessment\Serval.Assessment.csproj", "{10657805-48F1-4205-B8F5-79447F6EF620}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ServiceToolkit", "ServiceToolkit", "{EA69B41C-49EF-4017-A687-44B9DF37FF98}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C3A14577-A654-4604-818C-4E683DD45A51}"
Expand Down Expand Up @@ -176,10 +174,6 @@ Global
{B0D23A55-AB09-4C2C-B309-F4BEB3BC968D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B0D23A55-AB09-4C2C-B309-F4BEB3BC968D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B0D23A55-AB09-4C2C-B309-F4BEB3BC968D}.Release|Any CPU.Build.0 = Release|Any CPU
{10657805-48F1-4205-B8F5-79447F6EF620}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{10657805-48F1-4205-B8F5-79447F6EF620}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10657805-48F1-4205-B8F5-79447F6EF620}.Release|Any CPU.ActiveCfg = Release|Any CPU
{10657805-48F1-4205-B8F5-79447F6EF620}.Release|Any CPU.Build.0 = Release|Any CPU
{0E40F959-C641-40A2-9750-B17A4F9F9E55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0E40F959-C641-40A2-9750-B17A4F9F9E55}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E40F959-C641-40A2-9750-B17A4F9F9E55}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -220,7 +214,6 @@ Global
{C02494FB-663E-4430-9F2D-41F1A740B271} = {D808D2BE-ED26-4E60-A409-AE58F7C1CB8F}
{BC766753-E560-4ADF-9923-C7A96076EA47} = {D808D2BE-ED26-4E60-A409-AE58F7C1CB8F}
{B0D23A55-AB09-4C2C-B309-F4BEB3BC968D} = {40C225C2-1EEF-4D1D-9D14-1CBB86C8A1CB}
{10657805-48F1-4205-B8F5-79447F6EF620} = {25CDB05B-4E24-4A6E-933E-1E0BEC97D74D}
{C3A14577-A654-4604-818C-4E683DD45A51} = {EA69B41C-49EF-4017-A687-44B9DF37FF98}
{0E40F959-C641-40A2-9750-B17A4F9F9E55} = {C3A14577-A654-4604-818C-4E683DD45A51}
{1DB5E6D1-17A8-4FF2-B90A-C5DFBEF63126} = {EA69B41C-49EF-4017-A687-44B9DF37FF98}
Expand Down
1 change: 0 additions & 1 deletion src/Serval/src/Serval.ApiServer/Serval.ApiServer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Serval.Assessment\Serval.Assessment.csproj" />
<ProjectReference Include="..\Serval.DataFiles\Serval.DataFiles.csproj" />
<ProjectReference Include="..\Serval.Translation\Serval.Translation.csproj" />
<ProjectReference Include="..\Serval.Webhooks\Serval.Webhooks.csproj" />
Expand Down
10 changes: 0 additions & 10 deletions src/Serval/src/Serval.ApiServer/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,10 @@ public void ConfigureServices(IServiceCollection services)
.AddMongoDataAccess(cfg =>
{
cfg.AddTranslationRepositories();
cfg.AddAssessmentRepositories();
cfg.AddDataFilesRepositories();
cfg.AddWebhooksRepositories();
})
.AddTranslation()
.AddAssessment()
.AddDataFiles()
.AddWebhooks();
services.AddTransient<IUrlService, UrlService>();
Expand Down Expand Up @@ -112,7 +110,6 @@ public void ConfigureServices(IServiceCollection services)
services.AddMediator(cfg =>
{
cfg.AddTranslationConsumers();
cfg.AddAssessmentConsumers();
cfg.AddDataFilesConsumers();
cfg.AddWebhooksConsumers();
});
Expand Down Expand Up @@ -150,12 +147,6 @@ public void ConfigureServices(IServiceCollection services)
o.Version = version.Major + "." + version.Minor;

var featureManager = sp.GetRequiredService<IFeatureManager>();
if (!featureManager.IsEnabledAsync("Assessment").WaitAndUnwrapException())
{
o.AddOperationFilter(ctxt =>
!(ctxt.ControllerType.Namespace?.StartsWith("Serval.Assessment") ?? true)
);
}

o.SchemaSettings.SchemaNameGenerator = new ServalSchemaNameGenerator();
o.UseControllerSummaryAsTagDescription = true;
Expand Down Expand Up @@ -231,7 +222,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{
x.MapControllers();
x.MapServalTranslationServices();
x.MapServalAssessmentServices();
x.MapHangfireDashboard();
});

Expand Down
1 change: 0 additions & 1 deletion src/Serval/src/Serval.ApiServer/Usings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
global using Microsoft.Extensions.Diagnostics.HealthChecks;
global using Microsoft.FeatureManagement;
global using Microsoft.IdentityModel.Tokens;
global using Nito.AsyncEx.Synchronous;
global using NJsonSchema;
global using NJsonSchema.Generation;
global using NSwag;
Expand Down
6 changes: 2 additions & 4 deletions src/Serval/src/Serval.ApiServer/appsettings.Development.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
"Protocols": "Http2"
}
},
"FeatureManagement": {
"Assessment": true
},
"FeatureManagement": {},
"ConnectionStrings": {
"Mongo": "mongodb://localhost:27017/serval",
"Hangfire": "mongodb://localhost:27017/serval_jobs"
Expand All @@ -33,4 +31,4 @@
"Microsoft.AspNetCore": "Warning"
}
}
}
}
4 changes: 1 addition & 3 deletions src/Serval/src/Serval.ApiServer/appsettings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"AllowedHosts": "*",
"FeatureManagement": {
"Assessment": false
},
"FeatureManagement": {},
"Auth": {
"Domain": "sil-appbuilder.auth0.com",
"Audience": "https://serval-api.org/"
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

11 changes: 0 additions & 11 deletions src/Serval/src/Serval.Assessment/Contracts/AssessmentEngineDto.cs

This file was deleted.

This file was deleted.

27 changes: 0 additions & 27 deletions src/Serval/src/Serval.Assessment/Contracts/AssessmentJobDto.cs

This file was deleted.

This file was deleted.

Loading

0 comments on commit 3bbda03

Please sign in to comment.