RI-174: Modifier les listing des offres pour n'afficher que les offre…

…s non archivées
dyno-nuggets · Dec 2, 2021 · 1d1d3ab · 1d1d3ab
1 parent 524ad4a
commit 1d1d3ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...on/src/main/java/com/dynonuggets/refonteimplicaction/controller/JobPostingController.java b/...on/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<Page<JobPostingDto>> 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<JobPostingDto> jobPostingDtos = jobPostingService.getAllWithCriteria(pageable, search, contractType, applyCheck, isArchive);
+        final Boolean isArchive = StringUtils.isNotBlank(archiveAsString) ? Boolean.parseBoolean(archiveAsString) : null;
+        Page<JobPostingDto> 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
@@ -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,