diff --git a/libs/oms/data-access/src/lib/services/return-can-return.service.ts b/libs/oms/data-access/src/lib/services/return-can-return.service.ts index 3aa54fe8d..34c9a1808 100644 --- a/libs/oms/data-access/src/lib/services/return-can-return.service.ts +++ b/libs/oms/data-access/src/lib/services/return-can-return.service.ts @@ -12,7 +12,6 @@ import { returnReceiptValuesMapping, } from '../helpers/return-process'; import { isReturnProcessTypeGuard } from '../guards'; -import { takeUntilAborted } from '@isa/common/data-access'; /** * Service for determining if a return process can proceed based on @@ -36,20 +35,14 @@ export class ReturnCanReturnService { * @param returnProcess - The return process object to evaluate. * @returns A promise resolving to a CanReturn result or undefined if the process should continue. */ - async canReturn( - returnProcess: ReturnProcess, - abortSignal?: AbortSignal, - ): Promise; + async canReturn(returnProcess: ReturnProcess): Promise; /** * Determines if a return can proceed based on mapped receipt values. * * @param returnValues - The mapped return receipt values. * @returns A promise resolving to a CanReturn result. */ - async canReturn( - returnValues: ReturnReceiptValues, - abortSignal?: AbortSignal, - ): Promise; + async canReturn(returnValues: ReturnReceiptValues): Promise; /** * Determines if a return can proceed, accepting either a ReturnProcess or ReturnReceiptValues. @@ -60,7 +53,6 @@ export class ReturnCanReturnService { */ async canReturn( input: ReturnProcess | ReturnReceiptValues, - abortSignal?: AbortSignal, ): Promise { let data: ReturnReceiptValues | undefined = undefined; @@ -74,14 +66,10 @@ export class ReturnCanReturnService { return undefined; // Prozess soll weitergehen, daher kein Error } - let req$ = this.#receiptService.ReceiptCanReturn( + const req$ = this.#receiptService.ReceiptCanReturn( data as ReturnReceiptValuesDTO, ); - if (abortSignal) { - req$ = req$.pipe(takeUntilAborted(abortSignal)); - } - try { return await firstValueFrom( req$.pipe( diff --git a/libs/oms/data-access/src/lib/services/return-details.service.ts b/libs/oms/data-access/src/lib/services/return-details.service.ts index cb658a5cc..df799a7f2 100644 --- a/libs/oms/data-access/src/lib/services/return-details.service.ts +++ b/libs/oms/data-access/src/lib/services/return-details.service.ts @@ -32,19 +32,19 @@ export class ReturnDetailsService { * @param params - The parameters for the return check. * @param params.item - The receipt item to check. * @param params.category - The product category to check against. - * @param abortSignal - Optional AbortSignal to cancel the request. * @returns A promise resolving to the result of the canReturn check, containing * eligibility status and any relevant constraints or messages. - * @throws Will throw an error if the return check fails or is aborted. + * @throws Will throw an error if the return check fails. */ - async canReturn( - { - receiptItemId, - quantity, - category, - }: { receiptItemId: number; quantity: number; category: ProductCategory }, - abortSignal?: AbortSignal, - ): Promise { + async canReturn({ + receiptItemId, + quantity, + category, + }: { + receiptItemId: number; + quantity: number; + category: ProductCategory; + }): Promise { const returnReceiptValues: ReturnReceiptValues = { quantity, receiptItem: { @@ -53,10 +53,7 @@ export class ReturnDetailsService { category, }; - return this.#returnCanReturnService.canReturn( - returnReceiptValues, - abortSignal, - ); + return this.#returnCanReturnService.canReturn(returnReceiptValues); } /** * Gets all available product categories that have defined question sets. diff --git a/libs/oms/data-access/src/lib/stores/return-details.store.ts b/libs/oms/data-access/src/lib/stores/return-details.store.ts index 1dbb48196..75e942cc1 100644 --- a/libs/oms/data-access/src/lib/stores/return-details.store.ts +++ b/libs/oms/data-access/src/lib/stores/return-details.store.ts @@ -176,7 +176,7 @@ export const ReturnDetailsStore = signalStore( category, }; }, - loader: async ({ params, abortSignal }) => { + loader: async ({ params }) => { if (params === undefined) { return undefined; } @@ -186,10 +186,7 @@ export const ReturnDetailsStore = signalStore( return store.canReturn()[key]; } - const res = await store._returnDetailsService.canReturn( - params, - abortSignal, - ); + const res = await store._returnDetailsService.canReturn(params); patchState(store, { canReturn: { ...store.canReturn(), [key]: res }, });