RI-203: permet de valider une offre et les groupes

dyno-nuggets · Dec 11, 2021 · 764fba3 · 764fba3
1 parent 806ac52
commit 764fba3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/...caction/src/main/java/com/dynonuggets/refonteimplicaction/controller/GroupController.java b/...caction/src/main/java/com/dynonuggets/refonteimplicaction/controller/GroupController.java
@@ -41,7 +41,7 @@ public ResponseEntity<GroupDto> createSubreddit(@RequestBody GroupDto group) {
         return ResponseEntity.status(CREATED).body(saveDto);
     }
 
-    @GetMapping(VALIDATED_GROUPS_URI)
+    @GetMapping(GET_VALIDATED_GROUPS_URI)
     public ResponseEntity<Page<GroupDto>> 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
@@ -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/...t/java/com/dynonuggets/refonteimplicaction/controller/GroupControllerIntegrationTest.java b/...t/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/...nd-implicaction/src/app/admin/groups/pending-group-table/pending-group-table.component.ts b/...nd-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<Grou
     this.groupService
       .validateGroup(group)
       .subscribe(
-        (data) => {
-          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/...plicaction/src/app/admin/jobs/components/pending-job-table/pending-job-table.component.ts b/...plicaction/src/app/admin/jobs/components/pending-job-table/pending-job-table.component.ts
@@ -30,7 +30,7 @@ export class PendingJobTableComponent extends BaseWithPaginationComponent<JobPos
     this.jobsService
       .validateJob(job)
       .subscribe(
-        () => 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.`),
       );