Chore: Updated resolvers from Class to ResolveFn

overlord/src/app/account/account-list-resolver.service.spec.ts

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

overlord/src/app/account/account-list-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 AccountListResolver {
-  constructor(private ser: AccountService) {}
-
-  resolve(): Observable<Account[]> {
-    return this.ser.list();
-  }
-}

overlord/src/app/account/account-list.resolver.spec.ts

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

overlord/src/app/account/account-list.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 accountListResolver: ResolveFn<Account[]> = () => {
+  return inject(AccountService).list();
+};

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

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

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

@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Account } from '../core/account';
-import { AccountService } from '../core/account.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class AccountResolver {
-  constructor(private ser: AccountService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Account> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}

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

@@ -3,13 +3,13 @@ import { NgModule, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
 import { AuthGuard } from '../auth/auth-guard.service';
-import { CostCentreListResolver } from '../cost-centre/cost-centre-list-resolver.service';
+import { costCentreListResolver } from '../cost-centre/cost-centre-list.resolver';
 
 import { AccountDetailComponent } from './account-detail/account-detail.component';
 import { AccountListComponent } from './account-list/account-list.component';
-import { AccountListResolver } from './account-list-resolver.service';
-import { AccountResolver } from './account-resolver.service';
-import { AccountTypeResolver } from './account-type-resolver.service';
+import { accountListResolver } from './account-list.resolver';
+import { accountTypeResolver } from './account-type.resolver';
+import { accountResolver } from './account.resolver';
 
 const accountRoutes: Routes = [
   {
@@ -22,8 +22,8 @@ const accountRoutes: Routes = [
       permission: 'Accounts',
     },
     resolve: {
-      list: () => inject(AccountListResolver).resolve(),
-      accountTypes: () => inject(AccountTypeResolver).resolve(),
+      list: accountListResolver,
+      accountTypes: accountTypeResolver,
     },
   },
   {
@@ -36,9 +36,9 @@ const accountRoutes: Routes = [
       permission: 'Accounts',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(AccountResolver).resolve(route),
-      accountTypes: () => inject(AccountTypeResolver).resolve(),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      item: accountResolver,
+      accountTypes: accountTypeResolver,
+      costCentres: costCentreListResolver,
     },
   },
   {
@@ -51,9 +51,9 @@ const accountRoutes: Routes = [
       permission: 'Accounts',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(AccountResolver).resolve(route),
-      accountTypes: () => inject(AccountTypeResolver).resolve(),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      item: accountResolver,
+      accountTypes: accountTypeResolver,
+      costCentres: costCentreListResolver,
     },
   },
 ];
@@ -61,6 +61,5 @@ const accountRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(accountRoutes)],
   exports: [RouterModule],
-  providers: [AccountListResolver, AccountResolver],
 })
 export class AccountRoutingModule {}

overlord/src/app/account/account-type-resolver.service.spec.ts

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

overlord/src/app/account/account-type-resolver.service.ts

@@ -1,17 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { AccountType } from '../core/account-type';
-
-import { AccountTypeService } from './account-type.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class AccountTypeResolver {
-  constructor(private ser: AccountTypeService) {}
-
-  resolve(): Observable<AccountType[]> {
-    return this.ser.list();
-  }
-}

overlord/src/app/account/account-type.resolver.spec.ts

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

overlord/src/app/account/account-type.resolver.ts

@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { AccountType } from '../core/account-type';
+
+import { AccountTypeService } from './account-type.service';
+
+export const accountTypeResolver: ResolveFn<AccountType[]> = () => {
+  return inject(AccountTypeService).list();
+};

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

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

overlord/src/app/account/account.resolver.ts

@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Account } from '../core/account';
+import { AccountService } from '../core/account.service';
+
+export const accountResolver: ResolveFn<Account> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(AccountService).get(id);
+};

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

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

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

@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Attendance } from './attendance';
-import { AttendanceService } from './attendance.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class AttendanceResolver {
-  constructor(private ser: AttendanceService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Attendance> {
-    const date = route.paramMap.get('date');
-    return this.ser.get(date);
-  }
-}

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

@@ -4,9 +4,9 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { AttendanceResolver } from './attendance-resolver.service';
-import { AttendanceTypeResolver } from './attendance-type-resolver.service';
+import { attendanceTypeResolver } from './attendance-type.resolver';
 import { AttendanceComponent } from './attendance.component';
