@chevre/domain 24.0.0-alpha.5 → 24.0.0-alpha.52

package/lib/chevre/service/assetTransaction/pay/start/processAuthorizeCreditCard.d.ts

@@ -1,6 +1,6 @@
 import * as factory from '../../../../factory';
 import { Settings } from '../../../../settings';
-import type { ActionRepo } from '../../../../repo/action';
+import type { AuthorizeInvoiceActionRepo } from '../../../../repo/action/authorizeInvoice';
 import type { AssetTransactionRepo } from '../../../../repo/assetTransaction';
 import type { PaymentServiceRepo } from '../../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../../repo/paymentServiceProvider';
@@ -21,7 +21,7 @@ export declare function processAuthorizeCreditCard(params: factory.assetTransact
         id?: string;
     };
 }): (repos: {
-    action: ActionRepo;
+    authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;

package/lib/chevre/service/assetTransaction/pay/start/processAuthorizeMovieTicket.d.ts

@@ -1,7 +1,9 @@
 import * as factory from '../../../../factory';
 import { Settings } from '../../../../settings';
 import type { AccountingReportRepo } from '../../../../repo/accountingReport';
-import type { ActionRepo } from '../../../../repo/action';
+import type { PayActionRepo } from '../../../../repo/action/pay';
+import type { RefundActionRepo } from '../../../../repo/action/refund';
+import type { CheckMovieTicketActionRepo } from '../../../../repo/action/checkMovieTicket';
 import type { AssetTransactionRepo } from '../../../../repo/assetTransaction';
 import type { CredentialsRepo } from '../../../../repo/credentials';
 import type { EventRepo } from '../../../../repo/event';
@@ -31,7 +33,12 @@ export declare function processAuthorizeMovieTicket(params: factory.assetTransac
     };
 }): (repos: {
     accountingReport: AccountingReportRepo;
-    action: ActionRepo;
+    action?: never;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
     credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;

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

@@ -2,11 +2,15 @@ import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 import type { AcceptedPaymentMethodRepo } from '../../../repo/acceptedPaymentMethod';
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
-import type { ActionRepo } from '../../../repo/action';
+import type { PayActionRepo } from '../../../repo/action/pay';
+import type { RefundActionRepo } from '../../../repo/action/refund';
+import type { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
+import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { CredentialsRepo } from '../../../repo/credentials';
 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 { PotentialActionRepo } from '../../../repo/potentialAction';
@@ -17,9 +21,16 @@ import { IPaymentAgencyTransaction } from '../../payment/creditCard';
 export interface IStartOperationRepos {
     acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     accountingReport: AccountingReportRepo;
-    action: ActionRepo;
+    action?: never;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
+    authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     credentials: CredentialsRepo;
     event: EventRepo;
+    issuer: IssuerRepo;
     eventSeries: EventSeriesRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

package/lib/chevre/service/assetTransaction/refund.d.ts

@@ -1,12 +1,15 @@
 import * as factory from '../../factory';
-import type { ActionRepo } from '../../repo/action';
+import type { PayActionRepo } from '../../repo/action/pay';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { PaymentServiceRepo } from '../../repo/paymentService';
 import type { PotentialActionRepo } from '../../repo/potentialAction';
 import type { ProductRepo } from '../../repo/product';
 import type { TaskRepo } from '../../repo/task';
 export interface IStartOperationRepos {
-    action: ActionRepo;
+    action?: never;
+    actions: {
+        pay: PayActionRepo;
+    };
     paymentService: PaymentServiceRepo;
     potentialAction: PotentialActionRepo;
     product: ProductRepo;

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

@@ -54,7 +54,7 @@ function start(params) {
         });
         const paymentServiceType = payTransaction.object.typeOf;
         // PayActionを確認する
-        const payAction = await repos.action.findPayAction({ project: { id: params.project.id }, paymentMethodId });
+        const payAction = await repos.actions.pay.findPayActionByPaymentMethodId({ project: { id: params.project.id }, paymentMethodId });
         if (payAction === undefined) {
             throw new factory.errors.NotFound(factory.actionType.PayAction);
         }

package/lib/chevre/service/assetTransaction/reserve/confirm/factory.d.ts

@@ -3,6 +3,6 @@ declare function createPotentialActions(params: {
     order?: Pick<factory.order.IOrder, 'orderNumber' | 'customer' | 'typeOf'>;
 }): {
     potentialActions: factory.assetTransaction.reserve.IPotentialActions;
-    underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+    underName?: factory.assetTransaction.reserve.IUnderName;
 };
 export { createPotentialActions };

package/lib/chevre/service/assetTransaction/reserve/start/createSubReservations.js

@@ -421,7 +421,7 @@ function validateProgramMembershipUsed(params) {
                 throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
             }
             switch (permitIssuedThrough.typeOf) {
-                case factory.service.paymentService.PaymentServiceType.FaceToFace:
+                case factory.service.paymentService.PaymentServiceType.FaceToFace: {
                     // 適用メンバーシップ条件有のオファーであれば、問答無用に受け入れる
                     const eligibleMembershipType = params.availableOffer.eligibleMembershipType?.[0]?.codeValue;
                     if (typeof eligibleMembershipType === 'string') {
@@ -435,8 +435,9 @@ function validateProgramMembershipUsed(params) {
                         };
                     }
                     break;
+                }
                 // 発行サービスがCreditCardのケースに対応(2023-09-01~)
-                case factory.service.paymentService.PaymentServiceType.CreditCard:
+                case factory.service.paymentService.PaymentServiceType.CreditCard: {
                     // 決済サービスのserviceOutputにPermitが存在すれば、設定されたメンバーシップ区分のPermitをprogramMembershipUsedとして適用する
                     let issuedThroughServiceType;
                     if (Array.isArray(permitIssuedThrough.serviceOutput)) {
@@ -460,7 +461,8 @@ function validateProgramMembershipUsed(params) {
                         throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'issuedThrough has no serviceOutput as Permit');
                     }
                     break;
-                case factory.product.ProductType.MembershipService:
+                }
+                case factory.product.ProductType.MembershipService: {
                     // requestedProgramMembershipUsedの発行サービスIDから外部連携設定を取得する
                     const permitService = await createPermitService({ issuedThrough: { id: permitIssuedThrough.id } })(repos);
                     // メンバーシップの存在確認
@@ -492,6 +494,7 @@ function validateProgramMembershipUsed(params) {
                         };
                     }
                     break;
+                }
                 default:
                     throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', `${permitIssuedThrough.typeOf} not implemented`);
             }

package/lib/chevre/service/assetTransaction/reserve/start/factory/createReservation.d.ts

@@ -2,10 +2,7 @@ import * as factory from '../../../../../factory';
 import { IMinimizedIndividualEvent } from '../../../../../factory/event';
 import { IAcceptedAddOn } from './price';
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
-/**
- * 確定時予約のITicket
- */
-type IReservedTicket = Pick<factory.reservation.ITicket, 'identifier' | 'issuedBy' | 'ticketType' | 'ticketedSeat' | 'typeOf'>;
+type IReservedTicket = Pick<factory.assetTransaction.reserve.ISubReservationReservedTicket, 'identifier' | 'issuedBy' | 'ticketType' | 'ticketedSeat' | 'typeOf'>;
 declare function createReservedTicket(params: {
     id: string;
     acceptedOffer: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail;
@@ -43,14 +40,14 @@ declare function createReservation(params: {
     };
     id: string;
     reservationFor: IMinimizedIndividualEvent;
-    reservedTicket: IReservedTicket;
+    reservedTicket: factory.assetTransaction.reserve.ISubReservationReservedTicket;
     additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
     additionalTicketText?: string;
     ticketOffer: factory.product.ITicketOffer;
     seatPriceComponent: factory.place.seat.IPriceComponent[];
     acceptedAddOns: IAcceptedAddOn[];
-    subReservation?: factory.reservation.ISubReservation<factory.reservationType.EventReservation>[];
-    programMembershipUsed?: factory.reservation.IProgramMembershipUsed<factory.reservationType.EventReservation>;
+    subReservation?: factory.reservation.eventReservation.ISubReservation[];
+    programMembershipUsed?: factory.reservation.IProgramMembershipUsed;
     availableOffer: factory.unitPriceOffer.IUnitPriceOffer;
     appliesToMovieTicket?: factory.assetTransaction.reserve.IAcceptedAppliesToMovieTicket;
     validateAppliesToMovieTicket: boolean;

package/lib/chevre/service/assetTransaction/reserve/start/factory/createReservation.js

@@ -393,46 +393,6 @@ function createReservation(params) {
         };
     }
     else {
-        return {
-            // project: params.project,
-            typeOf: factory.reservationType.BusReservation,
-            id: params.id,
-            // reservationPackage保管に移行(2023-06-06~)
-            // issuedThrough,
-            additionalProperty: params.additionalProperty,
-            // bookingTime: params.reserveDate,
-            // modifiedTime: params.reserveDate,
-            numSeats: 1,
-            price: price4reservation,
-            priceCurrency: factory.priceCurrency.JPY,
-            // reservationNumber: params.reservationNumber,
-            // statusは不要なので削除(2023-07-19~)
-            // reservationStatus: factory.reservationStatusType.ReservationPending,
-            reservedTicket: params.reservedTicket,
-            // underName: {
-            //     typeOf: params.agent.typeOf,
-            //     name: params.agent.name
-            // },
-            // checkedIn: false,
-            // attended: false,
-            ...(typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined,
-            ...(Array.isArray(params.subReservation))
-                ? {
-                    subReservation: params.subReservation.map((r) => {
-                        return {
-                            reservedTicket: {
-                                ticketedSeat: r.reservedTicket.ticketedSeat,
-                                typeOf: 'Ticket'
-                            }
-                        };
-                    })
-                }
-                : undefined,
-            // reservationPackage保管に移行(2023-06-06~)
-            // ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined,
-            ...(typeof params.programMembershipUsed?.identifier === 'string')
-                ? { programMembershipUsed: params.programMembershipUsed }
-                : undefined
-        };
+        throw new factory.errors.NotImplemented(`reservationFor not implemented. typeOf:${params.reservationFor.typeOf}`);
     }
 }

package/lib/chevre/service/assetTransaction/reserve/start/factory/createStartParams.js

@@ -125,17 +125,15 @@ function createIssuedThrough(params) {
             typeOf: 'CategoryCode'
         }
         : undefined;
-    const availableChannel = eventOffers.itemOffered.availableChannel;
-    if (availableChannel === undefined) {
+    if (typeof eventOffers.itemOffered.id !== 'string') {
         // availableChannelは必ず存在するはず
-        throw new factory.errors.NotFound('reservationFor.offers.availableChannel');
+        throw new factory.errors.NotFound('reservationFor.offers.itemOffered.id');
     }
     if (params.reservationFor.typeOf === factory.eventType.ScreeningEvent) {
         const issuedThrough = {
             typeOf: factory.product.ProductType.EventService,
             // 興行IDを追加(2022-09-08~)
             id: eventOffers.itemOffered.id,
-            availableChannel,
             // issuedThrough.serviceTypeを連携
             ...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined
         };
@@ -144,16 +142,6 @@ function createIssuedThrough(params) {
         };
     }
     else {
-        const issuedThrough = {
-            typeOf: factory.product.ProductType.Transportation,
-            // 興行IDを追加(2022-09-08~)
-            id: eventOffers.itemOffered.id,
-            availableChannel,
-            // issuedThrough.serviceTypeを連携
-            ...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined
-        };
-        return {
-            issuedThrough
-        };
+        throw new factory.errors.NotImplemented(`reservationFor not implemented. typeOf:${params.reservationFor.typeOf}`);
     }
 }

package/lib/chevre/service/assetTransaction/reserve/start/factory/price.d.ts

@@ -14,4 +14,4 @@ export declare function createPrice(params: {
     seatPriceComponent: factory.place.seat.IPriceComponent[];
     acceptedAddOns: IAcceptedAddOn[];
     appliesToMovieTicket?: factory.assetTransaction.reserve.IAcceptedAppliesToMovieTicket;
-}): factory.reservation.IPriceSpecification<factory.reservationType.EventReservation>;
+}): factory.reservation.eventReservation.IPrice;

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

@@ -244,8 +244,10 @@ function searchEventSeatOffers(params) {
         const eventOffers = params.event.offers;
         const reservedSeatsAvailable = eventOffers?.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat !== undefined;
         if (reservedSeatsAvailable) {
-            const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
-            const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            // const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
+            // const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            const roomBranchCode = params.event.location.branchCode;
+            const movieTheaterBranchCode = params.event.superEvent.location.branchCode;
             // reimplement using projectSeatsByScreeningRoom
             const seats = await repos.seat.projectSeatsByScreeningRoom({
                 project: { id: { $eq: params.event.project.id } },
@@ -499,11 +501,8 @@ function processLockOfferRateLimit(params) {
                         }
                     },
                     reservationFor: {
-                        startDate: (params.reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                            ? (0, moment_1.default)(params.reservationFor.startDate)
-                                .toDate()
-                            : (0, moment_1.default)(params.reservationFor.departureTime)
-                                .toDate()
+                        startDate: (0, moment_1.default)(params.reservationFor.startDate)
+                            .toDate()
                     },
                     reservationNumber: params.reservationNumber
                 };

package/lib/chevre/service/assetTransaction/reserveCOA/cancel.d.ts

@@ -1,12 +1,24 @@
 import type * as COA from '@motionpicture/coa-service';
 import * as factory from '../../../factory';
 import { ActionRepo } from '../../../repo/action';
+import { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
 import { TaskRepo } from '../../../repo/task';
-type ICancelOperation<T> = (repos: {
+interface ICancelRepos {
     action: ActionRepo;
     reserveService: COA.service.Reserve;
     task: TaskRepo;
-}) => Promise<T>;
+}
+type ICancelOperation<T> = (repos: ICancelRepos) => Promise<T>;
+interface ICancelByAcceptActionRepos {
+    action: ActionRepo;
+    acceptCOAOfferAction: AcceptCOAOfferActionRepo;
+    reserveService: COA.service.Reserve;
+    task: TaskRepo;
+}
+type ICancelByAcceptActionOperation<T> = (repos: ICancelByAcceptActionRepos) => Promise<T>;
+/**
+ * 興行オファー承認アクションからCOA予約を取り消す
+ */
 declare function cancel(params: {
     action: factory.action.authorize.offer.eventService.IAction;
 }, options: {
@@ -15,6 +27,9 @@ declare function cancel(params: {
      */
     asyncCancelPendingReservation: boolean;
 }): ICancelOperation<void>;
+/**
+ * 興行オファー採用アクションからCOA予約を取り消す
+ */
 declare function cancelByAcceptAction(params: {
     action: factory.action.accept.coaOffer.IAction;
 }, options: {
@@ -22,5 +37,5 @@ declare function cancelByAcceptAction(params: {
      * cancelPendingReservation async?(2025-03-03~)
      */
     asyncCancelPendingReservation: boolean;
-}): ICancelOperation<void>;
-export { cancel, cancelByAcceptAction };
+}): ICancelByAcceptActionOperation<void>;
+export { ICancelRepos, ICancelByAcceptActionRepos, cancel, cancelByAcceptAction };

package/lib/chevre/service/assetTransaction/reserveCOA/cancel.js

@@ -27,6 +27,9 @@ exports.cancel = cancel;
 exports.cancelByAcceptAction = cancelByAcceptAction;
 const factory = __importStar(require("../../../factory"));
 const cancelReservation_1 = require("../../reserveCOA/cancelReservation");
+/**
+ * 興行オファー承認アクションからCOA予約を取り消す
+ */
 function cancel(params, options) {
     return async (repos) => {
         // object.pendingTransactionに連携内容情報が記録されているので、その情報を元に仮予約を取り消す
@@ -77,9 +80,12 @@ function cancel(params, options) {
         }
     };
 }
+/**
+ * 興行オファー採用アクションからCOA予約を取り消す
+ */
 function cancelByAcceptAction(params, options) {
     return async (repos) => {
-        const recipe = await repos.action.findRecipeByAction({
+        const recipe = await repos.acceptCOAOfferAction.findRecipeByAction({
             project: { id: params.action.project.id },
             recipeFor: { id: params.action.id }
         });

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

@@ -39,4 +39,4 @@ export declare function exportOneTransactionTasksIfExists(params: {
 }): (repos: {
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
-}) => Promise<Pick<factory.assetTransaction.ITransaction<factory.assetTransactionType>, "id" | "typeOf"> | void>;
+}) => Promise<Pick<factory.assetTransaction.ITransaction<factory.assetTransactionType>, "id" | "typeOf"> | undefined>;

package/lib/chevre/service/delivery/factory.js

@@ -53,16 +53,29 @@ function createOwnershipInfosFromOrder(params) {
         });
         const acquiredFrom = createAcquiredFrom(params);
         const ownedBy = createOwnedby(params);
-        const itemOfferedType = itemOffered.typeOf;
-        switch (itemOfferedType) {
-            case factory.reservationType.BusReservation:
-            case factory.reservationType.EventReservation:
-                const excludeCOAReservation = acceptedOffer.offeredThrough?.identifier === factory.service.webAPI.Identifier.COA;
-                if (excludeCOAReservation) {
-                    // bookingService:COAでは作成しない(2024-12-31~)
+        // 所有者があれば所有権を作成する
+        if (ownedBy.length > 0) {
+            const itemOfferedType = itemOffered.typeOf;
+            switch (itemOfferedType) {
+                case factory.reservationType.EventReservation: {
+                    const excludeCOAReservation = acceptedOffer.offeredThrough?.identifier === factory.service.webAPI.Identifier.COA;
+                    if (excludeCOAReservation) {
+                        // bookingService:COAでは作成しない(2024-12-31~)
+                    }
+                    else {
+                        ownershipInfo = (0, factory_2.createReservationOwnershipInfo)({
+                            project: params.order.project,
+                            ownedBy: ownedBy,
+                            acceptedOffer: { ...acceptedOffer, itemOffered },
+                            ownedFrom: ownedFrom,
+                            identifier: identifier,
+                            acquiredFrom: acquiredFrom
+                        });
+                    }
+                    break;
                 }
-                else {
-                    ownershipInfo = (0, factory_2.createReservationOwnershipInfo)({
+                case factory.permit.PermitType.Permit:
+                    ownershipInfo = (0, factory_1.createProductOwnershipInfo)({
                         project: params.order.project,
                         ownedBy: ownedBy,
                         acceptedOffer: { ...acceptedOffer, itemOffered },
@@ -70,24 +83,14 @@ function createOwnershipInfosFromOrder(params) {
                         identifier: identifier,
                         acquiredFrom: acquiredFrom
                     });
-                }
-                break;
-            case factory.permit.PermitType.Permit:
-                ownershipInfo = (0, factory_1.createProductOwnershipInfo)({
-                    project: params.order.project,
-                    ownedBy: ownedBy,
-                    acceptedOffer: { ...acceptedOffer, itemOffered },
-                    ownedFrom: ownedFrom,
-                    identifier: identifier,
-                    acquiredFrom: acquiredFrom
-                });
-                break;
-            case factory.actionType.MoneyTransfer:
-                // no op
-                // 所有権は発生しない
-                break;
-            default:
-                throw new factory.errors.NotImplemented(`Offered item type ${itemOfferedType} not implemented`);
+                    break;
+                // case factory.actionType.MoneyTransfer:
+                //     // no op
+                //     // 所有権は発生しない
+                //     break;
+                default:
+                    throw new factory.errors.NotImplemented(`Offered item type ${itemOfferedType} not implemented`);
+            }
         }
         if (ownershipInfo !== undefined) {
             ownershipInfos.push(ownershipInfo);
@@ -112,17 +115,17 @@ function createAcquiredFrom(params) {
     };
 }
 function createOwnedby(params) {
-    // 最低限の情報に絞る
     const customer = params.order.customer;
     let owner;
     // 顧客組織の場合
     if (customer.typeOf === factory.organizationType.Organization) {
-        const ownerAsOrganization = {
-            // 個人情報排除するように
-            typeOf: customer.typeOf,
-            id: customer.id
-        };
-        owner = ownerAsOrganization;
+        // discontinue(2026-03-15~)
+        // const ownerAsOrganization: factory.ownershipInfo.IOwnerAsOrganization = {
+        //     // 個人情報排除するように
+        //     typeOf: customer.typeOf,
+        //     id: customer.id
+        // };
+        // owner = ownerAsOrganization;
     }
     else if (customer.typeOf === factory.personType.Person) {
         const ownerAsPerson = {
@@ -133,11 +136,12 @@ function createOwnedby(params) {
         owner = ownerAsPerson;
     }
     else {
-        owner = {
-            // 個人情報排除するように
-            typeOf: customer.typeOf,
-            id: customer.id
-        };
+        // discontinue(2026-03-15~)
+        // owner = {
+        //     // 個人情報排除するように
+        //     typeOf: customer.typeOf,
+        //     id: customer.id
+        // };
     }
-    return [owner];
+    return (owner !== undefined) ? [owner] : [];
 }

package/lib/chevre/service/delivery/product/factory.js

@@ -73,7 +73,6 @@ function createProductOwnershipInfo(params) {
         throw new factory.errors.NotFound('Order.acceptedOffers.priceSpecification.referenceQuantity.value');
     }
     const itemOffered = params.acceptedOffer.itemOffered;
-    // 最適化(2023-02-01~)
     const issuedThrough = (typeof itemOffered.issuedThrough?.typeOf === 'string')
         ? {
             id: itemOffered.issuedThrough.id,
@@ -84,12 +83,11 @@ function createProductOwnershipInfo(params) {
         }
         : undefined;
     const typeOfGood = {
-        // project: itemOffered.project, // 最適化(2023-02-01~)
         identifier: itemOffered.identifier,
         typeOf: itemOffered.typeOf,
         ...(typeof issuedThrough?.typeOf === 'string') ? { issuedThrough } : undefined,
-        ...(itemOffered.validFor !== undefined) ? { validFor: itemOffered.validFor } : undefined,
-        ...(itemOffered.name !== undefined) ? { name: itemOffered.name } : undefined
+        // ...(itemOffered.validFor !== undefined) ? { validFor: itemOffered.validFor } : undefined,
+        // ...(itemOffered.name !== undefined) ? { name: itemOffered.name } : undefined
     };
     const ownershipInfo = {
         project: params.project,

package/lib/chevre/service/delivery/reservation/factory.js

@@ -39,39 +39,34 @@ function createReservationOwnershipInfo(params) {
         ownedThrough = (0, moment_timezone_1.default)(itemOffered.reservationFor.endDate)
             .toDate();
     }
-    else if (itemOffered.typeOf === factory.reservationType.BusReservation) {
-        ownedThrough = (0, moment_timezone_1.default)(itemOffered.reservationFor.arrivalTime)
-            .toDate();
-    }
     else {
         throw new factory.errors.NotImplemented(`itemOffered.typeOf '${itemOffered.typeOf}' not implemented`);
     }
-    let bookingService = params.acceptedOffer.offeredThrough;
-    if (bookingService === undefined) {
-        // デフォルトブッキングサービスはChevre
-        bookingService = {
-            typeOf: 'WebAPI',
-            identifier: factory.service.webAPI.Identifier.Chevre
-        };
-    }
+    // let bookingService = params.acceptedOffer.offeredThrough;
+    // if (bookingService === undefined) {
+    //     // デフォルトブッキングサービスはChevre
+    //     bookingService = {
+    //         typeOf: 'WebAPI',
+    //         identifier: factory.service.webAPI.Identifier.Chevre
+    //     };
+    // }
     let typeOfGood;
     if (itemOffered.typeOf === factory.reservationType.EventReservation) {
         typeOfGood = {
             typeOf: itemOffered.typeOf,
             id: itemOffered.id,
             reservationNumber: itemOffered.reservationNumber,
-            bookingService: bookingService,
-            ...(typeof itemOffered.issuedThrough?.typeOf === 'string') ? { issuedThrough: itemOffered.issuedThrough } : undefined
-        };
-    }
-    else if (itemOffered.typeOf === factory.reservationType.BusReservation) {
-        typeOfGood = {
-            typeOf: itemOffered.typeOf,
-            id: itemOffered.id,
-            reservationNumber: itemOffered.reservationNumber,
-            bookingService: bookingService,
+            // bookingService: bookingService,
             ...(typeof itemOffered.issuedThrough?.typeOf === 'string') ? { issuedThrough: itemOffered.issuedThrough } : undefined
         };
+        // } else if (itemOffered.typeOf === factory.reservationType.BusReservation) {
+        //     typeOfGood = {
+        //         typeOf: itemOffered.typeOf,
+        //         id: itemOffered.id,
+        //         reservationNumber: itemOffered.reservationNumber,
+        //         bookingService: bookingService,
+        //         ...(typeof itemOffered.issuedThrough?.typeOf === 'string') ? { issuedThrough: itemOffered.issuedThrough } : undefined
+        //     };
     }
     else {
         throw new factory.errors.NotImplemented(`itemOffered.typeOf '${itemOffered.typeOf}' not implemented`);

package/lib/chevre/service/event/saveScreeningEvents.js

@@ -50,7 +50,7 @@ function saveScreeningEvents(params, options) {
                     upsert: true
                 });
             }
-            catch (error) {
+            catch (_error) {
                 // no op
             }
         }
@@ -229,7 +229,7 @@ function createScreeningEventFromCOA(params) {
         addDay4endDate += Math.floor(Number(timeEnd) / DAY);
         timeEnd = `0000${Number(timeEnd) % DAY}`.slice(-4);
     }
-    catch (error) {
+    catch (_error) {
         // no op
     }
     let endDate = (0, moment_timezone_1.default)(`${params.performanceFromCOA.dateJouei} ${timeEnd} +09:00`, 'YYYYMMDD HHmm Z')

package/lib/chevre/service/event.js

@@ -197,7 +197,7 @@ function cancelDeletedEvents(params) {
                     project: { id: params.project.id }
                 });
             }
-            catch (error) {
+            catch (_error) {
                 // no op
             }
         }

package/lib/chevre/service/notification/notifyByEmail.d.ts

@@ -3,7 +3,7 @@ declare function notifyByEmail(params: {
     subject: string;
     content: string;
     logLevel: LineNotifyLogLevel;
-}): (__: {}, credentials: {
+}): (__: Record<string, never>, credentials: {
     sendGrid: SendGridCredentials;
 }) => Promise<{
     result: import("@chevre/factory/lib/action/transfer/send/message/email").IResult;

package/lib/chevre/service/notification/triggerWebhook.d.ts

@@ -2,13 +2,14 @@ import * as factory from '../../factory';
 import type { ActionRepo } from '../../repo/action';
 import type { PotentialActionRepo } from '../../repo/potentialAction';
 import type { SettingRepo } from '../../repo/setting';
+interface ITriggerWebhookRepos {
+    action: ActionRepo;
+    potentialAction: PotentialActionRepo;
+    setting: SettingRepo;
+}
 declare function triggerWebhook(params: factory.task.IData<factory.taskName.TriggerWebhook> & {
     project: {
         id: string;
     };
-}): (repos: {
-    action: ActionRepo;
-    potentialAction: PotentialActionRepo;
-    setting: SettingRepo;
-}) => Promise<void>;
-export { triggerWebhook };
+}): (repos: ITriggerWebhookRepos) => Promise<void>;
+export { ITriggerWebhookRepos, triggerWebhook };