Skip to content

Commit 205a207

Browse files
DavidJGapCRDavidJGapCR
committed
Remove v6 references
1 parent d5b6ef7 commit 205a207

20 files changed

+50
-208
lines changed

‎Application/EdFi.Ods.AdminApi.DBTests/ClaimSetEditorTests/DeleteClaimSetCommandServiceTests.cs‎

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -99,89 +99,4 @@ public void ShouldThrowExceptionOnEditSystemReservedClaimSet()
9999
exception.ShouldNotBeNull();
100100
exception.Message.ShouldBe($"Claim set({systemReservedClaimSet.ClaimSetName}) is system reserved.Can not be deleted.");
101101
}
102-
103-
// TODO: move these to UnitTests, using appropriate validator from the API project
104-
//[Test]
105-
//public void ShouldNotDeleteClaimSetIfNotEditable()
106-
//{
107-
// var testApplication = new Application
108-
// {
109-
// ApplicationName = "TestApplication1"
110-
// };
111-
// Save(testApplication);
112-
113-
// var testClaimSet = new ClaimSet {ClaimSetName = $"TestClaimSet{DateTime.Now:O}", Application = testApplication};
114-
// Save(testClaimSet);
115-
116-
// var claimSetToDelete = new DeleteClaimSetModel()
117-
// {
118-
// Name = testClaimSet.ClaimSetName,
119-
// Id = testClaimSet.ClaimSetId,
120-
// IsEditable = false
121-
// };
122-
123-
// using var securityContext = TestContext;
124-
// var getClaimSetByIdQuery = ClaimSetByIdQuery(securityContext);
125-
// var validator = new DeleteClaimSetModelValidator(getClaimSetByIdQuery);
126-
// var validationResults = validator.Validate(claimSetToDelete);
127-
// validationResults.IsValid.ShouldBe(false);
128-
// validationResults.Errors.Single().ErrorMessage.ShouldBe("Only user created claim sets can be deleted");
129-
//}
130-
131-
//[Test]
132-
//public void ShouldNotDeleteClaimSetIfNotAnExistingId()
133-
//{
134-
// var testApplication = new Application
135-
// {
136-
// ApplicationName = "TestApplication2"
137-
// };
138-
// Save(testApplication);
139-
140-
// var testClaimSet = new ClaimSet { ClaimSetName = $"TestClaimSet{DateTime.Now:O}", Application = testApplication };
141-
// Save(testClaimSet);
142-
143-
// var claimSetToDelete = new DeleteClaimSetModel()
144-
// {
145-
// Name = testClaimSet.ClaimSetName,
146-
// Id = 99,
147-
// IsEditable = true
148-
// };
149-
// using var securityContext = TestContext;
150-
// var getClaimSetByIdQuery = ClaimSetByIdQuery(securityContext);
151-
// var validator = new DeleteClaimSetModelValidator(getClaimSetByIdQuery);
152-
// var validationResults = validator.Validate(claimSetToDelete);
153-
// validationResults.IsValid.ShouldBe(false);
154-
// validationResults.Errors.Single().ErrorMessage.ShouldBe("No such claim set exists in the database");
155-
//}
156-
157-
//[Test]
158-
//public void ShouldNotDeleteClaimSetHasAnAssociatedApplication()
159-
//{
160-
// var testApplication = new Application
161-
// {
162-
// ApplicationName = "TestApplication3"
163-
// };
164-
// Save(testApplication);
165-
166-
// var testClaimSet = new ClaimSet { ClaimSetName = $"TestClaimSet{DateTime.Now:O}", Application = testApplication };
167-
// Save(testClaimSet);
168-
169-
// var claimSetToDelete = new DeleteClaimSetModel()
170-
// {
171-
// Name = testClaimSet.ClaimSetName,
172-
// Id = testClaimSet.ClaimSetId,
173-
// IsEditable = true,
174-
// VendorApplicationCount = 1
175-
// };
176-
177-
// using var securityContext = TestContext;
178-
// var getClaimSetByIdQuery = ClaimSetByIdQuery(securityContext);
179-
// var validator = new DeleteClaimSetModelValidator(getClaimSetByIdQuery);
180-
// var validationResults = validator.Validate(claimSetToDelete);
181-
// validationResults.IsValid.ShouldBe(false);
182-
// validationResults.Errors.Single().ErrorMessage.ShouldBe($"Cannot delete this claim set. This claim set has {claimSetToDelete.VendorApplicationCount} associated application(s).");
183-
//}
184-
185-
//private GetClaimSetByIdQuery ClaimSetByIdQuery(ISecurityContext securityContext) => new GetClaimSetByIdQuery(new StubOdsSecurityModelVersionResolver.V6(),
186-
// null, new GetClaimSetByIdQueryV6Service(securityContext));
187102
}