+import { attendanceResolver } from './attendance.resolver';
 
 const attendanceRoutes: Routes = [
   {
@@ -19,8 +19,8 @@ const attendanceRoutes: Routes = [
       permission: 'Attendance',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(AttendanceResolver).resolve(route),
-      attendanceTypes: () => inject(AttendanceTypeResolver).resolve(),
+      info: attendanceResolver,
+      attendanceTypes: attendanceTypeResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -34,8 +34,8 @@ const attendanceRoutes: Routes = [
       permission: 'Attendance',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(AttendanceResolver).resolve(route),
-      attendanceTypes: () => inject(AttendanceTypeResolver).resolve(),
+      info: attendanceResolver,
+      attendanceTypes: attendanceTypeResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -44,6 +44,5 @@ const attendanceRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(attendanceRoutes)],
   exports: [RouterModule],
-  providers: [AttendanceResolver],
 })
 export class AttendanceRoutingModule {}

overlord/src/app/attendance/attendance-type-resolver.service.ts

@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { AttendanceType } from './attendance-type';
-import { AttendanceTypeService } from './attendance-type.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class AttendanceTypeResolver {
-  constructor(private ser: AttendanceTypeService) {}
-
-  resolve(): Observable<AttendanceType[]> {
-    return this.ser.list();
-  }
-}

overlord/src/app/attendance/attendance-type.resolver.ts

@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { AttendanceType } from './attendance-type';
+import { AttendanceTypeService } from './attendance-type.service';
+
+export const attendanceTypeResolver: ResolveFn<AttendanceType[]> = () => {
+  return inject(AttendanceTypeService).list();
+};

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

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

overlord/src/app/attendance/attendance.resolver.ts

@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Attendance } from './attendance';
+import { AttendanceService } from './attendance.service';
+
+export const attendanceResolver: ResolveFn<Attendance> = (route) => {
+  const date = route.paramMap.get('date');
+  return inject(AttendanceService).get(date);
+};

overlord/src/app/balance-sheet/balance-sheet-resolver.service.spec.ts

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

overlord/src/app/balance-sheet/balance-sheet-resolver.service.ts

@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { BalanceSheet } from './balance-sheet';
-import { BalanceSheetService } from './balance-sheet.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class BalanceSheetResolver {
-  constructor(private ser: BalanceSheetService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<BalanceSheet> {
-    const date = route.paramMap.get('date');
-    return this.ser.list(date);
-  }
-}

overlord/src/app/balance-sheet/balance-sheet-routing.module.ts

@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { BalanceSheetResolver } from './balance-sheet-resolver.service';
 import { BalanceSheetComponent } from './balance-sheet.component';
+import { balanceSheetResolver } from './balance-sheet.resolver';
 
 const balanceSheetRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const balanceSheetRoutes: Routes = [
       permission: 'Balance Sheet',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(BalanceSheetResolver).resolve(route),
+      info: balanceSheetResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -32,7 +32,7 @@ const balanceSheetRoutes: Routes = [
       permission: 'Balance Sheet',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(BalanceSheetResolver).resolve(route),
+      info: balanceSheetResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -41,6 +41,5 @@ const balanceSheetRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(balanceSheetRoutes)],
   exports: [RouterModule],
-  providers: [BalanceSheetResolver],
 })
 export class BalanceSheetRoutingModule {}

overlord/src/app/balance-sheet/balance-sheet.resolver.spec.ts

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

overlord/src/app/balance-sheet/balance-sheet.resolver.ts

@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { BalanceSheet } from './balance-sheet';
+import { BalanceSheetService } from './balance-sheet.service';
+
+export const balanceSheetResolver: ResolveFn<BalanceSheet> = (route) => {
+  const date = route.paramMap.get('date');
+  return inject(BalanceSheetService).list(date);
+};

overlord/src/app/batch-integrity-report/batch-integrity-report-routing.module.ts

@@ -5,7 +5,7 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 import { AuthGuard } from '../auth/auth-guard.service';
 
 import { BatchIntegrityReportComponent } from './batch-integrity-report.component';
-import { BatchIntegrityResolverService } from './batch-integrity-resolver.service';
+import { batchIntegrityResolver } from './batch-integrity.resolver';
 
 const batchIntegrityRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const batchIntegrityRoutes: Routes = [
       permission: 'Product Ledger',
     },
     resolve: {
-      info: () => inject(BatchIntegrityResolverService).resolve(),
+      info: batchIntegrityResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -27,6 +27,5 @@ const batchIntegrityRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(batchIntegrityRoutes)],
   exports: [RouterModule],
-  providers: [BatchIntegrityResolverService],
 })
 export class BatchIntegrityReportRoutingModule {}

overlord/src/app/batch-integrity-report/batch-integrity-resolver.service.spec.ts

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

overlord/src/app/batch-integrity-report/batch-integrity-resolver.service.ts

