Merge pull request #30 from Ed-Fi-Exchange-OSS/feature/LP-53-LeadershipProfileProfessionalDevelopment

Feature/lp 53 leadership profile professional development

Author: YogirajA

src/API/DatabaseMigrations/scripts/views/vw_StaffProfessionalDevelopment.sql

@@ -0,0 +1,16 @@
+CREATE OR ALTER VIEW [edfi].[vw_StaffProfessionalDevelopment]
+AS
+select
+     st.StaffUSI
+	,st.StaffUniqueId
+    ,pdea.AttendanceDate
+    ,pdea.ProfessionalDevelopmentTitle
+    ,eo.NameOfInstitution as Location
+    ,NULL as AlignmentToLeadership
+from edfi.Staff as st
+left join edfi.Person as pe on pe.PersonId = st.PersonId
+left join tpdm.ProfessionalDevelopmentEventAttendance as pdea on pdea.PersonId = pe.PersonId
+left join edfi.StaffEducationOrganizationAssignmentAssociation as eoaa on eoaa.StaffUSI = st.StaffUSI
+left join edfi.EducationOrganization as eo on eo.EducationOrganizationId = eoaa.EducationOrganizationId
+join edfi.AttendanceEventCategoryDescriptor as aecd on aecd.AttendanceEventCategoryDescriptorId = pdea.AttendanceEventCategoryDescriptorId
+GO

src/API/LeadershiProfileAPI.Tests/Data/Models/ProfileProfessionalDevelopmentTests.cs

@@ -9,7 +9,7 @@ public class ProfileProfessionalDevelopmentTests
         [Fact]
         public async Task ShouldGetProfessionalDevelopment()
         {
-            await Testing.DbContextScopeExec(ctx => ctx.ProfileProfessionalDevelopment.AnyAsync());
+            await Testing.DbContextScopeExec(ctx => ctx.StaffProfessionalDevelopments.AnyAsync());
         }
     }
 }

src/API/LeadershipProfileAPI/Data/EdFiDbContext.cs

@@ -18,7 +18,7 @@ public EdFiDbContext(DbContextOptions<EdFiDbContext> options) : base(options)
         public DbSet<ProfilePositionHistory> ProfilePositionHistory { get; set; }
         public DbSet<ProfileCertification> ProfileCertification { get; set; }
         public DbSet<ProfileEducation> ProfileEducation { get; set; }
-        public DbSet<ProfileProfessionalDevelopment> ProfileProfessionalDevelopment { get; set; }
+        public DbSet<StaffProfessionalDevelopment> StaffProfessionalDevelopments { get; set; }
         public DbSet<StaffAdmin> StaffAdmins { get; set; }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
@@ -46,16 +46,16 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .ToView("vw_LeadershipProfileEducation", "edfi")
                 .HasNoKey();
 
-            modelBuilder.Entity<ProfileProfessionalDevelopment>()
-                .ToView("vw_LeadershipProfileProfessionalDevelopment", "edfi")
-                .HasNoKey();
-
             modelBuilder.Entity<StaffAdmin>()
                 .HasKey(k => k.Id);
 
             modelBuilder.Entity<StaffEducation>()
                 .ToView("vw_StaffEducations", "edfi")
                 .HasKey(k => new { k.StaffUsi, k.TeacherPreparationProgramName });
+
+            modelBuilder.Entity<StaffProfessionalDevelopment>()
+                .ToView("vw_StaffProfessionalDevelopment", "edfi")
+                .HasKey(k => new { k.StaffUsi, k.ProfessionalDevelopmentTitle });
         }
     }
 

src/API/LeadershipProfileAPI/Data/Models/ProfileProfessionalDevelopment.cs renamed to src/API/LeadershipProfileAPI/Data/Models/StaffProfessionalDevelopment.cs