‎Application/EdFi.Ods.AdminApi.DBTests/ClaimSetEditorTests/EditClaimSetCommandServiceTests.cs‎

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -133,79 +133,4 @@ private void AssertApplicationsForClaimSet(int claimSetId, string claimSetNameTo
133133
results.Select(x => x.Name).ShouldBe(testApplications.Select(x => x.ApplicationName), true);
134134
});
135135
}
136-
137-
// TODO: move these to UnitTests, using appropriate validator from the API project
138-
//[Test]
139-
//public void ShouldNotEditClaimSetIfNameNotUnique()
140-
//{
141-
// var testApplication = new Application
142-
// {
143-
// ApplicationName = $"Test Application {DateTime.Now:O}"
144-
// };
145-
// Save(testApplication);
146-
147-
// var alreadyExistingClaimSet = new ClaimSet { ClaimSetName = "TestClaimSet1", Application = testApplication };
148-
// Save(alreadyExistingClaimSet);
149-
150-
// var testClaimSet = new ClaimSet { ClaimSetName = "TestClaimSet2", Application = testApplication };
151-
// Save(testClaimSet);
152-
153-
// var editModel = new EditClaimSetModel { ClaimSetName = "TestClaimSet1", ClaimSetId = testClaimSet.ClaimSetId };
154-
155-
// using var securityContext = TestContext;
156-
// var validator = new EditClaimSetModelValidator(AllClaimSetsQuery(securityContext),
157-
// ClaimSetByIdQuery(securityContext));
158-
// var validationResults = validator.Validate(editModel);
159-
// validationResults.IsValid.ShouldBe(false);
160-
// validationResults.Errors.Single().ErrorMessage.ShouldBe("A claim set with this name already exists in the database. Please enter a unique name.");
161-
//}
162-
163-
//[Test]
164-
//public void ShouldNotEditClaimSetIfNameEmpty()
165-
//{
166-
// var testApplication = new Application
167-
// {
168-
// ApplicationName = $"Test Application {DateTime.Now:O}"
169-
// };
170-
// Save(testApplication);
171-
172-
// var testClaimSet = new ClaimSet { ClaimSetName = "TestClaimSet1", Application = testApplication };
173-
// Save(testClaimSet);
174-
175-
// var editModel = new EditClaimSetModel { ClaimSetName = "", ClaimSetId = testClaimSet.ClaimSetId };
176-
177-
// using var securityContext = TestContext;
178-
// var validator = new EditClaimSetModelValidator(AllClaimSetsQuery(securityContext),
179-
// ClaimSetByIdQuery(securityContext));
180-
// var validationResults = validator.Validate(editModel);
181-
// validationResults.IsValid.ShouldBe(false);
182-
// validationResults.Errors.Single().ErrorMessage.ShouldBe("'Claim Set Name' must not be empty.");
183-
//}
184-
185-
//[Test]
186-
//public void ShouldNotEditClaimSetIfNameLengthGreaterThan255Characters()
187-
//{
188-
// var testApplication = new Application
189-
// {
190-
// ApplicationName = $"Test Application {DateTime.Now:O}"
191-
// };
192-
// Save(testApplication);
193-
194-
// var testClaimSet = new ClaimSet { ClaimSetName = "TestClaimSet1", Application = testApplication };
195-
// Save(testClaimSet);
196-
197-
// var editModel = new EditClaimSetModel { ClaimSetName = "ThisIsAClaimSetWithNameLengthGreaterThan255CharactersThisIsAClaimSetWithNameLengthGreaterThan255CharactersThisIsAClaimSetWithNameLengthGreaterThan255CharactersThisIsAClaimSetWithNameLengthGreaterThan255CharactersThisIsAClaimSetWithNameLengthGreaterThan255CharactersThisIsAClaimSetWithNameLengthGreaterThan255Characters", ClaimSetId = testClaimSet.ClaimSetId };
198-
199-
// using var securityContext = TestContext;
200-
// var validator = new EditClaimSetModelValidator(AllClaimSetsQuery(securityContext),
201-
// ClaimSetByIdQuery(securityContext));
202-
// var validationResults = validator.Validate(editModel);
203-
// validationResults.IsValid.ShouldBe(false);
204-
// validationResults.Errors.Single().ErrorMessage.ShouldBe("The claim set name must be less than 255 characters.");
205-
//}
206-
207-
//private GetClaimSetByIdQuery ClaimSetByIdQuery(ISecurityContext securityContext) => new GetClaimSetByIdQuery(new StubOdsSecurityModelVersionResolver.V6(),
208-
// null, new GetClaimSetByIdQueryV6Service(securityContext));
209-
210-
//private IGetAllClaimSetsQuery AllClaimSetsQuery(ISecurityContext securityContext) => new GetAllClaimSetsQuery(securityContext);
211136
}