@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { BatchIntegrity } from './batch-integrity';
-import { BatchIntegrityReportService } from './batch-integrity-report.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class BatchIntegrityResolverService {
-  constructor(private ser: BatchIntegrityReportService) {}
-
-  resolve(): Observable<BatchIntegrity[]> {
-    return this.ser.batchIntegrity();
-  }
-}

overlord/src/app/batch-integrity-report/batch-integrity.resolver.spec.ts

@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { BatchIntegrity } from './batch-integrity';
+import { batchIntegrityResolver } from './batch-integrity.resolver';
+
+describe('batchIntegrityResolver', () => {
+  const executeResolver: ResolveFn<BatchIntegrity[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => batchIntegrityResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});

overlord/src/app/batch-integrity-report/batch-integrity.resolver.ts

@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { BatchIntegrity } from './batch-integrity';
+import { BatchIntegrityReportService } from './batch-integrity-report.service';
+
+export const batchIntegrityResolver: ResolveFn<BatchIntegrity[]> = () => {
+  return inject(BatchIntegrityReportService).batchIntegrity();
+};

overlord/src/app/cash-flow/cash-flow-resolver.service.spec.ts

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

overlord/src/app/cash-flow/cash-flow-resolver.service.ts

@@ -1,20 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { CashFlow } from './cash-flow';
-import { CashFlowService } from './cash-flow.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class CashFlowResolver {
-  constructor(private ser: CashFlowService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<CashFlow> {
-    const id = route.paramMap.get('id');
-    const startDate = route.queryParamMap.get('startDate') || null;
-    const finishDate = route.queryParamMap.get('finishDate') || null;
-    return this.ser.list(id, startDate, finishDate);
-  }
-}

overlord/src/app/cash-flow/cash-flow-routing.module.ts

@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { CashFlowResolver } from './cash-flow-resolver.service';
 import { CashFlowComponent } from './cash-flow.component';
+import { cashFlowResolver } from './cash-flow.resolver';
 
 const cashFlowRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const cashFlowRoutes: Routes = [
       permission: 'Cash Flow',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(CashFlowResolver).resolve(route),
+      info: cashFlowResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -32,7 +32,7 @@ const cashFlowRoutes: Routes = [
       permission: 'Cash Flow',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(CashFlowResolver).resolve(route),
+      info: cashFlowResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -41,6 +41,5 @@ const cashFlowRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(cashFlowRoutes)],
   exports: [RouterModule],
-  providers: [CashFlowResolver],
 })
 export class CashFlowRoutingModule {}

overlord/src/app/cash-flow/cash-flow.resolver.spec.ts

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

overlord/src/app/cash-flow/cash-flow.resolver.ts

@@ -0,0 +1,12 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { CashFlow } from './cash-flow';
+import { CashFlowService } from './cash-flow.service';
+
+export const cashFlowResolver: ResolveFn<CashFlow> = (route) => {
+  const id = route.paramMap.get('id');
+  const startDate = route.queryParamMap.get('startDate') || null;
+  const finishDate = route.queryParamMap.get('finishDate') || null;
+  return inject(CashFlowService).list(id, startDate, finishDate);
+};

overlord/src/app/client/client-list-resolver.service.spec.ts

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

overlord/src/app/client/client-list-resolver.service.ts

@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Client } from './client';
-import { ClientService } from './client.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ClientListResolver {
-  constructor(private ser: ClientService) {}
-
-  resolve(): Observable<Client[]> {
-    return this.ser.list();
-  }
-}

overlord/src/app/client/client-list.resolver.spec.ts

@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Client } from './client';
+import { clientListResolver } from './client-list.resolver';
+
+describe('clientListResolver', () => {
+  const executeResolver: ResolveFn<Client[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => clientListResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});

overlord/src/app/client/client-list.resolver.ts

@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Client } from './client';
+import { ClientService } from './client.service';
+
+export const clientListResolver: ResolveFn<Client[]> = () => {
+  return inject(ClientService).list();
+};

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

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

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

@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Client } from './client';
-import { ClientService } from './client.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ClientResolver {
-  constructor(private ser: ClientService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Client> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}

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

@@ -6,8 +6,8 @@ import { AuthGuard } from '../auth/auth-guard.service';
 
 import { ClientDetailComponent } from './client-detail/client-detail.component';
 import { ClientListComponent } from './client-list/client-list.component';
