From 764fba3e9069d1cd1ff40fad6b8e89e2b7c01790 Mon Sep 17 00:00:00 2001 From: nekorpeche Date: Sun, 12 Dec 2021 00:09:32 +0100 Subject: [PATCH] RI-203: permet de valider une offre et les groupes --- .../refonteimplicaction/controller/GroupController.java | 2 +- .../com/dynonuggets/refonteimplicaction/utils/ApiUrls.java | 2 +- .../controller/GroupControllerIntegrationTest.java | 2 +- .../pending-group-table/pending-group-table.component.ts | 5 +---- .../pending-job-table/pending-job-table.component.ts | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/backend-implicaction/src/main/java/com/dynonuggets/refonteimplicaction/controller/GroupController.java b/backend-implicaction/src/main/java/com/dynonuggets/refonteimplicaction/controller/GroupController.java index 4ac0aebdc..5fa2c3fee 100644 --- a/backend-implicaction/src/main/java/com/dynonuggets/refonteimplicaction/controller/GroupController.java +++ b/backend-implicaction/src/main/java/com/dynonuggets/refonteimplicaction/controller/GroupController.java @@ -41,7 +41,7 @@ public ResponseEntity createSubreddit(@RequestBody GroupDto group) { return ResponseEntity.status(CREATED).body(saveDto); } - @GetMapping(VALIDATED_GROUPS_URI) + @GetMapping(GET_VALIDATED_GROUPS_URI) public ResponseEntity> getAllValidGroups( @RequestParam(value = "page", defaultValue = "0") int page, @RequestParam(value = "rows", defaultValue = "10") int rows, diff --git a/backend-implicaction/src/main/java/com/dynonuggets/refonteimplicaction/utils/ApiUrls.java b/backend-implicaction/src/main/java/com/dynonuggets/refonteimplicaction/utils/ApiUrls.java index ac750b446..fbd13f22c 100644 --- a/backend-implicaction/src/main/java/com/dynonuggets/refonteimplicaction/utils/ApiUrls.java +++ b/backend-implicaction/src/main/java/com/dynonuggets/refonteimplicaction/utils/ApiUrls.java @@ -34,7 +34,7 @@ public class ApiUrls { public static final String CREATE_NO_IMAGE = "/no-image"; public static final String GET_PENDING_GROUP_URI = "/pending"; public static final String VALIDATE_GROUP_URI = "/validate"; - public static final String VALIDATED_GROUPS_URI = "/validated"; + public static final String GET_VALIDATED_GROUPS_URI = "/validated"; // COMMENTS public static final String COMMENTS_BASE_URI = "/api/comments"; diff --git a/backend-implicaction/src/test/java/com/dynonuggets/refonteimplicaction/controller/GroupControllerIntegrationTest.java b/backend-implicaction/src/test/java/com/dynonuggets/refonteimplicaction/controller/GroupControllerIntegrationTest.java index cbead71d1..43bf370ce 100644 --- a/backend-implicaction/src/test/java/com/dynonuggets/refonteimplicaction/controller/GroupControllerIntegrationTest.java +++ b/backend-implicaction/src/test/java/com/dynonuggets/refonteimplicaction/controller/GroupControllerIntegrationTest.java @@ -87,7 +87,7 @@ void should_list_all_subreddit_with_no_authentication() throws Exception { given(userRepository.findById(any())).willReturn(Optional.of(user)); // when - final ResultActions resultActions = mvc.perform(get(GROUPS_BASE_URI + VALIDATED_GROUPS_URI).contentType(APPLICATION_JSON)); + final ResultActions resultActions = mvc.perform(get(GROUPS_BASE_URI + GET_VALIDATED_GROUPS_URI).contentType(APPLICATION_JSON)); // then resultActions.andDo(print()) diff --git a/frontend-implicaction/src/app/admin/groups/pending-group-table/pending-group-table.component.ts b/frontend-implicaction/src/app/admin/groups/pending-group-table/pending-group-table.component.ts index 69a9df371..46a8d6011 100644 --- a/frontend-implicaction/src/app/admin/groups/pending-group-table/pending-group-table.component.ts +++ b/frontend-implicaction/src/app/admin/groups/pending-group-table/pending-group-table.component.ts @@ -1,7 +1,6 @@ import {Component} from '@angular/core'; import {BaseWithPaginationComponent} from '../../../shared/components/base-with-pagination/base-with-pagination.component'; import {Group} from '../../../discussion/model/group'; -import {SortDirectionEnum} from '../../../shared/enums/sort-direction.enum'; import {ActivatedRoute} from '@angular/router'; import {ToasterService} from '../../../core/services/toaster.service'; import {GroupService} from '../../../discussion/services/group.service'; @@ -31,9 +30,7 @@ export class PendingGroupTableComponent extends BaseWithPaginationComponent { - this.paginate({first: this.pageable.first, rows: this.pageable.rows}); - }, + () => this.paginate(this.pageable), () => this.toastService.error('Oops', `Une erreur est survenue lors de la validation du groupe.`), () => this.toastService.success('Succès', `Le groupe ${group.name} est désormais validé.`), ); diff --git a/frontend-implicaction/src/app/admin/jobs/components/pending-job-table/pending-job-table.component.ts b/frontend-implicaction/src/app/admin/jobs/components/pending-job-table/pending-job-table.component.ts index 2252c4829..381986fcb 100644 --- a/frontend-implicaction/src/app/admin/jobs/components/pending-job-table/pending-job-table.component.ts +++ b/frontend-implicaction/src/app/admin/jobs/components/pending-job-table/pending-job-table.component.ts @@ -30,7 +30,7 @@ export class PendingJobTableComponent extends BaseWithPaginationComponent this.paginate({first: this.pageable.first, rows: this.pageable.rows}), + () => this.paginate(this.pageable), () => this.toastService.error('Oops', `Une erreur est survenue lors de la validation de l'offre.`), () => this.toastService.success('Succès', `L'offre ${job.title} est désormais validée.`), );