From 1d1d3ab33d7e671c237747c63bee520559cc9d19 Mon Sep 17 00:00:00 2001 From: nekorpeche Date: Thu, 2 Dec 2021 19:11:09 +0100 Subject: [PATCH] =?UTF-8?q?RI-174:=20Modifier=20les=20listing=20des=20offr?= =?UTF-8?q?es=20pour=20n'afficher=20que=20les=20offres=20non=20archiv?= =?UTF-8?q?=C3=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/JobPostingController.java | 7 ++++--- .../src/app/core/services/api-endpoints.service.ts | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/backend-implicaction/src/main/java/com/dynonuggets/refonteimplicaction/controller/JobPostingController.java b/backend-implicaction/src/main/java/com/dynonuggets/refonteimplicaction/controller/JobPostingController.java index 2713291d4..56e4cd52d 100644 --- a/backend-implicaction/src/main/java/com/dynonuggets/refonteimplicaction/controller/JobPostingController.java +++ b/backend-implicaction/src/main/java/com/dynonuggets/refonteimplicaction/controller/JobPostingController.java @@ -4,6 +4,7 @@ import com.dynonuggets.refonteimplicaction.exception.ImplicactionException; import com.dynonuggets.refonteimplicaction.service.JobPostingService; import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; @@ -37,12 +38,12 @@ public ResponseEntity> getAllByCriteria( @RequestParam(value = "search", defaultValue = "") String search, @RequestParam(value = "contractType", required = false) String contractType, @RequestParam(value = "checkApply", required = false) String checkApplyAsString, - @RequestParam(value = "archive", required = false) String archive + @RequestParam(value = "archiveAsString", required = false) String archiveAsString ) { Pageable pageable = PageRequest.of(page, rows, Sort.by(Sort.Direction.valueOf(sortOrder), sortBy)); final boolean applyCheck = Boolean.parseBoolean(checkApplyAsString); - final boolean isArchive = Boolean.parseBoolean(archive); - Page jobPostingDtos = jobPostingService.getAllWithCriteria(pageable, search, contractType, applyCheck, isArchive); + final Boolean isArchive = StringUtils.isNotBlank(archiveAsString) ? Boolean.parseBoolean(archiveAsString) : null; + Page jobPostingDtos = jobPostingService.getAllWithCriteria(pageable, search, contractType, isArchive, applyCheck); return ResponseEntity.ok(jobPostingDtos); } diff --git a/frontend-implicaction/src/app/core/services/api-endpoints.service.ts b/frontend-implicaction/src/app/core/services/api-endpoints.service.ts index 3a1162476..a12f49db0 100644 --- a/frontend-implicaction/src/app/core/services/api-endpoints.service.ts +++ b/frontend-implicaction/src/app/core/services/api-endpoints.service.ts @@ -206,7 +206,7 @@ export class ApiEndpointsService { * Jobs */ - getAllJobEndpoint(pageable: Pageable, criteria: JobCriteriaFilter, archive: Boolean, checkApply: boolean): string { + getAllJobEndpoint(pageable: Pageable, criteria: JobCriteriaFilter, archive: boolean, checkApply: boolean): string { // on merge les filtres et les attributs de pagination const objectParam = { ...criteria, @@ -215,7 +215,7 @@ export class ApiEndpointsService { sortBy: pageable.sortBy, sortOrder: pageable.sortOrder, checkApply: checkApply, - archive: archive + archive: archive !== null ? `${archive}` : null }; return ApiEndpointsService.createUrlWithQueryParameters( Uris.JOBS.BASE_URI,