-import { ClientListResolver } from './client-list-resolver.service';
-import { ClientResolver } from './client-resolver.service';
+import { clientListResolver } from './client-list.resolver';
+import { clientResolver } from './client.resolver';
 
 const clientRoutes: Routes = [
   {
@@ -20,7 +20,7 @@ const clientRoutes: Routes = [
       permission: 'Cost Centres',
     },
     resolve: {
-      list: () => inject(ClientListResolver).resolve(),
+      list: clientListResolver,
     },
   },
   {
@@ -33,7 +33,7 @@ const clientRoutes: Routes = [
       permission: 'Cost Centres',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(ClientResolver).resolve(route),
+      item: clientResolver,
     },
   },
 ];
@@ -41,6 +41,5 @@ const clientRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(clientRoutes)],
   exports: [RouterModule],
-  providers: [ClientListResolver, ClientResolver],
 })
 export class ClientRoutingModule {}

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

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

overlord/src/app/client/client.resolver.ts

@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Client } from './client';
+import { ClientService } from './client.service';
+
+export const clientResolver: ResolveFn<Client> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(ClientService).get(id);
+};

overlord/src/app/closing-stock/closing-stock-resolver.service.spec.ts

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

overlord/src/app/closing-stock/closing-stock-resolver.service.ts

@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { ClosingStock } from './closing-stock';
-import { ClosingStockService } from './closing-stock.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ClosingStockResolver {
-  constructor(private ser: ClosingStockService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<ClosingStock> {
-    const date = route.paramMap.get('date');
-    const costCentre = route.queryParamMap.get('d') || null;
-    return this.ser.list(date, costCentre);
-  }
-}

overlord/src/app/closing-stock/closing-stock-routing.module.ts

@@ -3,10 +3,10 @@ import { NgModule, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
 import { AuthGuard } from '../auth/auth-guard.service';
-import { CostCentreListResolver } from '../cost-centre/cost-centre-list-resolver.service';
+import { costCentreListResolver } from '../cost-centre/cost-centre-list.resolver';
 
-import { ClosingStockResolver } from './closing-stock-resolver.service';
 import { ClosingStockComponent } from './closing-stock.component';
+import { closingStockResolver } from './closing-stock.resolver';
 
 const closingStockRoutes: Routes = [
   {
@@ -19,8 +19,8 @@ const closingStockRoutes: Routes = [
       permission: 'Closing Stock',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(ClosingStockResolver).resolve(route),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      info: closingStockResolver,
+      costCentres: costCentreListResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -34,8 +34,8 @@ const closingStockRoutes: Routes = [
       permission: 'Closing Stock',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(ClosingStockResolver).resolve(route),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      info: closingStockResolver,
+      costCentres: costCentreListResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -44,6 +44,5 @@ const closingStockRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(closingStockRoutes)],
   exports: [RouterModule],
-  providers: [ClosingStockResolver],
 })
 export class ClosingStockRoutingModule {}

overlord/src/app/closing-stock/closing-stock.resolver.spec.ts

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

overlord/src/app/closing-stock/closing-stock.resolver.ts

@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { ClosingStock } from './closing-stock';
+import { ClosingStockService } from './closing-stock.service';
+
+export const closingStockResolver: ResolveFn<ClosingStock> = (route) => {
+  const date = route.paramMap.get('date');
+  const costCentre = route.queryParamMap.get('d') || null;
+  return inject(ClosingStockService).list(date, costCentre);
+};

overlord/src/app/cost-centre/cost-centre-list-resolver.service.spec.ts

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

overlord/src/app/cost-centre/cost-centre-list-resolver.service.ts

@@ -1,17 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { CostCentre } from '../core/cost-centre';
-
-import { CostCentreService } from './cost-centre.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class CostCentreListResolver {
-  constructor(private ser: CostCentreService) {}
-
-  resolve(): Observable<CostCentre[]> {
-    return this.ser.list();
-  }
-}

overlord/src/app/cost-centre/cost-centre-list.resolver.spec.ts

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

overlord/src/app/cost-centre/cost-centre-list.resolver.ts

@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { CostCentre } from '../core/cost-centre';
+
+import { CostCentreService } from './cost-centre.service';
+
+export const costCentreListResolver: ResolveFn<CostCentre[]> = () => {
+  return inject(CostCentreService).list();
+};

overlord/src/app/cost-centre/cost-centre-resolver.service.spec.ts

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

overlord/src/app/cost-centre/cost-centre-resolver.service.ts

@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { CostCentre } from '../core/cost-centre';
-
-import { CostCentreService } from './cost-centre.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class CostCentreResolver {
-  constructor(private ser: CostCentreService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<CostCentre> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}

overlord/src/app/cost-centre/cost-centre-routing.module.ts

@@ -6,8 +6,8 @@ import { AuthGuard } from '../auth/auth-guard.service';
 
 import { CostCentreDetailComponent } from './cost-centre-detail/cost-centre-detail.component';
 import { CostCentreListComponent } from './cost-centre-list/cost-centre-list.component';
-import { CostCentreListResolver } from './cost-centre-list-resolver.service';
-import { CostCentreResolver } from './cost-centre-resolver.service';
+import { costCentreListResolver } from './cost-centre-list.resolver';
+import { costCentreResolver } from './cost-centre.resolver';
 
 const costCentreRoutes: Routes = [
   {
@@ -20,7 +20,7 @@ const costCentreRoutes: Routes = [
       permission: 'Cost Centres',
     },
     resolve: {
-      list: () => inject(CostCentreListResolver).resolve(),
+      list: costCentreListResolver,
     },
   },
   {
@@ -33,7 +33,7 @@ const costCentreRoutes: Routes = [
       permission: 'Cost Centres',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(CostCentreResolver).resolve(route),
+      item: costCentreResolver,
     },
   },
   {
@@ -46,7 +46,7 @@ const costCentreRoutes: Routes = [
       permission: 'Cost Centres',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(CostCentreResolver).resolve(route),
+      item: costCentreResolver,
     },
   },
 ];
@@ -54,6 +54,5 @@ const costCentreRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(costCentreRoutes)],
   exports: [RouterModule],
