Publications start and end years filter [RES-15]

src/post-graduation/post-graduation.controller.ts

@@ -23,11 +23,15 @@ export class PostGraduationController {
  @Query('groupByProfessor', ParseBoolPipe) groupByProfessor: boolean,
  @Query('groupByYear', ParseBoolPipe) groupByYear: boolean,
  @Query('filter') filter: 'current' | 'concluded',
+ @Query('startYear') startYear: number,
+ @Query('endYear') endYear: number,
  ): Promise<StudentsDto[]> {
  return await this.postGraduationService.get(
  groupByProfessor,
  groupByYear,
  filter,
+ startYear,
+ endYear,
  );
  }
 }

src/post-graduation/post-graduation.service.ts

@@ -7,6 +7,8 @@ export class PostGraduationService {
  groupByProfessor: boolean,
  groupByYear: boolean,
  filter: 'current' | 'concluded',
+ startYear: number,
+ endYear: number,
  ) {
  const queryRunner = AppDataSource.createQueryRunner();
 
@@ -29,14 +31,15 @@ export class PostGraduationService {
  LEFT JOIN advisee a ON a.professor_id=p.id
  ${
  filter === 'concluded'
- ? 'WHERE a.year_start IS NULL AND a.year_end IS NOT NULL'
+ ? ` WHERE a.year_start IS NULL AND a.year_end IS NOT NULL AND a.year_end >= ${startYear} AND a.year_end <= ${endYear}`
  : ''
  }
  ${
  filter === 'current'
- ? 'WHERE a.year_end IS NULL AND a.year_start IS NOT NULL'
+ ? ` WHERE a.year_end IS NULL AND a.year_start IS NOT NULL AND a.year_start >= ${startYear} AND a.year_start <= ${endYear}`
  : ''
  }
+
  ${
  groupByProfessor && groupByYear
  ? 'GROUP BY p.id, year ORDER BY p.name ASC, year DESC;'

src/projects/projects.controller.ts

@@ -1,4 +1,10 @@
-import { Controller, Get, ParseBoolPipe, Query } from '@nestjs/common';
+import {
+ Controller,
+ Get,
+ ParseBoolPipe,
+ ParseIntPipe,
+ Query,
+} from '@nestjs/common';
 import { ApiOAuth2, ApiResponse, ApiTags } from '@nestjs/swagger';
 import { Roles } from 'nest-keycloak-connect';
 import { SystemRoles } from 'src/types/enums';
@@ -25,7 +31,14 @@ export class ProjectsController {
  async get(
  @Query('groupByProfessor', ParseBoolPipe) groupByProfessor: boolean,
  @Query('groupByYear', ParseBoolPipe) groupByYear: boolean,
+ @Query('startYear', ParseIntPipe) startYear: number,
+ @Query('endYear', ParseIntPipe) endYear: number,
  ): Promise<ProjectsDto[]> {
- return await this.projectsService.get(groupByProfessor, groupByYear);
+ return await this.projectsService.get(
+ groupByProfessor,
+ groupByYear,
+ startYear,
+ endYear,
+ );
  }
 }

src/projects/projects.service.ts

@@ -7,6 +7,8 @@ export class ProjectsService {
  async get(
  groupByProfessor: boolean,
  groupByYear: boolean,
+ startYear: number,
+ endYear: number,
  ): Promise<ProjectsDto[]> {
  const queryRunner = AppDataSource.createQueryRunner();
 
@@ -30,6 +32,8 @@ export class ProjectsService {
  LEFT JOIN project_financier pf ON pf.project_id=pr.id
  LEFT JOIN financier f ON pf.financier_id=f.id
  WHERE pr.year IS NOT NULL
+ AND pr.year >= ${startYear}
+ AND pr.year <= ${endYear}
  ${
  groupByProfessor && groupByYear
  ? 'GROUP BY p.id, pr.year ORDER BY p.name ASC, pr.year DESC;'

src/publications/publications.controller.ts

@@ -1,4 +1,10 @@
-import { Controller, Get, ParseBoolPipe, Query } from '@nestjs/common';
+import {
+ Controller,
+ Get,
+ ParseBoolPipe,
+ ParseIntPipe,
+ Query,
+} from '@nestjs/common';
 import { ApiOAuth2, ApiResponse, ApiTags } from '@nestjs/swagger';
 import { Roles } from 'nest-keycloak-connect';
 import { SystemRoles } from 'src/types/enums';
@@ -26,12 +32,16 @@ export class PublicationsController {
  @Query('groupByYear', ParseBoolPipe) groupByYear: boolean,
  @Query('articles', ParseBoolPipe) articles: boolean,
  @Query('conferences', ParseBoolPipe) conferences: boolean,
+ @Query('startYear', ParseIntPipe) startYear: number,
+ @Query('endYear', ParseIntPipe) endYear: number,
  ): Promise<PublicationsDto[]> {
  return await this.publicationsService.get(
  articles,
  conferences,
  groupByProfessor,
  groupByYear,
+ startYear,
+ endYear,
  );
  }
 }

src/publications/publications.service.ts

@@ -9,6 +9,8 @@ export class PublicationsService {
  conferencePublications: boolean,
  groupByProfessor: boolean,
  groupByYear: boolean,
+ startYear: number,
+ endYear: number,
  ) {
  const selectPublications = `
  SELECT
@@ -60,16 +62,21 @@ export class PublicationsService {
  FROM "professor" "p"
  `;
 
+ const whereClause = ` WHERE pp.year >= ${startYear} AND pp.year <= ${endYear}`;
+
  const groupBy =
  (groupByProfessor && groupByYear ? ` GROUP BY p.name, p.id, year` : '') +
  (groupByProfessor && !groupByYear ? ` GROUP BY p.name, p.id` : '') +
  (!groupByProfessor && groupByYear ? ` GROUP BY year` : '');
 
  const joinJournalPublications =
- `JOIN "journal_publication" "pp" on "pp"."professor_id"=p.id` + groupBy;
+ `JOIN "journal_publication" "pp" on "pp"."professor_id"=p.id` +
+ whereClause +
+ groupBy;
 
  const joinConferencePublications =
  `JOIN "conference_publication" "pp" on "pp"."professor_id"=p.id` +
+ whereClause +
  groupBy;
 
  return (
@@ -102,6 +109,8 @@ export class PublicationsService {
  conferencePublications: boolean,
  groupByProfessor: boolean,
  groupByYear: boolean,
+ startYear: number,
+ endYear: number,
  ) {
  if (!journalPublications && !conferencePublications) return [];
 
@@ -115,6 +124,8 @@ export class PublicationsService {
  conferencePublications,
  groupByProfessor,
  groupByYear,
+ startYear,
+ endYear,
  ),
  );