Chore: Updated resolvers from Class to ResolveFn

overlord/src/app/payment/payment-accounts-resolver.service.spec.ts

@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { PaymentAccountsResolver } from './payment-accounts-resolver.service';
-
-describe('PaymentAccountsResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [PaymentAccountsResolver],
-    });
-  });
-
-  it('should be created', inject([PaymentAccountsResolver], (service: PaymentAccountsResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});

overlord/src/app/payment/payment-accounts-resolver.service.ts

@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Account } from '../core/account';
-import { AccountService } from '../core/account.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class PaymentAccountsResolver {
-  constructor(private ser: AccountService) {}
-
-  resolve(): Observable<Account[]> {
-    return this.ser.paymentAutocomplete('');
-  }
-}

overlord/src/app/payment/payment-accounts.resolver.spec.ts

@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Account } from '../core/account';
+
+import { paymentAccountsResolver } from './payment-accounts.resolver';
+
+describe('paymentAccountsResolver', () => {
+  const executeResolver: ResolveFn<Account[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => paymentAccountsResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});

overlord/src/app/payment/payment-accounts.resolver.ts

@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Account } from '../core/account';
+import { AccountService } from '../core/account.service';
+
+export const paymentAccountsResolver: ResolveFn<Account[]> = () => {
+  return inject(AccountService).paymentAutocomplete('');
+};

overlord/src/app/payment/payment-resolver.service.spec.ts

@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { PaymentResolver } from './payment-resolver.service';
-
-describe('PaymentResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [PaymentResolver],
-    });
-  });
-
-  it('should be created', inject([PaymentResolver], (service: PaymentResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});

overlord/src/app/payment/payment-resolver.service.ts

@@ -1,25 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Voucher } from '../core/voucher';
-import { VoucherService } from '../core/voucher.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class PaymentResolver {
-  constructor(private ser: VoucherService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Voucher> {
-    const id = route.paramMap.get('id');
-    const account = route.queryParamMap.get('a') || null;
-    if (id !== null) {
-      return this.ser.get(id, 'Payment');
-    }
-    if (account !== null) {
-      return this.ser.getOfType('Payment', account);
-    }
-    return this.ser.getOfType('Payment');
-  }
-}

overlord/src/app/payment/payment-routing.module.ts

@@ -4,9 +4,9 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { PaymentAccountsResolver } from './payment-accounts-resolver.service';
-import { PaymentResolver } from './payment-resolver.service';
+import { paymentAccountsResolver } from './payment-accounts.resolver';
 import { PaymentComponent } from './payment.component';
+import { paymentResolver } from './payment.resolver';
 
 const paymentRoutes: Routes = [
   {
@@ -19,8 +19,8 @@ const paymentRoutes: Routes = [
       permission: 'journal',
     },
     resolve: {
-      paymentAccounts: () => inject(PaymentAccountsResolver).resolve(),
-      voucher: (route: ActivatedRouteSnapshot) => inject(PaymentResolver).resolve(route),
+      paymentAccounts: paymentAccountsResolver,
+      voucher: paymentResolver,
     },
     runGuardsAndResolvers: 'paramsChange',
   },
@@ -34,8 +34,8 @@ const paymentRoutes: Routes = [
       permission: 'journal',
     },
     resolve: {
-      paymentAccounts: () => inject(PaymentAccountsResolver).resolve(),
-      voucher: (route: ActivatedRouteSnapshot) => inject(PaymentResolver).resolve(route),
+      paymentAccounts: paymentAccountsResolver,
+      voucher: paymentResolver,
     },
     runGuardsAndResolvers: 'paramsChange',
   },
@@ -44,6 +44,5 @@ const paymentRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(paymentRoutes)],
   exports: [RouterModule],
-  providers: [PaymentResolver],
 })
 export class PaymentRoutingModule {}

overlord/src/app/payment/payment.resolver.spec.ts

@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+
+import { paymentResolver } from './payment.resolver';
+
+describe('paymentResolver', () => {
+  const executeResolver: ResolveFn<Voucher> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => paymentResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});

overlord/src/app/payment/payment.resolver.ts

@@ -0,0 +1,17 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+import { VoucherService } from '../core/voucher.service';
+
+export const paymentResolver: ResolveFn<Voucher> = (route) => {
+  const id = route.paramMap.get('id');
+  const account = route.queryParamMap.get('a') || null;
+  if (id !== null) {
+    return inject(VoucherService).get(id, 'Payment');
+  }
+  if (account !== null) {
+    return inject(VoucherService).getOfType('Payment', account);
+  }
+  return inject(VoucherService).getOfType('Payment');
+};