Merge pull request #2609 from gkbishnoi07/WEB-287-replace-custom-api-of-templates-service-ts

Web-287 replace custom api of templates-service.ts

Author: steinwinde

src/app/templates/common-resolvers/create-template.resolver.ts

@@ -5,23 +5,23 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { TemplatesService } from '../templates.service';
+import { UserGeneratedDocumentsService } from '@fineract/client';
 
 /**
  * Create Template data resolver.
  */
 @Injectable()
 export class CreateTemplateResolver {
   /**
-   * @param {TemplatesService} templatesService Templates service.
+   * @param {UserGeneratedDocumentsService} userGeneratedDocumentsService User Generated Documents service.
    */
-  constructor(private templatesService: TemplatesService) {}
+  constructor(private userGeneratedDocumentsService: UserGeneratedDocumentsService) {}
 
   /**
    * Returns the template data.
    * @returns {Observable<any>}
    */
   resolve(): Observable<any> {
-    return this.templatesService.getCreateTemplateData();
+    return this.userGeneratedDocumentsService.template20();
   }
 }

src/app/templates/common-resolvers/edit-template.resolver.ts

@@ -6,24 +6,26 @@ import { ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { TemplatesService } from '../templates.service';
+import { UserGeneratedDocumentsService } from '@fineract/client';
 
 /**
  * Edit Template data resolver.
  */
 @Injectable()
 export class EditTemplateResolver {
   /**
-   * @param {TemplatesService} templatesService Templates service.
+   * @param {UserGeneratedDocumentsService} userGeneratedDocumentsService User Generated Documents service.
    */
-  constructor(private templatesService: TemplatesService) {}
+  constructor(private userGeneratedDocumentsService: UserGeneratedDocumentsService) {}
 
   /**
    * Returns the template data.
    * @returns {Observable<any>}
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
     const templateId = route.paramMap.get('id');
-    return this.templatesService.getEditTemplateData(templateId);
+    return this.userGeneratedDocumentsService.getTemplateByTemplate({
+      templateId: Number(templateId)
+    });
   }
 }

src/app/templates/common-resolvers/template.resolver.ts

@@ -6,24 +6,24 @@ import { ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { TemplatesService } from '../templates.service';
+import { UserGeneratedDocumentsService } from '@fineract/client';
 
 /**
  * Template data resolver.
  */
 @Injectable()
 export class TemplateResolver {
   /**
-   * @param {TemplatesService} templatesService Templates service.
+   * @param {UserGeneratedDocumentsService} userGeneratedDocumentsService User Generated Documents service.
    */
-  constructor(private templatesService: TemplatesService) {}
+  constructor(private userGeneratedDocumentsService: UserGeneratedDocumentsService) {}
 
   /**
    * Returns the Template data.
    * @returns {Observable<any>}
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
-    const templateId = route.paramMap.get('id');
-    return this.templatesService.getTemplate(templateId);
+    const templateId = Number(route.paramMap.get('id'));
+    return this.userGeneratedDocumentsService.retrieveOne30({ templateId });
   }
 }

src/app/templates/common-resolvers/templates.resolver.ts

@@ -5,23 +5,23 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { TemplatesService } from '../templates.service';
+import { UserGeneratedDocumentsService } from '@fineract/client';
 
 /**
  * Templates data resolver.
  */
 @Injectable()
 export class TemplatesResolver {
   /**
-   * @param {TemplatesService} templatesService Templates service.
+   * @param {UserGeneratedDocumentsService} userGeneratedDocumentsService User Generated Documents service.
    */
-  constructor(private templatesService: TemplatesService) {}
+  constructor(private userGeneratedDocumentsService: UserGeneratedDocumentsService) {}
 
   /**
    * Returns the templates data.
    * @returns {Observable<any>}
    */
   resolve(): Observable<any> {
-    return this.templatesService.getTemplates();
+    return this.userGeneratedDocumentsService.retrieveAll40();
   }
 }

src/app/templates/create-edit-template/create-edit-template.component.ts

@@ -16,7 +16,7 @@ import ClassicEditor from '@ckeditor/ckeditor5-build-classic';
 import { clientParameterLabels, loanParameterLabels, repaymentParameterLabels } from '../template-parameter-labels';
 
 /** Custom Services */
-import { TemplatesService } from '../templates.service';
+import { UserGeneratedDocumentsService } from '@fineract/client';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { CKEditorModule } from '@ckeditor/ckeditor5-angular';
 import {
@@ -73,13 +73,13 @@ export class CreateEditComponent implements OnInit {
    * @param {FormBuilder} formBuilder Form Builder.
    * @param {ActivatedRoute} route Activated Route.
    * @param {Router} router Router for navigation.
-   * @param {TemplateService} templateService Templates Service
+   * @param {UserGeneratedDocumentsService} userGeneratedDocumentsService User Generated Documents Service
    */
   constructor(
     private formBuilder: UntypedFormBuilder,
     private route: ActivatedRoute,
     private router: Router,
-    private templateService: TemplatesService
+    private userGeneratedDocumentsService: UserGeneratedDocumentsService
   ) {
     this.route.data.subscribe((data: { templateData: any; mode: 'create' | 'edit' }) => {
       this.templateData = data.templateData;
@@ -244,19 +244,26 @@ export class CreateEditComponent implements OnInit {
       text: this.getEditorContent()
     };
     if (this.mode === 'create') {
-      this.templateService.createTemplate(template).subscribe((response: any) => {
-        this.router.navigate(
-          [
-            '../',
-            response.resourceId
-          ],
-          { relativeTo: this.route }
-        );
-      });
+      this.userGeneratedDocumentsService
+        .createTemplate({ postTemplatesRequest: template })
+        .subscribe((response: any) => {
+          this.router.navigate(
+            [
+              '../',
+              response.resourceId
+            ],
+            { relativeTo: this.route }
+          );
+        });
     } else {
-      this.templateService.updateTemplate(template, this.templateData.template.id).subscribe(() => {
-        this.router.navigate(['../'], { relativeTo: this.route });
-      });
+      this.userGeneratedDocumentsService
+        .saveTemplate({
+          templateId: this.templateData.template.id,
+          putTemplatesTemplateIdRequest: template
+        })
+        .subscribe(() => {
+          this.router.navigate(['../'], { relativeTo: this.route });
+        });
     }
   }
 }

src/app/templates/templates.service.ts

@@ -4,7 +4,7 @@ import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { MatDialog } from '@angular/material/dialog';
 
 /** Custom Services */
-import { TemplatesService } from '../templates.service';
+import { UserGeneratedDocumentsService } from '@fineract/client';
 
 /** Custom Components */
 import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component';
@@ -29,14 +29,14 @@ export class ViewTemplateComponent {
 
   /**
    * Retrieves the template data from `resolve`.
-   * @param {TemplateService} templateService Accounting Service.
+   * @param {UserGeneratedDocumentsService} userGeneratedDocumentsService User Generated Documents Service.
    * @param {ActivatedRoute} route Activated Route.
    * @param {Router} router Router for navigation.
    * @param {MatDialog} dialog Dialog reference.
    */
   constructor(
     private route: ActivatedRoute,
-    private templatesService: TemplatesService,
+    private userGeneratedDocumentsService: UserGeneratedDocumentsService,
     private router: Router,
     private dialog: MatDialog
   ) {
@@ -54,7 +54,7 @@ export class ViewTemplateComponent {
     });
     deleteTemplateDialogRef.afterClosed().subscribe((response: any) => {
       if (response.delete) {
-        this.templatesService.deleteTemplate(this.templateData.id).subscribe(() => {
+        this.userGeneratedDocumentsService.deleteTemplate({ templateId: this.templateData.id }).subscribe(() => {
           this.router.navigate(['/templates']);
         });
       }