Merge pull request #31 from eduardo-paes:development

Modify projects endpoints
eduardo-paes · Oct 28, 2023 · b0f0877 · b0f0877
2 parents af155e3 + e3e1d2d
commit b0f0877
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 44 deletions.
diff --git a/docs/images/apim_gpic.png b/docs/images/apim_gpic.png
diff --git a/docs/images/demo_rate_limit.png b/docs/images/demo_rate_limit.png
diff --git a/docs/images/seq_sample.png b/docs/images/seq_sample.png
diff --git a/src/Application/Mappings/ProjectMappings.cs b/src/Application/Mappings/ProjectMappings.cs
@@ -10,8 +10,12 @@ public ProjectMappings()
         {
             _ = CreateMap<Project, OpenProjectInput>().ReverseMap();
             _ = CreateMap<Project, UpdateProjectInput>().ReverseMap();
-            _ = CreateMap<Project, ResumedReadProjectOutput>().ReverseMap();
             _ = CreateMap<Project, DetailedReadProjectOutput>().ReverseMap();
+            _ = CreateMap<Project, ResumedReadProjectOutput>()
+                .ForMember(dest => dest.ProfessorName, opt => opt.MapFrom(src => src.Professor.User.Name))
+                .ForMember(dest => dest.StudentName, opt => opt.MapFrom(src => src.Student.User.Name))
+                    .ReverseMap();
+
         }
     }
 }
diff --git a/src/Application/Ports/Project/BaseProjectContract.cs b/src/Application/Ports/Project/BaseProjectContract.cs
@@ -37,5 +37,10 @@ public abstract class BaseProjectContract
         public string? CancellationReason { get; set; }
         public DateTime SendingDocumentationDeadline { get; set; }
         #endregion Informações de Controle
+
+        #region Informações dos Envolvidos
+        public string? ProfessorName { get; set; }
+        public string? StudentName { get; set; }
+        #endregion Informações dos Envolvidos
     }
 }
diff --git a/src/Infrastructure/Persistence/Repositories/ProjectRepository.cs b/src/Infrastructure/Persistence/Repositories/ProjectRepository.cs
@@ -53,39 +53,29 @@ public async Task<Project> DeleteAsync(Guid? id)
 
         public async Task<IEnumerable<Project>> GetProfessorProjectsAsync(int skip, int take, Guid? id, bool isClosed = false)
         {
-            return isClosed
-                ? await _context.Projects
-                    .Include(x => x.Student)
-                    .Include(x => x.Professor)
-                    .Include(x => x.SubArea)
-                    .Include(x => x.ProgramType)
-                    .Include(x => x.Notice)
-                    .IgnoreQueryFilters()
-                    .AsAsyncEnumerable()
-                    .Where(x => x.ProfessorId == id
-                        && (x.Status == EProjectStatus.Closed
-                            || x.Status == EProjectStatus.Canceled))
-                    .OrderByDescending(x => x.Notice?.RegistrationStartDate) // Traz os projetos mais recentes primeiro.
-                    .ThenBy(x => x.Title) // Traz os projetos em ordem alfabética.
-                    .Skip(skip)
-                    .Take(take)
-                    .ToListAsync()
-                : (IEnumerable<Project>)await _context.Projects
+            return await _context.Projects
                 .Include(x => x.Student)
+                .Include(x => x.Student!.User)
                 .Include(x => x.Professor)
+                .Include(x => x.Professor!.User)
                 .Include(x => x.SubArea)
                 .Include(x => x.ProgramType)
                 .Include(x => x.Notice)
                 .IgnoreQueryFilters()
                 .AsAsyncEnumerable()
-                .Where(x => x.ProfessorId == id
-                    && x.Status != EProjectStatus.Closed
-                    && x.Status != EProjectStatus.Canceled)
-                .OrderByDescending(x => x.Notice?.RegistrationStartDate) // Traz os projetos mais recentes primeiro.
+                .Where(x => WhereClause(id, x))
+                .OrderByDescending(x => (x.Notice?.RegistrationStartDate)) // Traz os projetos mais recentes primeiro.
                 .ThenBy(x => x.Title) // Traz os projetos em ordem alfabética.
                 .Skip(skip)
                 .Take(take)
                 .ToListAsync();
+
+            bool WhereClause(Guid? id, Project p)
+            {
+                return isClosed
+                    ? p.ProfessorId == id && (p.Status == EProjectStatus.Closed || p.Status == EProjectStatus.Canceled)
+                    : p.ProfessorId == id && p.Status != EProjectStatus.Closed && p.Status != EProjectStatus.Canceled;
+            }
         }
 
         public async Task<IEnumerable<Project>> GetProjectsAsync(int skip, int take, bool isClosed = false)
@@ -123,39 +113,29 @@ public async Task<IEnumerable<Project>> GetProjectsAsync(int skip, int take, boo
 
         public async Task<IEnumerable<Project>> GetStudentProjectsAsync(int skip, int take, Guid? id, bool isClosed = false)
         {
-            return isClosed
-                ? await _context.Projects
-                    .Include(x => x.Student)
-                    .Include(x => x.Professor)
-                    .Include(x => x.SubArea)
-                    .Include(x => x.ProgramType)
-                    .Include(x => x.Notice)
-                    .IgnoreQueryFilters()
-                    .AsAsyncEnumerable()
-                    .Where(x => x.StudentId == id
-                        && (x.Status == EProjectStatus.Closed
-                            || x.Status == EProjectStatus.Canceled))
-                    .OrderByDescending(x => x.Notice?.RegistrationStartDate) // Traz os projetos mais recentes primeiro.
-                    .ThenBy(x => x.Title) // Traz os projetos em ordem alfabética.
-                    .Skip(skip)
-                    .Take(take)
-                    .ToListAsync()
-                : (IEnumerable<Project>)await _context.Projects
+            return await _context.Projects
                 .Include(x => x.Student)
+                .Include(x => x.Student!.User)
                 .Include(x => x.Professor)
+                .Include(x => x.Professor!.User)
                 .Include(x => x.SubArea)
                 .Include(x => x.ProgramType)
                 .Include(x => x.Notice)
                 .IgnoreQueryFilters()
                 .AsAsyncEnumerable()
-                .Where(x => x.StudentId == id
-                    && x.Status != EProjectStatus.Closed
-                    && x.Status != EProjectStatus.Canceled)
+                .Where(x => WhereClause(id, x))
                 .OrderByDescending(x => x.Notice?.RegistrationStartDate) // Traz os projetos mais recentes primeiro.
                 .ThenBy(x => x.Title) // Traz os projetos em ordem alfabética.
                 .Skip(skip)
                 .Take(take)
                 .ToListAsync();
+
+            bool WhereClause(Guid? id, Project p)
+            {
+                return isClosed
+                    ? p.StudentId == id && (p.Status == EProjectStatus.Closed || p.Status == EProjectStatus.Canceled)
+                    : p.StudentId == id && p.Status != EProjectStatus.Closed && p.Status != EProjectStatus.Canceled;
+            }
         }
 
         public async Task<IEnumerable<Project>> GetProjectByNoticeAsync(Guid? noticeId)