From 3692aa80a48c164274ebfa2f059f070a175b81f8 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Thu, 5 Sep 2024 11:53:22 +0200 Subject: [PATCH] =?UTF-8?q?feat(services):=20Hinzuf=C3=BCgen=20des=20Envel?= =?UTF-8?q?opeService=20zur=20Verarbeitung=20von=20API-Anfragen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/EnvelopeService.cs | 3 --- .../envelope-table.component.ts | 4 ++++ .../app/services/envelope-receiver.service.ts | 1 - .../src/app/services/envelope.service.spec.ts | 16 +++++++++++++ .../src/app/services/envelope.service.ts | 24 +++++++++++++++++++ .../Controllers/EnvelopeController.cs | 5 ++-- 6 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/envelope.service.spec.ts create mode 100644 EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/envelope.service.ts diff --git a/EnvelopeGenerator.Application/Services/EnvelopeService.cs b/EnvelopeGenerator.Application/Services/EnvelopeService.cs index 2c394713..c7e373d8 100644 --- a/EnvelopeGenerator.Application/Services/EnvelopeService.cs +++ b/EnvelopeGenerator.Application/Services/EnvelopeService.cs @@ -6,18 +6,15 @@ using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Application.Resources; using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Infrastructure.Contracts; -using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; namespace EnvelopeGenerator.Application.Services { public class EnvelopeService : BasicCRUDService, IEnvelopeService { - private readonly ILogger _logger; public EnvelopeService(IEnvelopeRepository repository, IMapper mapper, ILogger logger) : base(repository, mapper) { - _logger = logger; } public async Task>> ReadAllWithAsync(bool documents = false, bool history = false, bool documentReceiverElement = false) diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/envelope-table/envelope-table.component.ts b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/envelope-table/envelope-table.component.ts index c26129b6..e79219ff 100644 --- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/envelope-table/envelope-table.component.ts +++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/envelope-table/envelope-table.component.ts @@ -1,5 +1,6 @@ import { AfterViewInit, Component, Input, ViewChild, inject, viewChild } from '@angular/core'; import { EnvelopeReceiverService } from '../../../services/envelope-receiver.service'; +import { EnvelopeService } from '../../../services/envelope.service'; import { animate, state, style, transition, trigger } from '@angular/animations'; import { ConfigurationService } from '../../../services/configuration.service'; import { DDTable } from "../dd-table/dd-table.component"; @@ -60,9 +61,12 @@ export class EnvelopeTableComponent implements AfterViewInit { private erService: EnvelopeReceiverService = inject(EnvelopeReceiverService); + private envService: EnvelopeService = inject(EnvelopeService); + private config: ConfigurationService = inject(ConfigurationService); async ngAfterViewInit() { this.data = await this.erService.getEnvelopeReceiverAsync(this.options); + await this.envService.getEnvelopeAsync().then(console.log) } } \ No newline at end of file diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/envelope-receiver.service.ts b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/envelope-receiver.service.ts index 3a1a3766..526439f1 100644 --- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/envelope-receiver.service.ts +++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/envelope-receiver.service.ts @@ -27,7 +27,6 @@ export class EnvelopeReceiverService { return this.http.get(this.url, { params }); } - getEnvelopeReceiverAsync(options?: { min_status?: number; max_status?: number; ignore_status?: number[] }): Promise { return firstValueFrom(this.getEnvelopeReceiver(options)); } diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/envelope.service.spec.ts b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/envelope.service.spec.ts new file mode 100644 index 00000000..25fa59b3 --- /dev/null +++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/envelope.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { EnvelopeService } from './envelope.service'; + +describe('EnvelopeService', () => { + let service: EnvelopeService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(EnvelopeService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/envelope.service.ts b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/envelope.service.ts new file mode 100644 index 00000000..903d215e --- /dev/null +++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/envelope.service.ts @@ -0,0 +1,24 @@ +import { Injectable, inject } from '@angular/core'; +import { HttpClient, HttpParams } from '@angular/common/http'; +import { Observable, firstValueFrom } from 'rxjs'; +import { API_URL } from '../tokens/index'; + +@Injectable({ + providedIn: 'root' +}) +export class EnvelopeService { + protected url: string; + + constructor(private http: HttpClient) { + const api_url = inject(API_URL); + this.url = `${api_url}/envelope`; + } + + public getEnvelope(): Observable { + return this.http.get(this.url); + } + + public async getEnvelopeAsync(): Promise { + return await firstValueFrom(this.getEnvelope()); + } +} \ No newline at end of file diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs index a1440d8f..0ebe72d6 100644 --- a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs +++ b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs @@ -10,7 +10,7 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers [Authorize] public class EnvelopeController : ControllerBase { - private ILogger _logger; + private readonly ILogger _logger; private readonly IEnvelopeService _envelopeService; public EnvelopeController(ILogger logger, IEnvelopeService envelopeService) @@ -20,7 +20,8 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers } [Authorize] - public async Task GetCurrentAsync(bool current_user) + [HttpGet] + public async Task GetCurrentAsync() { try {