@chevre/domain 24.0.0-alpha.6 → 24.0.0-alpha.61

package/lib/chevre/service/aggregation/system.js

@@ -219,7 +219,7 @@ function aggregateAuthorizeEventServiceOfferAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.action.aggregateAuthorizeEventServiceOfferAction({
+            const aggregateResult = await repos.aggregateAction.aggregateAuthorizeEventServiceOfferAction({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -264,7 +264,7 @@ function aggregateAuthorizePaymentAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.action.aggregateAuthorizePaymentAction({
+            const aggregateResult = await repos.aggregateAction.aggregateAuthorizePaymentAction({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -306,7 +306,7 @@ function aggregateAuthorizeOrderAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.action.aggregateAuthorizeOrderAction({
+            const aggregateResult = await repos.aggregateAction.aggregateAuthorizeOrderAction({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -351,7 +351,7 @@ function aggregateUseAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.action.aggregateByTypeOf({
+            const aggregateResult = await repos.aggregateAction.aggregateByTypeOf({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -396,7 +396,7 @@ function aggregateReserveAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.action.aggregateByTypeOf({
+            const aggregateResult = await repos.aggregateAction.aggregateByTypeOf({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -441,7 +441,7 @@ function aggregateOrderAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.action.aggregateByTypeOf({
+            const aggregateResult = await repos.aggregateAction.aggregateByTypeOf({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -486,7 +486,7 @@ function aggregateCancelReservationAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.action.aggregateCancelReservationAction({
+            const aggregateResult = await repos.aggregateAction.aggregateCancelReservationAction({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough
@@ -527,7 +527,7 @@ function aggregateCheckMovieTicketAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.action.aggregateCheckMovieTicketAction({
+            const aggregateResult = await repos.aggregateAction.aggregateCheckMovieTicketAction({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough
@@ -568,7 +568,7 @@ function aggregatePayMovieTicketAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.action.aggregatePayMovieTicketAction({
+            const aggregateResult = await repos.aggregateAction.aggregatePayMovieTicketAction({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough

package/lib/chevre/service/assetTransaction/cancelReservation/factory.d.ts

@@ -9,8 +9,8 @@ export declare function createStartParams(params: {
     project: factory.assetTransaction.IProject;
     transactionNumber: string;
     transaction?: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
-    reservations?: (Pick<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'id' | 'issuedThrough' | 'typeOf' | 'reservationNumber'> & {
-        reservationFor: Pick<factory.reservation.IReservationFor<factory.reservationType.EventReservation>, 'id' | 'typeOf'>;
+    reservations?: (Pick<factory.reservation.eventReservation.IReservation, 'id' | 'issuedThrough' | 'typeOf' | 'reservationNumber'> & {
+        reservationFor: Pick<factory.reservation.eventReservation.IReservationFor, 'id' | 'typeOf'>;
     })[];
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.CancelReservation>;
 export declare function createPotentialActions(params: {

package/lib/chevre/service/assetTransaction/cancelReservation/factory.js

@@ -119,23 +119,7 @@ function createPotentialActions(params) {
             transaction.object.reservations.map((reservation) => {
                 // 最適化(2022-06-06~)
                 let cancelObject;
-                if (reservation.typeOf === factory.reservationType.BusReservation) {
-                    cancelObject = {
-                        typeOf: reservation.typeOf,
-                        id: reservation.id,
-                        issuedThrough: {
-                            typeOf: reservation.issuedThrough?.typeOf
-                        },
-                        reservationFor: {
-                            typeOf: reservation.reservationFor.typeOf,
-                            id: String(reservation.reservationFor.id)
-                        },
-                        reservationNumber: reservation.reservationNumber,
-                        // ReservationConfirmed->ReservationCancelledのみ処理されるように保証する
-                        reservationStatus: factory.reservationStatusType.ReservationConfirmed
-                    };
-                }
-                else if (reservation.typeOf === factory.reservationType.EventReservation) {
+                if (reservation.typeOf === factory.reservationType.EventReservation) {
                     cancelObject = {
                         typeOf: reservation.typeOf,
                         id: reservation.id,

package/lib/chevre/service/assetTransaction/cancelReservation/start.d.ts

@@ -18,8 +18,8 @@ export declare function validateStartParams(params: IStartParams): (repos: {
     assetTransaction: AssetTransactionRepo;
 }) => Promise<{
     reserveTransaction: import("@chevre/factory/lib/assetTransaction/reserve").ITransaction | undefined;
-    reservations: (Pick<import("@chevre/factory/lib/reservation/event").IReservation, "id" | "typeOf" | "issuedThrough" | "reservationNumber"> & {
-        reservationFor: Pick<factory.reservation.IReservationFor<factory.reservationType.EventReservation>, "id" | "typeOf">;
+    reservations: (Pick<import("@chevre/factory/lib/reservation/event").IReservation, "id" | "typeOf" | "reservationNumber" | "issuedThrough"> & {
+        reservationFor: Pick<factory.reservation.eventReservation.IReservationFor, "id" | "typeOf">;
     })[] | undefined;
 }>;
 /**

package/lib/chevre/service/assetTransaction/cancelReservation/start.js

@@ -63,7 +63,7 @@ function validateStartParams(params) {
         if (reserveTransaction === undefined) {
             // 予約存在確認
             if (typeof params.object.reservation?.id === 'string') {
-                const reservation = await repos.reservation.projectFieldsById({
+                const reservation = await repos.reservation.findReservationById({
                     id: params.object.reservation.id,
                     inclusion: [
                         'issuedThrough', 'typeOf', 'reservationNumber', 'reservationFor.id', 'reservationFor.typeOf', 'provider', 'reservationStatus'

package/lib/chevre/service/assetTransaction/moneyTransfer.js

@@ -61,8 +61,8 @@ function start(params) {
             throw new factory.errors.NotFound('Product');
         }
         // fromとtoをfix
-        const { fromLocation } = await fixFromLocation(params, product)(repos);
-        const { toLocation } = await fixToLocation(params, product)(repos);
+        const { fromLocation } = await fixFromLocation(params, product)({});
+        const { toLocation } = await fixToLocation(params, product)({});
         const amount = fixMonetaryAmount(params, product);
         // 自動発行廃止(2022-05-17~)
         const transactionNumber = params.transactionNumber;
@@ -202,7 +202,7 @@ function fixFromLocation(params, product) {
         const transactionType = params.object.pendingTransaction?.typeOf;
         switch (transactionType) {
             case factory.account.transactionType.Withdraw:
-            case factory.account.transactionType.Transfer:
+            case factory.account.transactionType.Transfer: {
                 const fromLocationObject = fromLocation;
                 // Permitの存在しない注文口座に対応する
                 const hasNoPermit = fromLocationObject.hasNoPermit === true;
@@ -237,6 +237,7 @@ function fixFromLocation(params, product) {
                     issuedThrough: { id: fromLocationObject.issuedThrough?.id }
                 };
                 break;
+            }
             default:
             // no op
         }
@@ -264,7 +265,7 @@ function fixToLocation(params, product) {
         const transactionType = params.object.pendingTransaction?.typeOf;
         switch (transactionType) {
             case factory.account.transactionType.Deposit:
-            case factory.account.transactionType.Transfer:
+            case factory.account.transactionType.Transfer: {
                 const toLocationObject = toLocation;
                 // Permitの存在しない注文口座に対応する
                 const hasNoPermit = toLocationObject.hasNoPermit === true;
@@ -299,6 +300,7 @@ function fixToLocation(params, product) {
                     issuedThrough: { id: toLocationObject.issuedThrough?.id }
                 };
                 break;
+            }
             default:
             // no op
         }
@@ -408,7 +410,7 @@ function exportTasksById(params) {
                 }
                 break;
             case factory.transactionStatusType.Canceled:
-            case factory.transactionStatusType.Expired:
+            case factory.transactionStatusType.Expired: {
                 const cancelMoneyTransferTaskAttributes = {
                     project: { typeOf: transaction.project.typeOf, id: transaction.project.id },
                     name: factory.taskName.CancelMoneyTransfer,
@@ -423,6 +425,7 @@ function exportTasksById(params) {
                 };
                 taskAttributes.push(cancelMoneyTransferTaskAttributes);
                 break;
+            }
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }

package/lib/chevre/service/assetTransaction/pay/check.d.ts

@@ -1,20 +1,21 @@
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
-import type { ActionRepo } from '../../../repo/action';
+import type { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import * as MovieTicketPayment from '../../payment/movieTicket';
-export type ICheckOperation<T> = (repos: {
-    action: ActionRepo;
+export interface ICheckRepos {
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
     credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-}, settings: Settings) => Promise<T>;
+}
+export type ICheckOperation<T> = (repos: ICheckRepos, settings: Settings) => Promise<T>;
 /**
  * 決済方法認証
  */

package/lib/chevre/service/assetTransaction/pay/confirm.d.ts

@@ -20,5 +20,5 @@ export type IConfirmOperation<T> = (repos: IConfirmRepos) => Promise<T>;
  * 取引確定
  */
 export declare function confirm(params: factory.assetTransaction.pay.IConfirmParams & {
-    options: {};
+    options: Record<string, never>;
 }): IConfirmOperation<void>;

package/lib/chevre/service/assetTransaction/pay/exportTasksById.js

@@ -94,7 +94,7 @@ function exportTasksById(params) {
             data: onAssetTransactionStatusChangedTaskData
         };
         switch (transaction.status) {
-            case factory.transactionStatusType.Confirmed:
+            case factory.transactionStatusType.Confirmed: {
                 const payActions = potentialActions?.pay;
                 if (Array.isArray(payActions) && payActions.length > 0) {
                     const payTasks = payActions.map(({ object, purpose }) => {
@@ -113,6 +113,7 @@ function exportTasksById(params) {
                     taskAttributes.push(...payTasks);
                 }
                 break;
+            }
             case factory.transactionStatusType.Canceled:
                 taskAttributes.push(voidPaymentTasks, onAssetTransactionStatusChangedTask);
                 break;

package/lib/chevre/service/assetTransaction/pay/publishPaymentUrl.d.ts

@@ -1,22 +1,25 @@
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
-import type { AcceptedPaymentMethodRepo } from '../../../repo/acceptedPaymentMethod';
-import type { ActionRepo } from '../../../repo/action';
+import type { AcceptPayActionRepo } from '../../../repo/action/acceptPay';
+import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
 import type { EventRepo } from '../../../repo/event';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
+import type { IssuerRepo } from '../../../repo/issuer';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import * as CreditCardPayment from '../../payment/creditCard';
-export type IPublishPaymentUrlOperation<T> = (repos: {
-    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
-    action: ActionRepo;
+export interface IPublishPaymentUrlRepos {
+    authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
+    acceptPayAction: AcceptPayActionRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;
+    issuer: IssuerRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-}, settings: Settings) => Promise<T>;
+}
+export type IPublishPaymentUrlOperation<T> = (repos: IPublishPaymentUrlRepos, settings: Settings) => Promise<T>;
 export type IPublishPaymentUrlResult = CreditCardPayment.IPaymentAgencyTransaction & {
     paymentMethodId: string;
     paymentUrl: string;

package/lib/chevre/service/assetTransaction/pay/publishPaymentUrl.js

@@ -102,12 +102,12 @@ function publishPaymentUrl(params, options) {
                 : undefined,
             ...(typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined
         };
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.acceptPayAction.start(actionAttributes);
         let result;
         let recipe;
         try {
             switch (paymentServiceType) {
-                case factory.service.paymentService.PaymentServiceType.CreditCard:
+                case factory.service.paymentService.PaymentServiceType.CreditCard: {
                     const authorizeResult = await CreditCardPayment.authorize({
                         ...params,
                         id: '' // 決済URL発行プロセスにおいては決済取引IDは使用しないので空文字でok
@@ -141,13 +141,14 @@ function publishPaymentUrl(params, options) {
                         result
                     });
                     break;
+                }
                 default:
                     throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
             }
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
+                await repos.acceptPayAction.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -158,7 +159,7 @@ function publishPaymentUrl(params, options) {
             paymentMethodId: result.paymentMethodId,
             paymentUrl: result.paymentUrl
         };
-        await repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
+        await repos.acceptPayAction.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
         return result;
     };
 }

package/lib/chevre/service/assetTransaction/pay/start/factory.js

@@ -83,7 +83,7 @@ function createStartParams(params, options) {
             };
             accountId = ''; // 強制的に空文字化(2024-06-14~)
             break;
-        case factory.service.paymentService.PaymentServiceType.MovieTicket:
+        case factory.service.paymentService.PaymentServiceType.MovieTicket: {
             const specifiedMovieTickets = params.object.paymentMethod?.movieTickets;
             totalPaymentDue = {
                 typeOf: 'MonetaryAmount',
@@ -103,6 +103,7 @@ function createStartParams(params, options) {
                 ? specifiedMovieTickets[0].identifier // 決済カードidentifierは1つのみ許可の前提
                 : '';
             break;
+        }
         default:
         // no op
     }

package/lib/chevre/service/assetTransaction/pay/start/preStart/validateAcceptedPaymentMethodIfNeeded.d.ts

@@ -1,21 +1,16 @@
 import * as factory from '../../../../../factory';
-import type { AcceptedPaymentMethodRepo } from '../../../../../repo/acceptedPaymentMethod';
 import type { EventRepo } from '../../../../../repo/event';
 import type { EventSeriesRepo } from '../../../../../repo/eventSeries';
+import type { IssuerRepo } from '../../../../../repo/issuer';
+import type { PaymentServiceRepo } from '../../../../../repo/paymentService';
 /**
  * 必要あらば関連リソースの対応決済方法を検証する
  */
 export declare function validateAcceptedPaymentMethodIfNeeded(params: Pick<factory.assetTransaction.pay.IStartParamsWithoutDetail, 'object'> & {
     instrument: factory.action.trade.pay.IPlaceOrderRelatedInstrument[];
-} | {
-    object: factory.action.accept.pay.IPayObject & {
-        paymentMethod: factory.action.accept.pay.IPaymentMethod & {
-            movieTickets: never;
-        };
-    };
-    instrument: factory.action.accept.pay.IInstrument[];
 }): (repos: {
-    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;
+    issuer: IssuerRepo;
+    paymentService: PaymentServiceRepo;
 }) => Promise<void>;