‎Application/EdFi.Ods.AdminApi.DBTests/ClaimSetEditorTests/GetResourcesByClaimSetIdQueryServiceTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
namespace EdFi.Ods.AdminApi.DBTests.ClaimSetEditorTests;
1818

1919
[TestFixture]
20-
public class GetResourcesByClaimSetIdQueryV6SerivceTests : SecurityDataTestBase
20+
public class GetResourcesByClaimSetIdQueryServiceTests : SecurityDataTestBase
2121
{
2222
[Test]
2323
public void ShouldGetParentResourcesByClaimSetId()

‎Application/EdFi.Ods.AdminApi.DBTests/SecurityTestDatabaseSetup.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ private static SqlConnectionStringBuilder ConnectionStringBuilder
2525
{
2626
get
2727
{
28-
return new SqlConnectionStringBuilder() { ConnectionString = Testing.SecurityV53ConnectionString };
28+
return new SqlConnectionStringBuilder() { ConnectionString = Testing.SecurityConnectionString };
2929
}
3030
}
3131

3232
public static void EnsureSecurityDatabase(string downloadPath,
33-
string version = "5.3.1146",
33+
string version = "6.1.972",
3434
string nugetSource = "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json",
3535
string packageName = "EdFi.Suite3.RestApi.Databases")
3636
{

‎Application/EdFi.Ods.AdminApi.DBTests/Testing.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ public static IConfiguration Configuration()
3333

3434
public static string SecurityConnectionString { get { return Configuration().GetConnectionString("Security"); } }
3535

36-
public static string SecurityV53ConnectionString { get { return Configuration().GetConnectionString("SecurityV53"); } }
37-
3836
public static int DefaultPageSizeOffset => (int)Configuration().GetValue(typeof(int), "AppSettings:DefaultPageSizeOffset");
3937

4038
public static int DefaultPageSizeLimit => (int)Configuration().GetValue(typeof(int), "AppSettings:DefaultPageSizeLimit");

‎Application/EdFi.Ods.AdminApi.DBTests/appsettings.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
},
1111
"ConnectionStrings": {
1212
"Admin": "Data Source=.\\;Initial Catalog=EdFi_Admin_Test;Integrated Security=True;Encrypt=false;Trusted_Connection=true",
13-
"Security": "Data Source=.\\;Initial Catalog=EdFi_Security_Test;Integrated Security=True;Encrypt=false;Trusted_Connection=true",
14-
"SecurityV53": "Data Source=.\\;Initial Catalog=EdFi_Security_Test_v53;Integrated Security=True;Encrypt=false;Trusted_Connection=true"
13+
"Security": "Data Source=.\\;Initial Catalog=EdFi_Security_Test;Integrated Security=True;Encrypt=false;Trusted_Connection=true"
1514
}
1615
}

