Merge pull request #2608 from gkbishnoi07/WEB-285-replace-custom-api-of-users-service-ts

Web 285 replace custom api of users-service.ts

Author: steinwinde

src/app/users/create-user/create-user.component.ts

@@ -11,7 +11,7 @@ import { Router, ActivatedRoute, RouterLink } from '@angular/router';
 import { MatDialog } from '@angular/material/dialog';
 
 /** Custom Services */
-import { UsersService } from '../users.service';
+import { UsersService, StaffService } from '@fineract/client';
 import { PopoverService } from '../../configuration-wizard/popover/popover.service';
 
 /** Custom Dialog Component */
@@ -52,7 +52,8 @@ export class CreateUserComponent implements OnInit, AfterViewInit {
   /**
    * Retrieves the offices and roles data from `resolve`.
    * @param {FormBuilder} formBuilder Form Builder.
-   * @param {UsersService} UsersService Users Service.
+   * @param {UsersService} usersService Users Service.
+   * @param {StaffService} staffService Staff Service.
    * @param {ActivatedRoute} route Activated Route.
    * @param {Router} router Router for navigation.
    * @param {ConfigurationWizardService} configurationWizardService ConfigurationWizard Service.
@@ -61,6 +62,7 @@ export class CreateUserComponent implements OnInit, AfterViewInit {
   constructor(
     private formBuilder: UntypedFormBuilder,
     private usersService: UsersService,
+    private staffService: StaffService,
     private route: ActivatedRoute,
     private router: Router,
     private popoverService: PopoverService,
@@ -134,7 +136,7 @@ export class CreateUserComponent implements OnInit, AfterViewInit {
   setStaffData() {
     this.userForm.get('officeId').valueChanges.subscribe((officeId: string) => {
       this.staffData = [];
-      this.usersService.getStaff(officeId).subscribe((staff: any) => {
+      this.staffService.retrieveAll16({ officeId: Number(officeId) }).subscribe((staff: any) => {
         this.staffData = staff;
       });
     });
@@ -175,7 +177,7 @@ export class CreateUserComponent implements OnInit, AfterViewInit {
     if (this.userForm.value.staffId == null || this.userForm.value.staffId === '') {
       delete user.staffId;
     }
-    this.usersService.createUser(user).subscribe((response: any) => {
+    this.usersService.create15({ postUsersRequest: user }).subscribe((response: any) => {
       if (this.configurationWizardService.showUsersForm === true) {
         this.configurationWizardService.showUsersForm = false;
         this.openDialog();

src/app/users/edit-user/edit-user.component.ts

@@ -4,7 +4,7 @@ import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
 
 /** Custom Services */
-import { UsersService } from '../users.service';
+import { UsersService, StaffService } from '@fineract/client';
 import { MatCheckbox } from '@angular/material/checkbox';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 
@@ -36,12 +36,14 @@ export class EditUserComponent implements OnInit {
    * Retrieves the offices data from `resolve`.
    * @param {FormBuilder} formBuilder Form Builder.
    * @param {UsersService} UsersService Users Service.
+   * @param {StaffService} staffService Staff Service.
    * @param {ActivatedRoute} route Activated Route.
    * @param {Router} router Router for navigation.
    */
   constructor(
     private formBuilder: UntypedFormBuilder,
     private usersService: UsersService,
+    private staffService: StaffService,
     private route: ActivatedRoute,
     private router: Router
   ) {
@@ -105,7 +107,7 @@ export class EditUserComponent implements OnInit {
    */
   officeChanged(officeId: number) {
     this.staffData = [];
-    this.usersService.getStaff(officeId).subscribe((staff: any) => {
+    this.staffService.retrieveAll16({ officeId }).subscribe((staff: any) => {
       this.staffData = staff;
     });
   }
@@ -116,7 +118,7 @@ export class EditUserComponent implements OnInit {
    */
   submit() {
     const editedUser = this.editUserForm.value;
-    this.usersService.editUser(this.userData.id, editedUser).subscribe((response: any) => {
+    this.usersService.update26(this.userData.id, editedUser).subscribe((response: any) => {
       this.router.navigate(
         [
           '../../',

src/app/users/user.resolver.ts

@@ -6,7 +6,7 @@ import { ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { UsersService } from './users.service';
+import { UsersService } from '@fineract/client';
 
 /**
  * User data resolver.
@@ -24,6 +24,6 @@ export class UserResolver {
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
     const userId = route.paramMap.get('id');
-    return this.usersService.getUser(userId);
+    return this.usersService.retrieveOne31({ userId: Number(userId) });
   }
 }

src/app/users/users-template.resolver.ts

@@ -5,7 +5,7 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { UsersService } from './users.service';
+import { UsersService } from '@fineract/client';
 
 /**
  * Users template data resolver.
@@ -22,6 +22,6 @@ export class UsersTemplateResolver {
    * @returns {Observable<any>}
    */
   resolve(): Observable<any> {
-    return this.usersService.getUsersTemplate();
+    return this.usersService.template22();
   }
 }

src/app/users/users.resolver.ts

@@ -5,7 +5,7 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { UsersService } from './users.service';
+import { UsersService } from '@fineract/client';
 
 /**
  * Users data resolver.
@@ -22,6 +22,6 @@ export class UsersResolver {
    * @returns {Observable<any>}
    */
   resolve(): Observable<any> {
-    return this.usersService.getUsers();
+    return this.usersService.retrieveAll41();
   }
 }

src/app/users/users.service.ts

@@ -4,7 +4,7 @@ import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { MatDialog } from '@angular/material/dialog';
 
 /** Custom Services */
-import { UsersService } from '../users.service';
+import { UsersService } from '@fineract/client';
 
 /** Custom Components */
 import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component';
@@ -56,7 +56,7 @@ export class ViewUserComponent {
     });
     deleteUserDialogRef.afterClosed().subscribe((response: any) => {
       if (response.delete) {
-        this.usersService.deleteUser(this.userData.id).subscribe(() => {
+        this.usersService.delete23(this.userData.id).subscribe(() => {
           this.router.navigate(['/appusers']);
         });
       }
@@ -76,7 +76,11 @@ export class ViewUserComponent {
         const repeatPassword = response.repeatPassword;
         const firstname = this.userData.firstname;
         const data = { password: password, repeatPassword: repeatPassword, firstname: firstname };
-        this.usersService.changePassword(this.userData.id, data).subscribe(() => {
+        const requestParams = {
+          userId: this.userData.id,
+          changePwdUsersUserIdRequest: data
+        };
+        this.usersService.changePassword(requestParams).subscribe(() => {
           this.router.navigate(['/appusers']);
         });
       }