diff --git a/Application/EdFi.Ods.AdminApi/E2E Tests/Admin API E2E.postman_collection.json b/Application/EdFi.Ods.AdminApi/E2E Tests/Admin API E2E.postman_collection.json index 4d9cc9c0d..5ad7572a8 100644 --- a/Application/EdFi.Ods.AdminApi/E2E Tests/Admin API E2E.postman_collection.json +++ b/Application/EdFi.Ods.AdminApi/E2E Tests/Admin API E2E.postman_collection.json @@ -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" }, @@ -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", @@ -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", @@ -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", @@ -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", diff --git a/Application/EdFi.Ods.AdminApi/Features/Applications/ApplicationModel.cs b/Application/EdFi.Ods.AdminApi/Features/Applications/ApplicationModel.cs index 0dc341fe6..6fb88f9cb 100644 --- a/Application/EdFi.Ods.AdminApi/Features/Applications/ApplicationModel.cs +++ b/Application/EdFi.Ods.AdminApi/Features/Applications/ApplicationModel.cs @@ -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? EducationOrganizationIds { get; set; } public string? OdsInstanceName { get; set; } public int? VendorId { get; set; } public IList? Profiles { get; set; } diff --git a/Application/EdFi.Ods.AdminApi/Infrastructure/AutoMapper/AdminApiMappingProfile.cs b/Application/EdFi.Ods.AdminApi/Infrastructure/AutoMapper/AdminApiMappingProfile.cs index ed7cf456b..d000234b1 100644 --- a/Application/EdFi.Ods.AdminApi/Infrastructure/AutoMapper/AdminApiMappingProfile.cs +++ b/Application/EdFi.Ods.AdminApi/Infrastructure/AutoMapper/AdminApiMappingProfile.cs @@ -32,7 +32,7 @@ public AdminApiMappingProfile() .ForMember(dst => dst.NamespacePrefixes, opt => opt.MapFrom(src => src.VendorNamespacePrefixes.ToCommaSeparated())); CreateMap() - .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())); diff --git a/Application/EdFi.Ods.AdminApi/Infrastructure/Extensions/AdminModelExtensions.cs b/Application/EdFi.Ods.AdminApi/Infrastructure/Extensions/AdminModelExtensions.cs index e664792f3..72d388382 100644 --- a/Application/EdFi.Ods.AdminApi/Infrastructure/Extensions/AdminModelExtensions.cs +++ b/Application/EdFi.Ods.AdminApi/Infrastructure/Extensions/AdminModelExtensions.cs @@ -40,8 +40,8 @@ public static IList Profiles(this Application application) return application?.Vendor?.VendorId; } - public static int? EducationOrganizationId(this Application application) + public static IList? EducationOrganizationIds(this Application application) { - return application?.ApplicationEducationOrganizations?.FirstOrDefault()?.EducationOrganizationId; + return application?.ApplicationEducationOrganizations?.Select(eu => eu.EducationOrganizationId).ToList(); } }