‎Application/EdFi.Ods.AdminApi/Features/ClaimSets/AddClaimSet.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using EdFi.Ods.AdminApi.Infrastructure;
88
using EdFi.Ods.AdminApi.Infrastructure.ClaimSetEditor;
99
using EdFi.Ods.AdminApi.Infrastructure.Database.Queries;
10+
using EdFi.Ods.AdminApi.Infrastructure.JsonContractResolvers;
1011
using EdFi.Ods.AdminApi.Infrastructure.Services.ClaimSetEditor;
1112
using FluentValidation;
1213
using Newtonsoft.Json;
@@ -59,7 +60,8 @@ public async Task<IResult> Handle(Validator validator, AddClaimSetCommand addCla
5960
$"/claimsets/{addedClaimSetId}",
6061
new JsonSerializerSettings()
6162
{
62-
Formatting = Formatting.Indented
63+
Formatting = Formatting.Indented,
64+
ContractResolver = new ShouldSerializeContractResolver()
6365
});
6466
}
6567

‎Application/EdFi.Ods.AdminApi/Features/ClaimSets/EditClaimSet.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using EdFi.Ods.AdminApi.Infrastructure.ClaimSetEditor;
99
using EdFi.Ods.AdminApi.Infrastructure.Database.Queries;
1010
using EdFi.Ods.AdminApi.Infrastructure.ErrorHandling;
11+
using EdFi.Ods.AdminApi.Infrastructure.JsonContractResolvers;
1112
using EdFi.Ods.AdminApi.Infrastructure.Services.ClaimSetEditor;
1213
using FluentValidation;
1314
using FluentValidation.Results;
@@ -73,6 +74,7 @@ public async Task<IResult> Handle(Validator validator, IEditClaimSetCommand edit
7374
new JsonSerializerSettings()
7475
{
7576
Formatting = Formatting.Indented,
77+
ContractResolver = new ShouldSerializeContractResolver()
7678
});
7779
}
7880

‎Application/EdFi.Ods.AdminApi/Features/ClaimSets/ReadClaimSets.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ internal Task<IResult> GetClaimSet(IGetClaimSetByIdQuery getClaimSetByIdQuery,
6161
claimSetData.ResourceClaims = mapper.Map<List<ResourceClaimModel>>(allResources.ToList());
6262
return Task.FromResult(AdminApiResponse<ClaimSetDetailsModel>.Ok(claimSetData,
6363
new JsonSerializerSettings() {
64-
Formatting = Formatting.Indented
64+
Formatting = Formatting.Indented,
65+
ContractResolver = new ShouldSerializeContractResolver()
6566
}));
6667
}
6768
}

‎Application/EdFi.Ods.AdminApi/Infrastructure/JsonContractResolvers/ShouldSerializeContractResolver.cs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,14 @@ public ShouldSerializeContractResolver() : base()
1717
}
1818
protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
1919
{
20-
JsonProperty property = base.CreateProperty(member, memberSerialization);
20+
var property = base.CreateProperty(member, memberSerialization);
2121

22-
if (property.DeclaringType == typeof(ResourceClaimModel) && (property.PropertyName is not null && property.PropertyName.ToLowerInvariant() == "readchanges"))
22+
if (property.DeclaringType == typeof(ResourceClaimModel) &&
23+
string.Equals(property.PropertyName, "readChanges", StringComparison.OrdinalIgnoreCase))
2324
{
24-
property.ShouldSerialize =
25-
instance =>
26-
{
27-
return true;
28-
};
25+
property.ShouldSerialize = _ => true;
2926
}
27+
3028
property.PropertyName = char.ToLowerInvariant(property.PropertyName![0]) + property.PropertyName[1..];
3129
return property;
3230
}

0 commit comments

Comments
 (0)