zibri 2.2.1 → 2.4.0

package/src/plugin/payment/providers/payment-provider.interface.ts

@@ -3,53 +3,115 @@ import { PaymentMethod } from '../models/payment-method.model';
 import { Payment } from '../models/payment.model';
 
 /**
- * Interface for a payment provider.
+ * A payment provider interface with loose typing for use in DI.
  */
-export interface PaymentProviderInterface<
-    SupportedMethods extends readonly PaymentMethod[],
-    // eslint-disable-next-line jsdoc/require-jsdoc
-    PaymentDataForMethod extends Record<SupportedMethods[number], AnyObject & { transactionId: string }>,
-    // eslint-disable-next-line jsdoc/require-jsdoc
-    ValidatedPaymentDataForMethod extends Record<SupportedMethods[number], AnyObject & { transactionId: string }>,
-    ProviderPaymentDataForMethod extends Record<SupportedMethods[number], AnyObject>,
-    ProviderReservationPaymentDataForMethod extends Record<SupportedMethods[number], AnyObject>,
-    CancellationSupport extends Record<SupportedMethods[number], boolean>,
-    RefundSupport extends Record<SupportedMethods[number], boolean>,
-    ReservationSupport extends Record<SupportedMethods[number], boolean>
-> {
+export interface AnyPaymentProviderInterface {
     /**
      * The unique name of the provider, used to differentiate between them.
      */
     readonly name: string,
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    readonly __supportedMethods: readonly PaymentMethod[],
+    // eslint-disable-next-line jsdoc/require-jsdoc, typescript/no-explicit-any
+    readonly __paymentDataMap: Record<string, any>,
+    // eslint-disable-next-line jsdoc/require-jsdoc, typescript/no-explicit-any
+    readonly __validatedDataMap: Record<string, any>,
+    // eslint-disable-next-line jsdoc/require-jsdoc, typescript/no-explicit-any
+    readonly __providerPaymentDataMap: Record<string, any>,
+    // eslint-disable-next-line jsdoc/require-jsdoc, typescript/no-explicit-any
+    readonly __providerReservationPaymentDataMap: Record<string, any>,
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    readonly __cancellationSupportMap: Record<string, boolean>,
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    readonly __refundSupportMap: Record<string, boolean>,
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    readonly __reservationSupportMap: Record<string, boolean>,
     /**
-     * A map that defines which payment methods support cancellation.
+     * Validates the given payment data for the given method.
      */
-    readonly cancellationSupported: CancellationSupport,
+    // eslint-disable-next-line typescript/no-explicit-any
+    validatePaymentData: (method: any, data: any) => any,
     /**
-     * A map that defines which payment methods support refunding.
+     * Starts a new payment with the given method and data.
      */
-    readonly refundSupported: RefundSupport,
+    // eslint-disable-next-line typescript/no-explicit-any
+    startPayment: (method: any, data: any) => any,
     /**
-     * A map that defines which payment methods support reservation.
+     * Starts a new payment reservation with the given method and data.
      */
-    readonly reservationSupported: ReservationSupport,
+    // eslint-disable-next-line typescript/no-explicit-any
+    startPaymentReservation: (method: any, data: any) => any,
     /**
-     * Validates the given payment data for the given method.
+     * Confirms The given payment reservation. This does NOT move any money yet, it just reserves the funds.
      */
+    // eslint-disable-next-line typescript/no-explicit-any
+    confirmPaymentReservation: (payment: any) => any,
+    /**
+     * Confirms and finishes a payment.
+     */
+    // eslint-disable-next-line typescript/no-explicit-any
+    confirmPayment: (payment: any) => any,
+    /**
+     * Collects payment from the given payment reservation.
+     */
+    // eslint-disable-next-line typescript/no-explicit-any
+    collectPaymentFromReservation: (payment: any) => any,
+    /**
+     * Cancels the given payment.
+     */
+    // eslint-disable-next-line typescript/no-explicit-any
+    cancelPayment: (payment: any) => any,
+    /**
+     * Refunds the given payment.
+     */
+    // eslint-disable-next-line typescript/no-explicit-any
+    refundPayment: (payment: any) => any
+}
+
+/**
+ * Interface for a payment provider.
+ */
+export interface PaymentProviderInterface<
+    SupportedMethods extends readonly PaymentMethod[],
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    PaymentDataForMethod extends Record<SupportedMethods[number], AnyObject & { transactionId: string }>,
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    ValidatedPaymentDataForMethod extends Record<SupportedMethods[number], AnyObject & { transactionId: string }>,
+    ProviderPaymentDataForMethod extends Record<SupportedMethods[number], AnyObject>,
+    ProviderReservationPaymentDataForMethod extends Record<SupportedMethods[number], AnyObject>,
+    CancellationSupport extends Record<SupportedMethods[number], boolean>,
+    RefundSupport extends Record<SupportedMethods[number], boolean>,
+    ReservationSupport extends Record<SupportedMethods[number], boolean>
+> extends AnyPaymentProviderInterface {
+    // phantom carriers — never set at runtime, only for type inference
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    readonly __supportedMethods: SupportedMethods,
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    readonly __paymentDataMap: PaymentDataForMethod,
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    readonly __validatedDataMap: ValidatedPaymentDataForMethod,
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    readonly __providerPaymentDataMap: ProviderPaymentDataForMethod,
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    readonly __providerReservationPaymentDataMap: ProviderReservationPaymentDataForMethod,
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    readonly __cancellationSupportMap: CancellationSupport,
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    readonly __refundSupportMap: RefundSupport,
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    readonly __reservationSupportMap: ReservationSupport,
+
+    // eslint-disable-next-line jsdoc/require-jsdoc
     validatePaymentData: <M extends SupportedMethods[number]>(
         method: M,
         data: PaymentDataForMethod[M]
     ) => ValidatedPaymentDataForMethod[M] | Promise<ValidatedPaymentDataForMethod[M]>,
-    /**
-     * Starts a new payment with the given method and data.
-     */
+    // eslint-disable-next-line jsdoc/require-jsdoc
     startPayment: <M extends SupportedMethods[number]>(
         method: M,
         data: ValidatedPaymentDataForMethod[M]
     ) => Payment<M, ProviderPaymentDataForMethod[M]> | Promise<Payment<M, ProviderPaymentDataForMethod[M]>>,
-    /**
-     * Starts a new payment reservation with the given method and data.
-     */
+    // eslint-disable-next-line jsdoc/require-jsdoc
     startPaymentReservation: <
         M extends {
             [K in SupportedMethods[number]]: ReservationSupport[K] extends true ? K : never
@@ -58,31 +120,23 @@ export interface PaymentProviderInterface<
         method: M,
         data: ValidatedPaymentDataForMethod[M]
     ) => Payment<M, ProviderReservationPaymentDataForMethod[M]> | Promise<Payment<M, ProviderReservationPaymentDataForMethod[M]>>,
-    /**
-     * Confirms The given payment reservation. This does NOT move any money yet, it just reserves the funds.
-     */
+    // eslint-disable-next-line jsdoc/require-jsdoc
     confirmPaymentReservation: <
         M extends {
             [K in SupportedMethods[number]]: ReservationSupport[K] extends true ? K : never
         }[SupportedMethods[number]]
     >(payment: Payment<M, ProviderReservationPaymentDataForMethod[M]>) => void | Promise<void>,
-    /**
-     * Confirms and finishes a payment.
-     */
+    // eslint-disable-next-line jsdoc/require-jsdoc
     confirmPayment: <M extends SupportedMethods[number]>(
         payment: Payment<M, ProviderPaymentDataForMethod[M]>
     ) => void | Promise<void>,
-    /**
-     * Collects payment from the given payment reservation.
-     */
+    // eslint-disable-next-line jsdoc/require-jsdoc
     collectPaymentFromReservation: <
         M extends {
             [K in SupportedMethods[number]]: ReservationSupport[K] extends true ? K : never
         }[SupportedMethods[number]]
     >(payment: Payment<M, ProviderReservationPaymentDataForMethod[M]>) => void | Promise<void>,
-    /**
-     * Cancels the given payment.
-     */
+    // eslint-disable-next-line jsdoc/require-jsdoc
     cancelPayment: <
         M extends {
             [K in SupportedMethods[number]]: CancellationSupport[K] extends true ? K : ReservationSupport[K] extends true ? K : never
@@ -90,9 +144,7 @@ export interface PaymentProviderInterface<
     >(
         payment: Payment<M, ProviderPaymentDataForMethod[M]> | Payment<M, ProviderReservationPaymentDataForMethod[M]>
     ) => void | Promise<void>,
-    /**
-     * Refunds the given payment.
-     */
+    // eslint-disable-next-line jsdoc/require-jsdoc
     refundPayment: <
         M extends {
             [K in SupportedMethods[number]]: RefundSupport[K] extends true ? K : never

package/src/plugin/payment/services/payment-service.interface.ts

@@ -1,25 +1,25 @@
 import { PaymentDataForMethod, ValidatedPaymentDataForMethod, PaymentForMethod, AllowedReservationMethods, PaymentReservationForMethod, AllowedCancellationMethods, AllowedRefundMethods } from './payment-service.types';
-import { AnyObject } from '../../../entity/any-object.model';
 import { PaymentMethod } from '../models/payment-method.model';
-import { PaymentProviderInterface } from '../providers/payment-provider.interface';
+import { AnyPaymentProviderInterface } from '../providers/payment-provider.interface';
+
+// eslint-disable-next-line jsdoc/require-jsdoc
+type MethodsCoveredByProviders<P extends readonly AnyPaymentProviderInterface[]>
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    = P[number] extends { __supportedMethods: infer SM }
+        ? SM extends readonly (infer S)[] ? S : never
+        : never;
 
 /**
  * Interface for a payment service.
  */
 export interface PaymentServiceInterface<
     Methods extends readonly PaymentMethod[],
-    P extends readonly PaymentProviderInterface<
-        Methods[number][],
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>
-    >[]
+    P extends readonly AnyPaymentProviderInterface[],
+    // eslint-disable-next-line unusedImports/no-unused-vars
+    _Check extends (Methods[number] extends MethodsCoveredByProviders<P>
+        // eslint-disable-next-line stylistic/max-len
+        ? unknown : 'Error: not all payment methods are covered by the provided providers') = Methods[number] extends MethodsCoveredByProviders<P>
+        ? unknown : 'Error: not all payment methods are covered by the provided providers'
 > {
     /**
      * Validates the given data of the given payment method.

package/src/plugin/payment/services/payment-service.types.ts

@@ -1,9 +1,8 @@
-/* eslint-disable unusedImports/no-unused-vars */
-import { AnyObject } from '../../../entity/any-object.model';
+/* eslint-disable jsdoc/require-jsdoc */
 import { PaymentMethod } from '../models/payment-method.model';
 import { PaymentPluginOptions } from '../models/payment-plugin-options.model';
 import { Payment } from '../models/payment.model';
-import { PaymentProviderInterface } from '../providers/payment-provider.interface';
+import { AnyPaymentProviderInterface } from '../providers/payment-provider.interface';
 
 /**
  * Helper: pick the provider *instance* (from the P tuple) for the given method M.
@@ -11,21 +10,10 @@ import { PaymentProviderInterface } from '../providers/payment-provider.interfac
 type ProviderInstanceForMethod<
     Methods extends readonly PaymentMethod[],
     M extends Methods[number],
-    P extends readonly PaymentProviderInterface<
-        Methods[number][],
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>
-    >[]
+    P extends readonly AnyPaymentProviderInterface[]
 > = Extract<
     P[number],
-    // eslint-disable-next-line jsdoc/require-jsdoc
+
     { name: PaymentPluginOptions<Methods, P>['providerNameForMethod'][M] }
 >;
 
@@ -35,31 +23,11 @@ type ProviderInstanceForMethod<
 export type PaymentDataForMethod<
     Methods extends readonly PaymentMethod[],
     M extends Methods[number],
-    P extends readonly PaymentProviderInterface<
-        Methods[number][],
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>
-    >[]
->
-    = ProviderInstanceForMethod<Methods, M, P> extends PaymentProviderInterface<
-        infer _SM,
-        infer PaymentDataMap,
-        infer _ValidatedMap,
-        infer _ProviderPaymentData,
-        infer _ProviderReservationPaymentData,
-        infer _CS,
-        infer _RS,
-        infer _ReservationSupport
-    >
-        ? PaymentDataMap[M]
-        : never;
+    P extends readonly AnyPaymentProviderInterface[]
+> = ProviderInstanceForMethod<Methods, M, P> extends { __paymentDataMap: infer DataMap }
+    // eslint-disable-next-line typescript/no-explicit-any
+    ? (DataMap & Record<string, any>)[M] & { transactionId: string }
+    : never;
 
 /**
  * ValidatedPaymentDataForMethod: the validated/normalized data type returned by validatePaymentData.
@@ -67,31 +35,12 @@ export type PaymentDataForMethod<
 export type ValidatedPaymentDataForMethod<
     Methods extends readonly PaymentMethod[],
     M extends Methods[number],
-    P extends readonly PaymentProviderInterface<
-        Methods[number][],
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>
-    >[]
->
-    = ProviderInstanceForMethod<Methods, M, P> extends PaymentProviderInterface<
-        infer _SM,
-        infer _PaymentDataMap,
-        infer ValidatedMap,
-        infer _ProviderPaymentData,
-        infer _ProviderReservationPaymentData,
-        infer _CS,
-        infer _RS,
-        infer _ReservationSupport
-    >
-        ? ValidatedMap[M]
-        : never;
+    P extends readonly AnyPaymentProviderInterface[]
+
+> = ProviderInstanceForMethod<Methods, M, P> extends { __validatedDataMap: infer DataMap }
+    // eslint-disable-next-line typescript/no-explicit-any
+    ? (DataMap & Record<string, any>)[M]
+    : never;
 
 /**
  * The payment entity type used for payments.
@@ -99,31 +48,9 @@ export type ValidatedPaymentDataForMethod<
 export type PaymentForMethod<
     Methods extends readonly PaymentMethod[],
     M extends Methods[number],
-    P extends readonly PaymentProviderInterface<
-        Methods[number][],
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>
-    >[]
->
-    = ProviderInstanceForMethod<Methods, M, P> extends PaymentProviderInterface<
-        infer _SM,
-        infer _PaymentDataMap,
-        infer _ValidatedMap,
-        infer ProviderPaymentDataMap,
-        infer _ProviderReservationPaymentData,
-        infer _CS,
-        infer _RS,
-        infer _ReservationSupport
-    >
-        ? Payment<M, ProviderPaymentDataMap[M]>
-        : never;
+    P extends readonly AnyPaymentProviderInterface[]
+
+> = Payment<M, (ProviderInstanceForMethod<Methods, M, P>['__providerPaymentDataMap'])[M]>;
 
 /**
  * The payment entity type used for reservation payments.
@@ -131,63 +58,19 @@ export type PaymentForMethod<
 export type PaymentReservationForMethod<
     Methods extends readonly PaymentMethod[],
     M extends Methods[number],
-    P extends readonly PaymentProviderInterface<
-        Methods[number][],
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>
-    >[]
->
-    = ProviderInstanceForMethod<Methods, M, P> extends PaymentProviderInterface<
-        infer _SM,
-        infer _PaymentDataMap,
-        infer _ValidatedMap,
-        infer _ProviderPaymentDataMap,
-        infer ProviderReservationPaymentDataMap,
-        infer _CS,
-        infer _RS,
-        infer _ReservationSupport
-    >
-        ? Payment<M, ProviderReservationPaymentDataMap[M]>
-        : never;
+    P extends readonly AnyPaymentProviderInterface[]
+> = Payment<M, (ProviderInstanceForMethod<Methods, M, P>['__providerReservationPaymentDataMap'])[M]>;
 
 /**
  * Filters to all methods that are allowed for reservation.
  */
 export type AllowedReservationMethods<
     Methods extends readonly PaymentMethod[],
-    P extends readonly PaymentProviderInterface<
-        Methods[number][],
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>
-    >[]
+    P extends readonly AnyPaymentProviderInterface[]
 > = {
-    [K in Methods[number]]: ProviderInstanceForMethod<Methods, K, P> extends PaymentProviderInterface<
-        infer _SM,
-        infer _PaymentDataMap,
-        infer _ValidatedMap,
-        infer _ProviderPaymentDataMap,
-        infer _ProviderReservationPaymentDataMap,
-        infer _CancellationSupport,
-        infer _RefundSupport,
-        infer ReservationSupport
-    >
-        ? ReservationSupport[K] extends true
-            ? K
-            : never
+    [K in Methods[number]]: ProviderInstanceForMethod<Methods, K, P> extends { __reservationSupportMap: infer RS }
+        // eslint-disable-next-line typescript/no-explicit-any
+        ? (RS & Record<string, any>)[K] extends true ? K : never
         : never;
 }[Methods[number]];
 
@@ -196,32 +79,12 @@ export type AllowedReservationMethods<
  */
 export type AllowedCancellationMethods<
     Methods extends readonly PaymentMethod[],
-    P extends readonly PaymentProviderInterface<
-        Methods[number][],
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>
-    >[]
+    P extends readonly AnyPaymentProviderInterface[]
 > = {
-    [K in Methods[number]]: ProviderInstanceForMethod<Methods, K, P> extends PaymentProviderInterface<
-        infer _SM,
-        infer _PaymentDataMap,
-        infer _ValidatedMap,
-        infer _ProviderPaymentDataMap,
-        infer _ProviderReservationPaymentDataMap,
-        infer CancellationSupport,
-        infer _RefundSupport,
-        infer ReservationSupport
-    >
-        ? CancellationSupport[K] extends true
-            ? K
-            : ReservationSupport[K] extends true ? K : never
+    // eslint-disable-next-line stylistic/max-len
+    [K in Methods[number]]: ProviderInstanceForMethod<Methods, K, P> extends { __cancellationSupportMap: infer CS, __reservationSupportMap: infer RS }
+        // eslint-disable-next-line typescript/no-explicit-any
+        ? (CS & Record<string, any>)[K] extends true ? K : (RS & Record<string, any>)[K] extends true ? K : never
         : never;
 }[Methods[number]];
 
@@ -230,31 +93,10 @@ export type AllowedCancellationMethods<
  */
 export type AllowedRefundMethods<
     Methods extends readonly PaymentMethod[],
-    P extends readonly PaymentProviderInterface<
-        Methods[number][],
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>
-    >[]
+    P extends readonly AnyPaymentProviderInterface[]
 > = {
-    [K in Methods[number]]: ProviderInstanceForMethod<Methods, K, P> extends PaymentProviderInterface<
-        infer _SM,
-        infer _PaymentDataMap,
-        infer _ValidatedMap,
-        infer _ProviderPaymentDataMap,
-        infer _ProviderReservationPaymentDataMap,
-        infer _CancellationSupport,
-        infer _RefundSupport,
-        infer _ReservationSupport
-    >
-        ? _RefundSupport[K] extends true
-            ? K
-            : never
+    [K in Methods[number]]: ProviderInstanceForMethod<Methods, K, P> extends { __refundSupportMap: infer RS }
+        // eslint-disable-next-line typescript/no-explicit-any
+        ? (RS & Record<string, any>)[K] extends true ? K : never
         : never;
 }[Methods[number]];

package/src/plugin/payment/services/payment.service.ts

@@ -3,6 +3,7 @@ import { PaymentDataForMethod, ValidatedPaymentDataForMethod, PaymentForMethod,
 import { Repository } from '../../../data-source/repository';
 import { InjectRepository } from '../../../di/decorators/inject-repository.decorator';
 import { Inject } from '../../../di/decorators/inject.decorator';
+import { Injectable } from '../../../di/decorators/injectable.decorator';
 import { ZIBRI_DI_TOKENS } from '../../../di/default/zibri-di-tokens.default';
 import { AnyObject } from '../../../entity/any-object.model';
 import { type LoggerInterface } from '../../../logging/logger.interface';
@@ -10,30 +11,20 @@ import { PaymentMethod } from '../models/payment-method.model';
 import { type PaymentPluginOptions } from '../models/payment-plugin-options.model';
 import { PaymentStatus } from '../models/payment-status.enum';
 import { Payment } from '../models/payment.model';
-import { ZIBRI_PAYMENT_DI_TOKENS } from '../payment.tokens';
-import { PaymentProviderInterface } from '../providers/payment-provider.interface';
+import { ZIBRI_PAYMENT_PLUGIN_DI_TOKENS } from '../payment.tokens';
+import { AnyPaymentProviderInterface } from '../providers/payment-provider.interface';
 
 /**
  * Default payment service implementation of zibri.
  */
+@Injectable({ register: 'onUse' })
 export class PaymentService<
     Methods extends readonly PaymentMethod[],
-    P extends readonly PaymentProviderInterface<
-        Methods[number][],
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        // eslint-disable-next-line jsdoc/require-jsdoc
-        Record<Methods[number], AnyObject & { transactionId: string }>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], AnyObject>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>,
-        Record<Methods[number], boolean>
-    >[]
+    P extends readonly AnyPaymentProviderInterface[]
 >implements PaymentServiceInterface<Methods, P> {
 
     constructor(
-        @Inject(ZIBRI_PAYMENT_DI_TOKENS.OPTIONS)
+        @Inject(ZIBRI_PAYMENT_PLUGIN_DI_TOKENS.OPTIONS)
         protected readonly options: PaymentPluginOptions<Methods, P>,
         @Inject(ZIBRI_DI_TOKENS.LOGGER)
         protected readonly logger: LoggerInterface,
@@ -60,8 +51,11 @@ export class PaymentService<
             method,
             data
         ) as ValidatedPaymentDataForMethod<Methods, M, P>;
-        if ((await this.paymentRepository.findAll({ where: { transactionId: data.transactionId } })).length) {
-            throw new Error(`a payment for the transactionId "${data.transactionId}" already exists`);
+
+        // eslint-disable-next-line jsdoc/require-jsdoc
+        const { transactionId } = data as unknown as { transactionId: string };
+        if ((await this.paymentRepository.findAll({ where: { transactionId } })).length) {
+            throw new Error(`a payment for the transactionId "${transactionId}" already exists`);
         }
         return res;
     }
@@ -81,7 +75,7 @@ export class PaymentService<
         data: ValidatedPaymentDataForMethod<Methods, M, P>
     ): Promise<PaymentReservationForMethod<Methods, M, P>> {
         const provider: P[number] = this.findPaymentProviderForMethod(method);
-        return await provider.startPayment(method, data) as PaymentReservationForMethod<Methods, M, P>;
+        return await provider.startPaymentReservation(method, data) as PaymentReservationForMethod<Methods, M, P>;
     }
 
     // eslint-disable-next-line jsdoc/require-jsdoc

package/src/plugin/plugin.model.ts

@@ -37,7 +37,7 @@ export abstract class ZibriPlugin {
      * Validates that the plugin can work correctly. This should check that all entities exist,
      * all required providers exist etc.
      *
-     * It's called after the initialization of the app, so that data sources etc. Should all be available.
+     * It's called at the end of app initialization, so that data sources etc. Should all be available.
      */
     abstract validate(app: ZibriApplication): void | Promise<void>;
 }