-  providers: [CostCentreListResolver, CostCentreResolver],
 })
 export class CostCentreRoutingModule {}

overlord/src/app/cost-centre/cost-centre.resolver.spec.ts

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

overlord/src/app/cost-centre/cost-centre.resolver.ts

@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { CostCentre } from '../core/cost-centre';
+
+import { CostCentreService } from './cost-centre.service';
+
+export const costCentreResolver: ResolveFn<CostCentre> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(CostCentreService).get(id);
+};

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

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

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

@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Daybook } from './daybook';
-import { DaybookService } from './daybook.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class DaybookResolver {
-  constructor(private ser: DaybookService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Daybook> {
-    const startDate = route.queryParamMap.get('startDate') || null;
-    const finishDate = route.queryParamMap.get('finishDate') || null;
-    return this.ser.list(startDate, finishDate);
-  }
-}

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

@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { DaybookResolver } from './daybook-resolver.service';
 import { DaybookComponent } from './daybook.component';
+import { daybookResolver } from './daybook.resolver';
 
 const daybookRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const daybookRoutes: Routes = [
       permission: 'Daybook',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(DaybookResolver).resolve(route),
+      info: daybookResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -27,6 +27,5 @@ const daybookRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(daybookRoutes)],
   exports: [RouterModule],
-  providers: [DaybookResolver],
 })
 export class DaybookRoutingModule {}

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

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

overlord/src/app/daybook/daybook.resolver.ts

@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Daybook } from './daybook';
+import { DaybookService } from './daybook.service';
+
+export const daybookResolver: ResolveFn<Daybook> = (route) => {
+  const startDate = route.queryParamMap.get('startDate') || null;
+  const finishDate = route.queryParamMap.get('finishDate') || null;
+  return inject(DaybookService).list(startDate, finishDate);
+};

overlord/src/app/employee-attendance/employee-attendance-resolver.service.ts

@@ -1,20 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { EmployeeAttendance } from './employee-attendance';
-import { EmployeeAttendanceService } from './employee-attendance.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class EmployeeAttendanceResolver {
-  constructor(private ser: EmployeeAttendanceService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<EmployeeAttendance> {
-    const id = route.paramMap.get('id');
-    const startDate = route.queryParamMap.get('startDate') || null;
-    const finishDate = route.queryParamMap.get('finishDate') || null;
-    return this.ser.get(id, startDate, finishDate);
-  }
-}

overlord/src/app/employee-attendance/employee-attendance-routing.module.ts

