Skip to content

[ADMINAPI-1274] - DO NOT MERGE - Phase 1: EdFi.Ods.AdminApi.V1 Cleanup and Modernization #226

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

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
+594 −3,938
Draft

[ADMINAPI-1274] - DO NOT MERGE - Phase 1: EdFi.Ods.AdminApi.V1 Cleanup and Modernization #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
68e11b8
Phase 1: EdFi.Ods.AdminApi.V1 Cleanup and Modernization
DavidJGapCR Aug 12, 2025
94f00b6
Progress
DavidJGapCR Aug 12, 2025
33b6786
File renaming
DavidJGapCR Aug 12, 2025
0160e3f
Central Package Management (CPM)
DavidJGapCR Aug 12, 2025
d5b6ef7
trying to remove resolver(s)
DavidJGapCR Aug 12, 2025
205a207
Remove v6 references
DavidJGapCR Aug 13, 2025
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
11 changes: 0 additions & 11 deletions Application/Directory.Build.props
View file
Open in desktop

This file was deleted.

42 changes: 42 additions & 0 deletions Application/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<Project>
<PropertyGroup>
<!-- Enable central package management, https://learn.microsoft.com/en-us/nuget/consume-packages/Central-Package-Management -->
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="EdFi.Suite3.Admin.DataAccess" Version="6.2.81" />
<PackageVersion Include="EdFi.Suite3.Security.DataAccess" Version="6.2.61" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageVersion Include="Microsoft.SqlServer.SqlManagementObjects" Version="170.11.0" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="NuGet.Protocol" Version="6.13.2" />
<PackageVersion Include="NUnit" Version="4.2.2" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.4.2" />
<PackageVersion Include="NUnit.Analyzers" Version="4.3.0" />
<PackageVersion Include="Respawn" Version="6.2.1" />
<PackageVersion Include="Shouldly" Version="4.2.1" />
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
<PackageVersion Include="FakeItEasy" Version="8.3.0" />
<PackageVersion Include="AspNetCore.HealthChecks.NpgSql" Version="8.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.0" />
<PackageVersion Include="Asp.Versioning.Http" Version="8.1.0" />
<PackageVersion Include="AutoMapper" Version="12.0.1" />
<PackageVersion Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
<PackageVersion Include="FluentValidation" Version="11.11.0" />
<PackageVersion Include="FluentValidation.AspNetCore" Version="11.3.0" />
<PackageVersion Include="log4net" Version="3.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
<PackageVersion Include="NJsonSchema" Version="11.0.2" />
<PackageVersion Include="Npgsql" Version="8.0.3" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
<PackageVersion Include="OpenIddict.AspNetCore" Version="5.7.1" />
<PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="5.7.1" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.7" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions ...Tests/AddClaimSetCommandV6ServiceTests.cs → ...orTests/AddClaimSetCommandServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
namespace EdFi.Ods.AdminApi.DBTests.ClaimSetEditorTests;

