From b6dbe59bcb06452cfc722a0053956d3afa788244 Mon Sep 17 00:00:00 2001
From: Stephen Fuqua <stephenfuqua@users.noreply.github.com>
Date: Mon, 19 Jun 2023 14:03:19 +0000
Subject: [PATCH] ADMINAPI | AdminApiMapping fix (#66)

Co-authored-by: Luis Chavarriaga <lchavarriaga@growthaccelerationpartners.com>
---
 .../Features/Applications/ApplicationModel.cs                | 2 +-
 .../Infrastructure/AutoMapper/AdminApiMappingProfile.cs      | 2 +-
 .../Infrastructure/Extensions/AdminModelExtensions.cs        | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Application/EdFi.Ods.AdminApi/Features/Applications/ApplicationModel.cs b/Application/EdFi.Ods.AdminApi/Features/Applications/ApplicationModel.cs
index 63c2ff537..0dc341fe6 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 int? EducationOrganizationId { get; set; }
     public string? OdsInstanceName { get; set; }
     public int? VendorId { get; set; }
     public IList<Profile>? Profiles { get; set; }
diff --git a/Application/EdFi.Ods.AdminApi/Infrastructure/AutoMapper/AdminApiMappingProfile.cs b/Application/EdFi.Ods.AdminApi/Infrastructure/AutoMapper/AdminApiMappingProfile.cs
index 38451f899..4a1050537 100644
--- a/Application/EdFi.Ods.AdminApi/Infrastructure/AutoMapper/AdminApiMappingProfile.cs
+++ b/Application/EdFi.Ods.AdminApi/Infrastructure/AutoMapper/AdminApiMappingProfile.cs
@@ -31,7 +31,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.ApplicationEducationOrganizations.First().EducationOrganizationId))
+            .ForMember(dst => dst.EducationOrganizationId, opt => opt.MapFrom(src => src.EducationOrganizationId()))
             .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 ecf8bbf68..e664792f3 100644
--- a/Application/EdFi.Ods.AdminApi/Infrastructure/Extensions/AdminModelExtensions.cs
+++ b/Application/EdFi.Ods.AdminApi/Infrastructure/Extensions/AdminModelExtensions.cs
@@ -39,4 +39,9 @@ public static IList<Profile> Profiles(this Application application)
     {
         return application?.Vendor?.VendorId;
     }
+
+    public static int? EducationOrganizationId(this Application application)
+    {
+        return application?.ApplicationEducationOrganizations?.FirstOrDefault()?.EducationOrganizationId;
+    }
 }