@@ -2,11 +2,11 @@ import { CommonModule } from '@angular/common';
 import { NgModule, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
-import { AttendanceTypeResolver } from '../attendance/attendance-type-resolver.service';
+import { attendanceTypeResolver } from '../attendance/attendance-type.resolver';
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { EmployeeAttendanceResolver } from './employee-attendance-resolver.service';
 import { EmployeeAttendanceComponent } from './employee-attendance.component';
+import { employeeAttendanceResolver } from './employee-attendance.resolver';
 
 const employeeEmployeeAttendanceRoutes: Routes = [
   {
@@ -19,8 +19,8 @@ const employeeEmployeeAttendanceRoutes: Routes = [
       permission: 'Attendance',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(EmployeeAttendanceResolver).resolve(route),
-      attendanceTypes: () => inject(AttendanceTypeResolver).resolve(),
+      info: employeeAttendanceResolver,
+      attendanceTypes: attendanceTypeResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -34,8 +34,8 @@ const employeeEmployeeAttendanceRoutes: Routes = [
       permission: 'Attendance',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(EmployeeAttendanceResolver).resolve(route),
-      attendanceTypes: () => inject(AttendanceTypeResolver).resolve(),
+      info: employeeAttendanceResolver,
+      attendanceTypes: attendanceTypeResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -44,6 +44,5 @@ const employeeEmployeeAttendanceRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(employeeEmployeeAttendanceRoutes)],
   exports: [RouterModule],
-  providers: [EmployeeAttendanceResolver],
 })
 export class EmployeeAttendanceRoutingModule {}

overlord/src/app/employee-attendance/employee-attendance.resolver.ts

@@ -0,0 +1,12 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { EmployeeAttendance } from './employee-attendance';
+import { EmployeeAttendanceService } from './employee-attendance.service';
+
+export const employeeAttendanceResolver: ResolveFn<EmployeeAttendance> = (route) => {
+  const id = route.paramMap.get('id');
+  const startDate = route.queryParamMap.get('startDate') || null;
+  const finishDate = route.queryParamMap.get('finishDate') || null;
+  return inject(EmployeeAttendanceService).get(id, startDate, finishDate);
+};

overlord/src/app/employee-benefits/employee-benefits-resolver.service.ts

@@ -1,21 +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 EmployeeBenefitsResolver {
-  constructor(private ser: VoucherService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Voucher> {
-    const id = route.paramMap.get('id');
-    if (id === null) {
-      return this.ser.getOfType('Employee Benefit');
-    }
-    return this.ser.get(id, 'Employee Benefit');
-  }
-}

overlord/src/app/employee-benefits/employee-benefits-routing.module.ts

@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { EmployeeBenefitsResolver } from './employee-benefits-resolver.service';
 import { EmployeeBenefitsComponent } from './employee-benefits.component';
+import { employeeBenefitsResolver } from './employee-benefits.resolver';
 
 const employeeBenefitsRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const employeeBenefitsRoutes: Routes = [
       permission: 'employee-benefit',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(EmployeeBenefitsResolver).resolve(route),
+      voucher: employeeBenefitsResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -32,7 +32,7 @@ const employeeBenefitsRoutes: Routes = [
       permission: 'employee-benefit',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(EmployeeBenefitsResolver).resolve(route),
+      voucher: employeeBenefitsResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -41,6 +41,5 @@ const employeeBenefitsRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(employeeBenefitsRoutes)],
   exports: [RouterModule],
-  providers: [EmployeeBenefitsResolver],
 })
 export class EmployeeBenefitsRoutingModule {}

overlord/src/app/employee-benefits/employee-benefits.resolver.ts

@@ -0,0 +1,13 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+import { VoucherService } from '../core/voucher.service';
+
+export const employeeBenefitsResolver: ResolveFn<Voucher> = (route) => {
+  const id = route.paramMap.get('id');
+  if (id === null) {
+    return inject(VoucherService).getOfType('Employee Benefit');
+  }
+  return inject(VoucherService).get(id, 'Employee Benefit');
+};

overlord/src/app/employee/employee-list-resolver.service.spec.ts

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

overlord/src/app/employee/employee-list-resolver.service.ts

@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Employee } from './employee';
-import { EmployeeService } from './employee.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class EmployeeListResolver {
-  constructor(private ser: EmployeeService) {}
-
-  resolve(): Observable<Employee[]> {
-    return this.ser.list();
-  }
-}

overlord/src/app/employee/employee-list.resolver.spec.ts

@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Employee } from './employee';
+import { employeeListResolver } from './employee-list.resolver';
+
+describe('employeeListResolver', () => {
+  const executeResolver: ResolveFn<Employee[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => employeeListResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});

overlord/src/app/employee/employee-list.resolver.ts

@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Employee } from './employee';
+import { EmployeeService } from './employee.service';
+
+export const employeeListResolver: ResolveFn<Employee[]> = () => {
+  return inject(EmployeeService).list();
+};

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

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

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

@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Employee } from './employee';
-import { EmployeeService } from './employee.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class EmployeeResolver {
-  constructor(private ser: EmployeeService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Employee> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}

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

