Skip to content

[ADMINAPI-705] - return a list for educationOrganizationIds in Application #86

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

Merged
CSR2017 merged 2 commits into from
Nov 9, 2023
Merged

[ADMINAPI-705] - return a list for educationOrganizationIds in Application #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d40f859
Add the implementation to return a list of educationOrganizationIds i…
jagudelo-gap Oct 31, 2023
db43a4d
Merge remote-tracking branch 'origin/main' into ADMINAPI-705
jagudelo-gap Oct 31, 2023
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
14 changes: 9 additions & 5 deletions Application/EdFi.Ods.AdminApi/E2E Tests/Admin API E2E.postman_collection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"info": {
"_postman_id": "cd97eae7-381a-4b25-80d4-37b060551f89",
"_postman_id": "39eacb9c-41ef-4ebd-a3cd-8a95c66226af",
"name": "Admin API E2E refactor",
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
},
Expand Down Expand Up @@ -1641,7 +1641,8 @@
" const result = results[indexOfApplication];\r",
" pm.expect(result.applicationName).to.equal(\"Test Application\");\r",
" pm.expect(result.claimSetName).to.equal(\"Ed-Fi Sandbox\");\r",
" pm.expect(result.educationOrganizationId).to.equal(255901);\r",
" pm.expect(result.educationOrganizationIds).to.length(1);\r",
" pm.expect(result.educationOrganizationIds[0]).to.equal(255901);\r",
" pm.expect(result.profileName).to.equal(null);\r",
" pm.expect(result.odsInstanceName).to.equal(null);\r",
" pm.expect(result.profiles).to.length(0);\r",
Expand Down Expand Up @@ -1704,7 +1705,8 @@
" pm.expect(result.applicationId).to.equal(applicationId);\r",
" pm.expect(result.applicationName).to.equal(\"Test Application\");\r",
" pm.expect(result.claimSetName).to.equal(\"Ed-Fi Sandbox\");\r",
" pm.expect(result.educationOrganizationId).to.equal(255901);\r",
" pm.expect(result.educationOrganizationIds).to.length(1);\r",
" pm.expect(result.educationOrganizationIds[0]).to.equal(255901);\r",
" pm.expect(result.profileName).to.equal(null);\r",
" pm.expect(result.odsInstanceName).to.equal(null);\r",
" pm.expect(result.profiles).to.length(0);\r",
Expand Down Expand Up @@ -1769,7 +1771,8 @@
" const result = results[indexOfApplication];\r",
" pm.expect(result.applicationName).to.equal(\"Test Application\");\r",
" pm.expect(result.claimSetName).to.equal(\"Ed-Fi Sandbox\");\r",
" pm.expect(result.educationOrganizationId).to.equal(255901);\r",
" pm.expect(result.educationOrganizationIds).to.length(1);\r",
" pm.expect(result.educationOrganizationIds[0]).to.equal(255901);\r",
" pm.expect(result.profileName).to.equal(null);\r",
" pm.expect(result.odsInstanceName).to.equal(null);\r",
" pm.expect(result.profiles).to.length(0);\r",
Expand Down Expand Up @@ -1912,7 +1915,8 @@
"pm.test(\"Response result includes updated application\", function () {\r",
" pm.expect(result.applicationName).to.equal(\"Updated Application Name\");\r",
" pm.expect(result.claimSetName).to.equal(\"Ed-Fi ODS Admin App\");\r",
" pm.expect(result.educationOrganizationId).to.equal(1234);\r",
" pm.expect(result.educationOrganizationIds).to.length(1);\r",
" pm.expect(result.educationOrganizationIds[0]).to.equal(1234);\r",
" pm.expect(result.profileName).to.equal(null);\r",
" pm.expect(result.odsInstanceName).to.equal(null);\r",
"});\r",
Expand Down
2 changes: 1 addition & 1 deletion Application/EdFi.Ods.AdminApi/Features/Applications/ApplicationModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class ApplicationModel
public string? ApplicationName { get; set; }
public string? ClaimSetName { get; set; }
public string? ProfileName { get; set; }
public int? EducationOrganizationId { get; set; }
public IList<int>? EducationOrganizationIds { get; set; }
public string? OdsInstanceName { get; set; }
public int? VendorId { get; set; }
public IList<Profile>? Profiles { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion Application/EdFi.Ods.AdminApi/Infrastructure/AutoMapper/AdminApiMappingProfile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public AdminApiMappingProfile()
.ForMember(dst => dst.NamespacePrefixes, opt => opt.MapFrom(src => src.VendorNamespacePrefixes.ToCommaSeparated()));

CreateMap<Application, ApplicationModel>()
.ForMember(dst => dst.EducationOrganizationId, opt => opt.MapFrom(src => src.EducationOrganizationId()))
.ForMember(dst => dst.EducationOrganizationIds, opt => opt.MapFrom(src => src.EducationOrganizationIds()))
.ForMember(dst => dst.ProfileName, opt => opt.MapFrom(src => src.ProfileName()))
.ForMember(dst => dst.VendorId, opt => opt.MapFrom(src => src.VendorId()))
.ForMember(dst => dst.Profiles, opt => opt.MapFrom(src => src.Profiles()));
Expand Down
4 changes: 2 additions & 2 deletions Application/EdFi.Ods.AdminApi/Infrastructure/Extensions/AdminModelExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ public static IList<Profile> Profiles(this Application application)
return application?.Vendor?.VendorId;
}

public static int? EducationOrganizationId(this Application application)
public static IList<int>? EducationOrganizationIds(this Application application)
{
return application?.ApplicationEducationOrganizations?.FirstOrDefault()?.EducationOrganizationId;
return application?.ApplicationEducationOrganizations?.Select(eu => eu.EducationOrganizationId).ToList();
}
}