[TestFixture]
public class AddClaimSetCommandV6ServiceTests : SecurityDataTestBase
public class AddClaimSetCommandServiceTests : SecurityDataTestBase
{
[Test]
public void ShouldAddClaimSet()
Expand All @@ -31,7 +31,7 @@ public void ShouldAddClaimSet()
ClaimSet addedClaimSet = null;
using (var securityContext = TestContext)
{
var command = new AddClaimSetCommandV6Service(securityContext);
var command = new AddClaimSetCommandService(securityContext);
addedClaimSetId = command.Execute(newClaimSet);
addedClaimSet = securityContext.ClaimSets.Single(x => x.ClaimSetId == addedClaimSetId);
}
Expand Down
41 changes: 0 additions & 41 deletions ...cation/EdFi.Ods.AdminApi.DBTests/ClaimSetEditorTests/AddClaimSetCommandV53ServiceTests.cs
View file
Open in desktop

This file was deleted.

21 changes: 10 additions & 11 deletions ...s/DeleteClaimSetCommandV53ServiceTests.cs → ...ests/DeleteClaimSetCommandServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed to the Ed-Fi Alliance under one or more agreements.
// The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
// See the LICENSE and NOTICES files in the project root for more information.
extern alias Compatability;

using System;
using System.Linq;
Expand All @@ -11,13 +10,13 @@
using EdFi.Ods.AdminApi.Infrastructure.ErrorHandling;
using Moq;
using Shouldly;
using ClaimSet = Compatability::EdFi.SecurityCompatiblity53.DataAccess.Models.ClaimSet;
using Application = Compatability::EdFi.SecurityCompatiblity53.DataAccess.Models.Application;
using ClaimSet = EdFi.Security.DataAccess.Models.ClaimSet;
using Application = EdFi.Security.DataAccess.Models.Application;

namespace EdFi.Ods.AdminApi.DBTests.ClaimSetEditorTests;

[TestFixture]
public class DeleteClaimSetCommandV53ServiceTests : SecurityData53TestBase
public class DeleteClaimSetCommandServiceTests : SecurityDataTestBase
{

[Test]
Expand All @@ -32,24 +31,24 @@ public void ShouldDeleteClaimSet()
var testClaimSetToDelete = new ClaimSet
{ ClaimSetName = "TestClaimSet_Delete", Application = testApplication };
Save(testClaimSetToDelete);
SetupParentResourceClaimsWithChildren(testClaimSetToDelete, testApplication);
SetupParentResourceClaimsWithChildren(testClaimSetToDelete, testApplication, UniqueNameList("ParentRc", 3), UniqueNameList("ChildRc", 1));

var testClaimSetToPreserve = new ClaimSet
{ ClaimSetName = "TestClaimSet_Preserve", Application = testApplication };
Save(testClaimSetToPreserve);
var resourceClaimsForPreservedClaimSet = SetupParentResourceClaimsWithChildren(testClaimSetToPreserve, testApplication);
var resourceClaimsForPreservedClaimSet = SetupParentResourceClaimsWithChildren(testClaimSetToPreserve, testApplication, UniqueNameList("ParentRc", 3),
UniqueNameList("ChildRc", 1));

var deleteModel = new Mock<IDeleteClaimSetModel>();
deleteModel.Setup(x => x.Name).Returns(testClaimSetToDelete.ClaimSetName);
deleteModel.Setup(x => x.Id).Returns(testClaimSetToDelete.ClaimSetId);

using var securityContext = TestContext;
var command = new DeleteClaimSetCommandV53Service(securityContext);
var command = new DeleteClaimSetCommandService(securityContext);
command.Execute(deleteModel.Object);

var deletedClaimSet = securityContext.ClaimSets.SingleOrDefault(x => x.ClaimSetId == testClaimSetToDelete.ClaimSetId);
deletedClaimSet.ShouldBeNull();
var deletedClaimSetResourceActions = securityContext.ClaimSetResourceClaims.Count(x => x.ClaimSet.ClaimSetId == testClaimSetToDelete.ClaimSetId);
var deletedClaimSetResourceActions = securityContext.ClaimSetResourceClaimActions.Count(x => x.ClaimSet.ClaimSetId == testClaimSetToDelete.ClaimSetId);
deletedClaimSetResourceActions.ShouldBe(0);

var preservedClaimSet = securityContext.ClaimSets.Single(x => x.ClaimSetId == testClaimSetToPreserve.ClaimSetId);
Expand Down Expand Up @@ -85,7 +84,7 @@ public void ShouldThrowExceptionOnEditSystemReservedClaimSet()
};
Save(testApplication);

var systemReservedClaimSet = new ClaimSet { ClaimSetName = "SIS Vendor", Application = testApplication };
var systemReservedClaimSet = new ClaimSet { ClaimSetName = "SIS Vendor", Application = testApplication, IsEdfiPreset = true };
Save(systemReservedClaimSet);

var deleteModel = new Mock<IDeleteClaimSetModel>();
Expand All @@ -94,7 +93,7 @@ public void ShouldThrowExceptionOnEditSystemReservedClaimSet()
using var securityContext = TestContext;
var exception = Assert.Throws<AdminApiException>(() =>
{
var command = new DeleteClaimSetCommandV53Service(securityContext);
var command = new DeleteClaimSetCommandService(securityContext);
command.Execute(deleteModel.Object);
});
exception.ShouldNotBeNull();
Expand Down
187 changes: 0 additions & 187 deletions ...tion/EdFi.Ods.AdminApi.DBTests/ClaimSetEditorTests/DeleteClaimSetCommandV6ServiceTests.cs
View file
Open in desktop

This file was deleted.

Loading
Loading