@@ -3,12 +3,12 @@ import { NgModule, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
 import { AuthGuard } from '../auth/auth-guard.service';
-import { CostCentreListResolver } from '../cost-centre/cost-centre-list-resolver.service';
+import { costCentreListResolver } from '../cost-centre/cost-centre-list.resolver';
 
 import { EmployeeDetailComponent } from './employee-detail/employee-detail.component';
 import { EmployeeListComponent } from './employee-list/employee-list.component';
-import { EmployeeListResolver } from './employee-list-resolver.service';
-import { EmployeeResolver } from './employee-resolver.service';
+import { employeeListResolver } from './employee-list.resolver';
+import { employeeResolver } from './employee.resolver';
 
 const employeeRoutes: Routes = [
   {
@@ -21,7 +21,7 @@ const employeeRoutes: Routes = [
       permission: 'Employees',
     },
     resolve: {
-      list: () => inject(EmployeeListResolver).resolve(),
+      list: employeeListResolver,
     },
   },
   {
@@ -34,8 +34,8 @@ const employeeRoutes: Routes = [
       permission: 'Employees',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(EmployeeResolver).resolve(route),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      item: employeeResolver,
+      costCentres: costCentreListResolver,
     },
   },
   {
@@ -48,8 +48,8 @@ const employeeRoutes: Routes = [
       permission: 'Employees',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(EmployeeResolver).resolve(route),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      item: employeeResolver,
+      costCentres: costCentreListResolver,
     },
   },
 ];
@@ -57,6 +57,5 @@ const employeeRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(employeeRoutes)],
   exports: [RouterModule],
-  providers: [EmployeeListResolver, EmployeeResolver],
 })
 export class EmployeeRoutingModule {}

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

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

overlord/src/app/employee/employee.resolver.ts

@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Employee } from './employee';
+import { EmployeeService } from './employee.service';
+
+export const employeeResolver: ResolveFn<Employee> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(EmployeeService).get(id);
+};

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

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

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

@@ -1,25 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { EntriesService } from './entries.service';
-import { Report } from './report';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class EntriesResolver {
-  constructor(private ser: EntriesService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Report> {
-    const start_date = route.queryParamMap.get('s');
-    const finish_date = route.queryParamMap.get('f');
-    const posted = route.queryParamMap.get('p') === null ? null : route.queryParamMap.get('p') === 'true';
-    const page_size = route.queryParamMap.get('ps') === null ? 50 : +(route.queryParamMap.get('ps') as string);
-    const page_index = route.queryParamMap.get('pi') === null ? 0 : +(route.queryParamMap.get('pi') as string);
-    const sort = route.queryParamMap.get('a') ?? 'date';
-    const direction = route.queryParamMap.get('d') ?? 'desc';
-    const issue_vouchers = route.queryParamMap.get('i') === null ? false : route.queryParamMap.get('i') === 'true';
-    return this.ser.list(start_date, finish_date, posted, page_size, page_index, sort, direction, issue_vouchers);
-  }
-}

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

@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { EntriesResolver } from './entries-resolver.service';
 import { EntriesComponent } from './entries.component';
+import { entriesResolver } from './entries.resolver';
 
 const entriesRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const entriesRoutes: Routes = [
       permission: 'Ledger',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(EntriesResolver).resolve(route),
+      info: entriesResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -27,6 +27,5 @@ const entriesRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(entriesRoutes)],
   exports: [RouterModule],
-  providers: [EntriesResolver],
 })
 export class EntriesRoutingModule {}

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

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

overlord/src/app/entries/entries.resolver.ts

@@ -0,0 +1,26 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { EntriesService } from './entries.service';
+import { Report } from './report';
+
+export const entriesResolver: ResolveFn<Report> = (route) => {
+  const start_date = route.queryParamMap.get('s');
+  const finish_date = route.queryParamMap.get('f');
+  const posted = route.queryParamMap.get('p') === null ? null : route.queryParamMap.get('p') === 'true';
+  const page_size = route.queryParamMap.get('ps') === null ? 50 : +(route.queryParamMap.get('ps') as string);
+  const page_index = route.queryParamMap.get('pi') === null ? 0 : +(route.queryParamMap.get('pi') as string);
+  const sort = route.queryParamMap.get('a') ?? 'date';
+  const direction = route.queryParamMap.get('d') ?? 'desc';
+  const issue_vouchers = route.queryParamMap.get('i') === null ? false : route.queryParamMap.get('i') === 'true';
+  return inject(EntriesService).list(
+    start_date,
+    finish_date,
+    posted,
+    page_size,
+    page_index,
+    sort,
+    direction,
+    issue_vouchers,
+  );
+};

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

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

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