@@ -2,11 +2,17 @@
 
 namespace LeadershipProfileAPI.Data.Models
 {
-    public class ProfileProfessionalDevelopment
+    public class StaffProfessionalDevelopment
     {
+        /// <summary>PK</summary>
         public int StaffUsi { get; set; }
-        public string StaffUniqueId { get; set; }
+
+        /// <summary>PK</summary>
         public string ProfessionalDevelopmentTitle { get; set; }
+
+        public string StaffUniqueId { get; set; }
         public DateTime AttendanceDate { get; set; }
+        public string Location { get; set; }
+        public string AlignmentToLeadership { get; set; }
     }
 }

src/API/LeadershipProfileAPI/Features/Profile/Get.cs

@@ -37,7 +37,7 @@ public class Response
             public IEnumerable<TeacherEducation> Education { get; set; }
             public PositionHistory[] PositionHistory { get; set; }
             public Certificate[] Certificates { get; set; }
-            public ProfessionalDevelopment[] ProfessionalDevelopment { get; set; }
+            public IEnumerable<ProfessionalDevelopment> ProfessionalDevelopment { get; set; }
         }
 
         public class PositionHistory
@@ -58,10 +58,10 @@ public class Certificate
 
         public class ProfessionalDevelopment
         {
-            public string CourseName { get; set; } = "Default Course Name";
-            public DateTime Date { get; set; }
-            public string Location { get; set; } = "Default Location";
-            public string AlignmentToLeadership { get; set; } = "Default Alignment";
+            public DateTime AttendanceDate { get; set; }
+            public string ProfessionalDevelopmentTitle { get; set; }
+            public string Location { get; set; }
+            public string AlignmentToLeadership { get; set; }
         }
 
         public class TeacherEducation
@@ -108,10 +108,10 @@ public async Task<Response> Handle(Query request, CancellationToken cancellation
                     .ProjectTo<TeacherEducation>(_mapper.ConfigurationProvider)
                     .ToListAsync(cancellationToken);
 
-                var development = await _dbContext.ProfileProfessionalDevelopment.Where(x => x.StaffUniqueId == request.Id)
-                    .ProjectTo<ProfessionalDevelopment>(_mapper.ConfigurationProvider).ToArrayAsync(cancellationToken);
-
-                response.ProfessionalDevelopment = development;
+                response.ProfessionalDevelopment = await _dbContext.StaffProfessionalDevelopments
+                    .Where(o => o.StaffUniqueId == request.Id)
+                    .ProjectTo<ProfessionalDevelopment>(_mapper.ConfigurationProvider)
+                    .ToListAsync(cancellationToken);
 
                 return response;
             }

src/API/LeadershipProfileAPI/Features/Profile/MappingProfile.cs

@@ -38,11 +38,11 @@ public MappingProfile()
                 .ForMember(dst => dst.Degree, opt => opt.MapFrom(x => x.DegreeAwarded))
                 .ForMember(dst => dst.Specialization, opt => opt.MapFrom(x => x.MajorOrSpecialization));
 
-            CreateMap<ProfileProfessionalDevelopment, Get.ProfessionalDevelopment>()
-                .ForMember(dst => dst.CourseName, opt => opt.MapFrom(x => x.ProfessionalDevelopmentTitle))
-                .ForMember(dst => dst.Date, opt => opt.MapFrom(x => x.AttendanceDate))
-                .ForMember(dst => dst.Location, opt => opt.Ignore())
-                .ForMember(dst => dst.AlignmentToLeadership, opt => opt.Ignore());
+            CreateMap<StaffProfessionalDevelopment, Get.ProfessionalDevelopment>()
+                .ForMember(dst => dst.AttendanceDate, opt => opt.MapFrom(x => x.AttendanceDate))
+                .ForMember(dst => dst.ProfessionalDevelopmentTitle, opt => opt.MapFrom(x => x.ProfessionalDevelopmentTitle))
+                .ForMember(dst => dst.Location, opt => opt.MapFrom(x => x.Location))
+                .ForMember(dst => dst.AlignmentToLeadership, opt => opt.MapFrom(x => x.AlignmentToLeadership));
         }
 
         private static string GetFullName(string firstName, string middleName, string lastName)