@@ -1,21 +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 IncentiveResolver {
-  constructor(private ser: VoucherService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Voucher> {
-    const id = route.paramMap.get('id');
-    if (id === null) {
-      return this.ser.getOfType('Incentive');
-    }
-    return this.ser.get(id, 'Incentive');
-  }
-}

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

@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { IncentiveResolver } from './incentive-resolver.service';
 import { IncentiveComponent } from './incentive.component';
+import { incentiveResolver } from './incentive.resolver';
 
 const incentiveRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const incentiveRoutes: Routes = [
       permission: 'incentive',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(IncentiveResolver).resolve(route),
+      voucher: incentiveResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -32,7 +32,7 @@ const incentiveRoutes: Routes = [
       permission: 'incentive',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(IncentiveResolver).resolve(route),
+      voucher: incentiveResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -41,6 +41,5 @@ const incentiveRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(incentiveRoutes)],
   exports: [RouterModule],
-  providers: [IncentiveResolver],
 })
 export class IncentiveRoutingModule {}

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

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

overlord/src/app/incentive/incentive.resolver.ts

@@ -0,0 +1,13 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+import { VoucherService } from '../core/voucher.service';
+
+export const incentiveResolver: ResolveFn<Voucher> = (route) => {
+  const id = route.paramMap.get('id');
+  if (id === null) {
+    return inject(VoucherService).getOfType('Incentive');
+  }
+  return inject(VoucherService).get(id, 'Incentive');
+};

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

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

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

@@ -1,21 +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 IssueResolver {
-  constructor(private ser: VoucherService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Voucher> {
-    const id = route.paramMap.get('id');
-    if (id === null) {
-      return this.ser.getOfType('Issue');
-    }
-    return this.ser.get(id, 'Issue');
-  }
-}

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

@@ -3,10 +3,10 @@ import { NgModule, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
 import { AuthGuard } from '../auth/auth-guard.service';
-import { CostCentreListResolver } from '../cost-centre/cost-centre-list-resolver.service';
+import { costCentreListResolver } from '../cost-centre/cost-centre-list.resolver';
 
-import { IssueResolver } from './issue-resolver.service';
 import { IssueComponent } from './issue.component';
+import { issueResolver } from './issue.resolver';
 
 const issueRoutes: Routes = [
   {
@@ -19,8 +19,8 @@ const issueRoutes: Routes = [
       permission: 'Issue',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(IssueResolver).resolve(route),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      voucher: issueResolver,
+      costCentres: costCentreListResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -34,8 +34,8 @@ const issueRoutes: Routes = [
       permission: 'Issue',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(IssueResolver).resolve(route),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      voucher: issueResolver,
+      costCentres: costCentreListResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -44,6 +44,5 @@ const issueRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(issueRoutes)],
   exports: [RouterModule],
-  providers: [IssueResolver],
 })
 export class IssueRoutingModule {}

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

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

overlord/src/app/issue/issue.resolver.ts

@@ -0,0 +1,13 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+import { VoucherService } from '../core/voucher.service';
+
+export const issueResolver: ResolveFn<Voucher> = (route) => {
+  const id = route.paramMap.get('id');
+  if (id === null) {
+    return inject(VoucherService).getOfType('Issue');
+  }
+  return inject(VoucherService).get(id, 'Issue');
+};

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

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

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

@@ -1,21 +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 JournalResolver {
-  constructor(private ser: VoucherService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Voucher> {
-    const id = route.paramMap.get('id');
-    if (id === null) {
-      return this.ser.getOfType('Journal');
-    }
-    return this.ser.get(id, 'Journal');
-  }
-}

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

@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { JournalResolver } from './journal-resolver.service';
 import { JournalComponent } from './journal.component';
+import { journalResolver } from './journal.resolver';
 
 const journalRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const journalRoutes: Routes = [
       permission: 'Journal',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(JournalResolver).resolve(route),
+      voucher: journalResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -32,7 +32,7 @@ const journalRoutes: Routes = [
       permission: 'Journal',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(JournalResolver).resolve(route),
+      voucher: journalResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -41,6 +41,5 @@ const journalRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(journalRoutes)],
   exports: [RouterModule],
-  providers: [JournalResolver],
 })
 export class JournalRoutingModule {}

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

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

overlord/src/app/journal/journal.resolver.ts

@@ -0,0 +1,13 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+import { VoucherService } from '../core/voucher.service';
+
+export const journalResolver: ResolveFn<Voucher> = (route) => {
+  const id = route.paramMap.get('id');
+  if (id === null) {
+    return inject(VoucherService).getOfType('Journal');
+  }
+  return inject(VoucherService).get(id, 'Journal');
+};

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

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

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

@@ -1,20 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Ledger } from './ledger';
-import { LedgerService } from './ledger.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class LedgerResolver {
-  constructor(private ser: LedgerService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Ledger> {
-    const id = route.paramMap.get('id');
-    const startDate = route.queryParamMap.get('startDate') || null;
-    const finishDate = route.queryParamMap.get('finishDate') || null;
-    return this.ser.list(id, startDate, finishDate);
-  }
-}