@chevre/domain 21.37.0-alpha.5 → 21.37.0-alpha.7

package/lib/chevre/repo/mongoose/schemas/action.js

@@ -226,15 +226,15 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'object.acceptedOffer.itemOffered.serviceOutput.reservedTicket.ticketedSeat.seatNumber': 1, startDate: -1 },
-        {
-            name: 'searchByObjectAcceptedOfferItemOfferedServiceOutputSeatNumber',
-            partialFilterExpression: {
-                'object.acceptedOffer.itemOffered.serviceOutput.reservedTicket.ticketedSeat.seatNumber': { $exists: true }
-            }
-        }
-    ],
+    // [
+    //     { 'object.acceptedOffer.itemOffered.serviceOutput.reservedTicket.ticketedSeat.seatNumber': 1, startDate: -1 },
+    //     {
+    //         name: 'searchByObjectAcceptedOfferItemOfferedServiceOutputSeatNumber',
+    //         partialFilterExpression: {
+    //             'object.acceptedOffer.itemOffered.serviceOutput.reservedTicket.ticketedSeat.seatNumber': { $exists: true }
+    //         }
+    //     }
+    // ], // discontinue(2024-07-02~)
     [
         { 'object.orderNumber': 1, startDate: -1 },
         {

package/lib/chevre/repo/mongoose/schemas/reservation.js

@@ -60,10 +60,13 @@ const schemaOptions = {
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,
-    timestamps: {
-        createdAt: 'createdAt',
-        updatedAt: 'updatedAt'
-    },
+    // discontinue(2024-07-02~)
+    // timestamps: {
+    //     createdAt: 'createdAt',
+    //     updatedAt: 'updatedAt'
+    // },
+    timestamps: false,
+    versionKey: false,
     toJSON: {
         getters: false,
         virtuals: false,

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

@@ -15,7 +15,6 @@ export declare function createStartParams(params: factory.assetTransaction.reser
         id: string;
     };
     reservationNumber: string;
-    useHoldStockByTransactionNumber: boolean;
     event: IMinimizedIndividualEvent<factory.eventType.Event | factory.eventType.ScreeningEvent>;
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Reserve> & {
     object: IObject;
@@ -29,7 +28,9 @@ export declare function createPointAward(params: {
     reservation: {
         id: string;
     };
-    assetTransaction: factory.assetTransaction.reserve.ITransaction;
+    project: {
+        id: string;
+    };
 }): factory.action.transfer.moneyTransfer.IPointAward | undefined;
 export declare function createReservedTicket(params: {
     id: string;
@@ -43,7 +44,6 @@ export declare function createReservedTicket(params: {
     screeningRoomSections?: factory.place.screeningRoomSection.IPlace[];
     availableSeatOffers: factory.place.seat.IPlaceWithOffer[];
     ticketOffer: factory.product.ITicketOffer;
-    transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
 }): factory.reservation.ITicket;
 export declare function validateAppliesToMovieTicket(params: {
     availableOffer: factory.unitPriceOffer.IUnitPriceOffer;
@@ -94,18 +94,3 @@ export declare function createPotentialActions(params: {
     potentialActions: factory.assetTransaction.reserve.IPotentialActions;
     underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
 };
-export declare function createMoneyTransferActions(params: {
-    acceptedOffer?: factory.assetTransaction.reserve.IAcceptedOffer4object;
-    reservation: Pick<factory.assetTransaction.reserve.IObjectSubReservation, 'reservedTicket'>;
-    transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
-    underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
-}): import("@chevre/factory/lib/action/transfer/moneyTransfer").IAttributes[];
-export interface IPotentialCancelAction extends factory.action.cancel.reservation.IAttributes {
-    purpose: {
-        id: string;
-        typeOf: factory.assetTransactionType.Reserve;
-    };
-}
-export declare function createCancelPendingReservationAction(params: {
-    transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
-}): IPotentialCancelAction | undefined;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCancelPendingReservationAction = exports.createMoneyTransferActions = exports.createPotentialActions = exports.createReservation = exports.createIssuedThrough = exports.createReservationFor = exports.createAdditionalTicketText = exports.createAdditionalProperty = exports.validateAppliesToMovieTicket = exports.createReservedTicket = exports.createPointAward = exports.createStartParams = void 0;
+exports.createPotentialActions = exports.createReservation = exports.createIssuedThrough = exports.createReservationFor = exports.createAdditionalTicketText = exports.createAdditionalProperty = exports.validateAppliesToMovieTicket = exports.createReservedTicket = exports.createPointAward = exports.createStartParams = void 0;
 /**
  * 予約取引ファクトリー
  */
@@ -21,9 +21,7 @@ function createStartParams(params) {
     const { issuedThrough } = createIssuedThrough({ reservationFor: params.event });
     const reservationPackage = Object.assign({ issuedThrough,
         provider,
-        reservationFor, reservationNumber: reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, 
-        // trueで固定(2023-07-19~)
-        disablePendingReservations: true, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, typeOf: factory.reservationType.ReservationPackage }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
+        reservationFor, reservationNumber: reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, disablePendingReservations: true, useHoldStockByTransactionNumber: true, typeOf: factory.reservationType.ReservationPackage }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
     return {
         project: { id: params.project.id, typeOf: factory.organizationType.Project },
         typeOf: factory.assetTransactionType.Reserve,
@@ -53,8 +51,8 @@ function createPointAward(params) {
         && typeof pointAwardToLocationIssuedThroughId === 'string') {
         // ここで識別子を作成する(入金のユニークネスが保証される)
         const purposeIdentifier = (0, accountTransactionIdentifier_1.createPointAwardPurposeIdentifier4reservation)({
-            assetTransaction: { typeOf: params.assetTransaction.typeOf },
-            project: { id: params.assetTransaction.project.id },
+            assetTransaction: { typeOf: factory.assetTransactionType.Reserve },
+            project: { id: params.project.id },
             reservation: { id: params.reservation.id },
             toLocation: { identifier: pointAwardToLocationIdentifier }
         });
@@ -584,75 +582,3 @@ function ordre2reservationUnderName(params) {
         underName: createReservationUnderName({ order: params.order })
     };
 }
-function createMoneyTransferActions(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
-    const pointAward = (_b = (_a = params.acceptedOffer) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.pointAward;
-    const moneyTransfer = [];
-    // ポイント特典があれば適用
-    const pointAwardToLocationIdentifier = (_c = pointAward === null || pointAward === void 0 ? void 0 : pointAward.toLocation) === null || _c === void 0 ? void 0 : _c.identifier;
-    const pointAwardToLocationTypeOf = (_d = pointAward === null || pointAward === void 0 ? void 0 : pointAward.toLocation) === null || _d === void 0 ? void 0 : _d.typeOf;
-    if (typeof ((_e = pointAward === null || pointAward === void 0 ? void 0 : pointAward.amount) === null || _e === void 0 ? void 0 : _e.value) === 'number'
-        && typeof pointAwardToLocationIdentifier === 'string'
-        && typeof pointAwardToLocationTypeOf === 'string') {
-        const fromLocation = {
-            typeOf: (typeof ((_f = params.reservation.reservedTicket.issuedBy) === null || _f === void 0 ? void 0 : _f.typeOf) === 'string')
-                ? params.reservation.reservedTicket.issuedBy.typeOf
-                : params.transaction.typeOf,
-            name: (typeof ((_g = params.reservation.reservedTicket.issuedBy) === null || _g === void 0 ? void 0 : _g.name) === 'string')
-                ? params.reservation.reservedTicket.issuedBy.name
-                : params.transaction.id
-        };
-        const toLocation = {
-            identifier: pointAwardToLocationIdentifier,
-            typeOf: factory.permit.PermitType.Permit,
-            issuedThrough: { id: String((_j = (_h = pointAward.toLocation) === null || _h === void 0 ? void 0 : _h.issuedThrough) === null || _j === void 0 ? void 0 : _j.id) }
-        };
-        const recipient = {
-            typeOf: (typeof ((_k = params.underName) === null || _k === void 0 ? void 0 : _k.typeOf) === 'string')
-                ? (_l = params.underName) === null || _l === void 0 ? void 0 : _l.typeOf
-                : factory.personType.Person,
-            id: (typeof ((_m = params.underName) === null || _m === void 0 ? void 0 : _m.id) === 'string')
-                ? (_o = params.underName) === null || _o === void 0 ? void 0 : _o.id
-                : '',
-            name: String((_p = params.underName) === null || _p === void 0 ? void 0 : _p.name)
-        };
-        moneyTransfer.push(Object.assign(Object.assign({ project: params.transaction.project, typeOf: factory.actionType.MoneyTransfer, agent: params.transaction.project, recipient, object: {
-                typeOf: factory.account.transactionType.Deposit
-            }, purpose: Object.assign({ typeOf: params.transaction.typeOf, id: params.transaction.id }, (typeof ((_q = pointAward.purpose) === null || _q === void 0 ? void 0 : _q.identifier) === 'string') ? { identifier: pointAward.purpose.identifier } : undefined), amount: {
-                typeOf: 'MonetaryAmount',
-                value: (_r = pointAward.amount) === null || _r === void 0 ? void 0 : _r.value,
-                currency: (_s = pointAward.amount) === null || _s === void 0 ? void 0 : _s.currency
-            }, fromLocation: fromLocation, toLocation: toLocation }, (typeof pointAward.description === 'string') ? { description: pointAward.description } : undefined), (pointAward.recipient !== undefined) ? { recipient: pointAward.recipient } : undefined));
-    }
-    return moneyTransfer;
-}
-exports.createMoneyTransferActions = createMoneyTransferActions;
-function createCancelPendingReservationAction(params) {
-    const transaction = params.transaction;
-    const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
-    let cancelActionAttributes;
-    if (pendingReservations.length > 0) {
-        const reservationFor = transaction.object.reservationFor;
-        if (reservationFor === undefined) {
-            throw new factory.errors.NotFound('transaction.object.reservationFor');
-        }
-        // ReservationPackageに対応(2022-12-23~)
-        const reservationPackage = {
-            typeOf: factory.reservationType.ReservationPackage,
-            reservationNumber: transaction.transactionNumber,
-            reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
-            reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
-                ? params.transaction.object.reservationStatus
-                : factory.reservationStatusType.ReservationPending
-        };
-        cancelActionAttributes = {
-            project: transaction.project,
-            typeOf: factory.actionType.CancelAction,
-            purpose: { typeOf: transaction.typeOf, id: transaction.id },
-            agent: transaction.project,
-            object: reservationPackage
-        };
-    }
-    return cancelActionAttributes;
-}
-exports.createCancelPendingReservationAction = createCancelPendingReservationAction;

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

@@ -28,7 +28,6 @@ export interface IStartOperationRepos {
     productOffer: ProductOfferRepo;
     priceSpecification: PriceSpecificationRepo;
     project: ProjectRepo;
-    reservation: ReservationRepo;
     seat: SeatRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
@@ -45,12 +44,10 @@ export interface IAddReservationsOperationRepos {
     product: ProductRepo;
     productOffer: ProductOfferRepo;
     priceSpecification: PriceSpecificationRepo;
-    reservation: ReservationRepo;
     seat: SeatRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }
-export type IAddReservationsOperation<T> = (repos: IAddReservationsOperationRepos) => Promise<T>;
 export type ICancelOperation<T> = (repos: {
     action: ActionRepo;
     stockHolder: StockHolderRepo;
@@ -105,7 +102,6 @@ type IStartParams = factory.assetTransaction.reserve.IStartParamsWithoutDetail &
  * 取引開始
  */
 export declare function start(params: IStartParams & {
-    useHoldStockByTransactionNumber: boolean;
     stockHoldUntilDaysAfterEventEnd: number;
 }): IStartOperation<{
     transaction: Pick<factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>, 'id'>;

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

@@ -31,10 +31,9 @@ function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         const now = new Date();
-        // 自動発行廃止(2022-05-17~)
         const reservationNumber = params.transactionNumber;
         if (typeof reservationNumber !== 'string' || reservationNumber.length === 0) {
-            throw new factory.errors.ArgumentNull('transactionNumber');
+            throw new factory.errors.ArgumentNull('transactionNumber'); // 自動発行廃止(2022-05-17~)
         }
         // eventをfix
         const reservationForId = (_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id;
@@ -59,18 +58,10 @@ function start(params) {
         });
         const startParams = (0, factory_1.createStartParams)(Object.assign(Object.assign({}, params), { provider: { id: event.organizer.id }, reservationNumber,
             event }));
-        // 取引作成
-        let transaction;
-        try {
-            transaction = yield repos.assetTransaction.start(startParams);
-        }
-        catch (error) {
-            throw error;
-        }
-        let objectSubReservations = [];
-        const addReservationsResult = yield addReservations({
-            // id: transaction.id,
-            transaction,
+        // objectに必要な情報をそろえる
+        const { acceptedOffers4transactionObject, objectSubReservations } = yield createObjectAttributes({
+            reservationFor: startParams.object.reservationFor,
+            transaction: { transactionNumber: reservationNumber },
             now,
             object: params.object,
             event,
@@ -80,8 +71,19 @@ function start(params) {
             validateAppliesToMovieTicket: params.validateAppliesToMovieTicket,
             stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
         })(repos);
+        // 取引作成
+        const transaction = yield repos.assetTransaction.start(startParams);
+        // let objectSubReservations: IObjectSubReservation[] = [];
+        // const addReservationsResult = await addReservations({
+        yield addReservations({
+            reservationFor: startParams.object.reservationFor,
+            transaction: { id: transaction.id, transactionNumber: reservationNumber },
+            event,
+            stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd,
+            acceptedOffers4transactionObject, objectSubReservations
+        })(repos);
         // transaction = addReservationsResult.transaction;
-        objectSubReservations = addReservationsResult.objectSubReservations;
+        // objectSubReservations = addReservationsResult.objectSubReservations;
         return {
             transaction: { id: transaction.id },
             objectSubReservations,
@@ -91,19 +93,12 @@ function start(params) {
     });
 }
 exports.start = start;
-/**
- * 予約追加
- */
-function addReservations(params) {
-    // tslint:disable-next-line:max-func-body-length
+function createObjectAttributes(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        // const now = new Date();
-        // const transaction = await repos.assetTransaction.findById({ typeOf: factory.assetTransactionType.Reserve, id: params.id });
-        const now = params.now;
-        const transaction = params.transaction;
+        const { event, now } = params;
+        const reservationNumber = params.transaction.transactionNumber;
         const acceptedOffers = (Array.isArray(params.object.acceptedOffer)) ? params.object.acceptedOffer : [];
-        const event = params.event;
         if (event.typeOf !== factory.eventType.ScreeningEvent && event.typeOf !== factory.eventType.Event) {
             throw new factory.errors.Argument('object.reservationFor.id', `invalid event type ${event.typeOf}`);
         }
@@ -137,33 +132,34 @@ function addReservations(params) {
             availableOffers = searchEventTicketOffersResult.unitPriceOffers;
         }
         const availableSeatOffers = yield searchAvailableSeatOffers({ acceptedOffers, event })(repos);
-        // 仮予約作成
-        const { acceptedOffers4transactionObject, objectSubReservations } = yield createAcceptedOffers4transactionObject({
+        return createAcceptedOffers4transactionObject({
             acceptedOffers, ticketOffers, availableOffers, now,
-            event, availableSeatOffers, transaction,
+            event, availableSeatOffers, reservationNumber,
             availableAtOrFrom: params.availableAtOrFrom,
             validateAppliesToMovieTicket: params.validateAppliesToMovieTicket
         })(repos);
-        // const reservationFor = createReservationFor(event, true);
-        // const { issuedThrough } = createIssuedThrough({ reservationFor: event });
-        const reservationFor = transaction.object.reservationFor;
-        if (reservationFor === undefined) {
-            // 必ずstart時に保管されているはず
-            throw new factory.errors.Internal('transaction.object.reservationFor undefined unexpectedly');
-        }
+    });
+}
+/**
+ * 予約追加
+ */
+function addReservations(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const reservationNumber = params.transaction.transactionNumber;
+        const { event, reservationFor, acceptedOffers4transactionObject, objectSubReservations } = params;
         // 取引に予約追加
         let lockedOfferRateLimitKeys = [];
         try {
             lockedOfferRateLimitKeys = yield processLockOfferRateLimit({
                 reservations: objectSubReservations,
                 reservationFor,
-                reservationNumber: transaction.object.reservationNumber
+                reservationNumber
             })(repos);
             // 上書きの必要なし(2024-07-01~)
             // transaction = await repos.assetTransaction.addReservations({
             yield repos.assetTransaction.addReservations({
                 typeOf: factory.assetTransactionType.Reserve,
-                id: transaction.id,
+                id: params.transaction.id,
                 object: {
                     acceptedOffer: acceptedOffers4transactionObject,
                     // issuedThroughを追加(2023-06-05~)
@@ -178,7 +174,7 @@ function addReservations(params) {
                 yield Promise.all(objectSubReservations.map((reservation) => __awaiter(this, void 0, void 0, function* () {
                     yield (0, cancelReservation_1.processUnlockOfferRateLimit)({
                         reservation: {
-                            reservationNumber: transaction.object.reservationNumber,
+                            reservationNumber,
                             reservedTicket: reservation.reservedTicket
                         },
                         reservationFor
@@ -193,15 +189,15 @@ function addReservations(params) {
             event: event,
             reservations: objectSubReservations,
             transaction: {
-                id: transaction.id,
-                transactionNumber: transaction.transactionNumber,
-                object: { useHoldStockByTransactionNumber: transaction.object.useHoldStockByTransactionNumber === true }
+                id: params.transaction.id,
+                transactionNumber: params.transaction.transactionNumber
+                // object: { useHoldStockByTransactionNumber: transaction.object.useHoldStockByTransactionNumber === true }
             },
             stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
         })(repos);
         // ストックホルダー処理(stockHolderで残席数を集計しているので必要)
-        yield onReservationsCreated({ event, transaction: { transactionNumber: transaction.transactionNumber } })(repos);
-        return { objectSubReservations };
+        yield onReservationsCreated({ event, transaction: { transactionNumber: reservationNumber } })(repos);
+        // return { objectSubReservations };
     });
 }
 /**
@@ -313,7 +309,8 @@ function validateEvent(params) {
 function createAcceptedOffers4transactionObject(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // 予約番号
-        const reservationNumber = params.transaction.object.reservationNumber;
+        // const reservationNumber = params.transaction.object.reservationNumber;
+        const reservationNumber = params.reservationNumber;
         if (typeof reservationNumber !== 'string') {
             throw new factory.errors.Internal('Reservation number undefined');
         }
@@ -328,12 +325,12 @@ function createAcceptedOffers4transactionObject(params) {
             }
             const reservationId = `${reservationNumber}-${reservationIndex}`;
             // 入金先検証
-            yield validatePointAward({ project: { id: params.transaction.project.id }, acceptedOffer })(repos);
+            yield validatePointAward({ project: { id: params.event.project.id }, acceptedOffer })(repos);
             const pointAward = (0, factory_1.createPointAward)({
+                project: { id: params.event.project.id },
                 acceptedOffer: acceptedOffer,
                 offer: ticketOffer,
-                reservation: { id: reservationId },
-                assetTransaction: params.transaction
+                reservation: { id: reservationId }
             });
             // acceptedOffers4transactionObjectには必要な情報のみ保管する
             acceptedOffers4transactionObject.push({
@@ -349,7 +346,8 @@ function createReservations4transactionObject(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         // 予約番号
-        const reservationNumber = params.transaction.object.reservationNumber;
+        // const reservationNumber = params.transaction.object.reservationNumber;
+        const reservationNumber = params.reservationNumber;
         if (typeof reservationNumber !== 'string') {
             throw new factory.errors.Internal('Reservation number undefined');
         }
@@ -377,7 +375,7 @@ function createReservations4transactionObject(params) {
             });
             const programMembershipUsed = yield validateProgramMembershipUsed({
                 acceptedOffer,
-                project: params.transaction.project
+                project: { id: params.event.project.id }
             })(repos);
             // チケット作成
             const reservedTicket = (0, factory_1.createReservedTicket)({
@@ -388,8 +386,7 @@ function createReservations4transactionObject(params) {
                 reservationFor: { id: params.event.id },
                 reservedSeatsOnly,
                 availableSeatOffers: params.availableSeatOffers,
-                ticketOffer: ticketOffer,
-                transaction: params.transaction
+                ticketOffer: ticketOffer
             });
             const additionalTicketText = (0, factory_1.createAdditionalTicketText)({ acceptedOffer, reservedTicket });
             const additionalProperty = (0, factory_1.createAdditionalProperty)({ acceptedOffer });
@@ -422,7 +419,7 @@ function createReservations4transactionObject(params) {
                 // アドオンオファー検索(2023-03-02~)
                 availableAddOns = yield searchAvailableAddOns({
                     ids: acceptedAddOnsParams.map((acceptedAddOn) => String(acceptedAddOn.id)),
-                    project: { id: params.transaction.project.id },
+                    project: { id: params.event.project.id },
                     ticketOffer,
                     availableAtOrFrom: params.availableAtOrFrom
                 })(repos);
@@ -474,12 +471,8 @@ function createReservations4transactionObject(params) {
             }
             const subReservation = (_j = (_h = acceptedOffer.itemOffered) === null || _h === void 0 ? void 0 : _h.serviceOutput) === null || _j === void 0 ? void 0 : _j.subReservation;
             reservations.push((0, factory_1.createReservation)({
-                project: params.transaction.project,
+                project: { id: params.event.project.id, typeOf: factory.organizationType.Project },
                 id: reservationId,
-                // reserveDate: params.now,
-                // agent: params.transaction.agent,
-                // broker: params.transaction.object.broker,
-                // reservationNumber: reservationNumber,
                 reservationFor: params.event,
                 reservedTicket: reservedTicket,
                 additionalProperty: additionalProperty,
@@ -775,7 +768,7 @@ function processLockOfferRateLimit(params) {
  */
 function processLockSeats(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         const offers = [];
         params.reservations.forEach((r) => {
             var _a, _b;
@@ -820,12 +813,13 @@ function processLockSeats(params) {
             .add(params.stockHoldUntilDaysAfterEventEnd, 'days')
             .toDate();
         // holder:取引番号に対応(2023-06-05~)
-        let holder = params.transaction.id;
-        if (((_a = params.transaction.object) === null || _a === void 0 ? void 0 : _a.useHoldStockByTransactionNumber) === true) {
-            holder = params.transaction.transactionNumber;
-        }
-        const hasTicketedSeat = ((_d = (_c = (_b = params.event.offers.itemOffered.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservedTicket) === null || _c === void 0 ? void 0 : _c.ticketedSeat) === null || _d === void 0 ? void 0 : _d.typeOf) === factory.placeType.Seat;
-        const maximumAttendeeCapacity4event = (_e = params.event.location) === null || _e === void 0 ? void 0 : _e.maximumAttendeeCapacity;
+        // let holder: string = params.transaction.id;
+        // if (params.transaction.object?.useHoldStockByTransactionNumber === true) {
+        //     holder = params.transaction.transactionNumber;
+        // }
+        const holder = params.transaction.transactionNumber; // fix as transactionNumber(2024-07-02~)
+        const hasTicketedSeat = ((_c = (_b = (_a = params.event.offers.itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) === null || _c === void 0 ? void 0 : _c.typeOf) === factory.placeType.Seat;
+        const maximumAttendeeCapacity4event = (_d = params.event.location) === null || _d === void 0 ? void 0 : _d.maximumAttendeeCapacity;
         if (typeof maximumAttendeeCapacity4event === 'number') {
             yield repos.stockHolder.lockIfNotLimitExceeded({
                 project: { id: params.event.project.id },

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -71,7 +71,6 @@ declare function authorize(params: {
          */
         id: string;
     };
-    useHoldStockByTransactionNumber: boolean;
     stockHoldUntilDaysAfterEventEnd: number;
     /**
      * オファーID指定なしに座席をおさえる場合true

package/lib/chevre/service/offer/event/authorize.js

@@ -67,7 +67,9 @@ function authorize(params) {
                         acceptedOffer: acceptedOffers, event,
                         transactionNumber,
                         transaction, availableAtOrFrom: { id: params.store.id }, ticketOffers,
-                        unitPriceOffers, validateEvent: params.validateEvent === true, validateEventOfferPeriod: params.validateEventOfferPeriod === true, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined))(repos);
+                        unitPriceOffers, validateEvent: params.validateEvent === true, validateEventOfferPeriod: params.validateEventOfferPeriod === true, 
+                        // useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, // discontinue(2024-07-02~)
+                        stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined))(repos);
                     acceptedOffers4result = processStartReserveResult.acceptedOffers4result;
                     // add orderInTransaction(2024-01-15~)
                     if (!noOfferSpecified) {

package/lib/chevre/service/offer/event/processStartReserve4chevre.d.ts

@@ -30,7 +30,6 @@ declare function processStartReserve4chevre(params: {
     unitPriceOffers: factory.unitPriceOffer.IUnitPriceOffer[];
     validateEventOfferPeriod: boolean;
     validateEvent: boolean;
-    useHoldStockByTransactionNumber: boolean;
     stockHoldUntilDaysAfterEventEnd: number;
 }): (repos: {
     action: ActionRepo;

package/lib/chevre/service/offer/event/processStartReserve4chevre.js

@@ -28,7 +28,9 @@ function processStartReserve4chevre(params) {
             transactionNumber }, (params.broker !== undefined) ? { broker: params.broker } : undefined));
         const startParamObject = yield validateObjectWithoutDetail(startParams)(repos);
         // 予約取引開始
-        const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, preSearchedEvent: event, preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd }))(repos);
+        const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, preSearchedEvent: event, preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true, 
+            // useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, // discontinue(2024-07-02~)
+            stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd }))(repos);
         // responseBody = startReserveTransactionResult.transaction; // responseBody参照必要なし(2024-07-01~)
         // 予約取引からオファー情報を生成する
         acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({

package/lib/chevre/service/reserve/cancelReservation.js

@@ -15,7 +15,7 @@ exports.processUnlockOfferRateLimit = exports.cancelReservation = exports.cancel
  */
 const moment = require("moment");
 const factory = require("../../factory");
-const factory_1 = require("../assetTransaction/reserve/factory");
+const factory_1 = require("./factory");
 const onReservationCanceled_1 = require("./potentialActions/onReservationCanceled");
 /**
  * 進行中の予約をキャンセルする

package/lib/chevre/service/reserve/confirmReservation.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.reserveTransaction2action = exports.confirmReservation = void 0;
 const createDebug = require("debug");
 const factory = require("../../factory");
-const factory_1 = require("../assetTransaction/reserve/factory");
+const factory_1 = require("./factory");
 const onReservationConfirmed_1 = require("./potentialActions/onReservationConfirmed");
 const debug = createDebug('chevre-domain:service:reserve:confirmReservation');
 /**

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

@@ -64,4 +64,19 @@ export interface IPotentialInformReservationAction extends factory.task.triggerW
     object: IInformObject;
 }
 export declare const NUM_TRY_INFORM_RESERVATION: number;
+export declare function createMoneyTransferActions(params: {
+    acceptedOffer?: factory.assetTransaction.reserve.IAcceptedOffer4object;
+    reservation: Pick<factory.assetTransaction.reserve.IObjectSubReservation, 'reservedTicket'>;
+    transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
+    underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+}): import("@chevre/factory/lib/action/transfer/moneyTransfer").IAttributes[];
+export interface IPotentialCancelAction extends factory.action.cancel.reservation.IAttributes {
+    purpose: {
+        id: string;
+        typeOf: factory.assetTransactionType.Reserve;
+    };
+}
+export declare function createCancelPendingReservationAction(params: {
+    transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
+}): IPotentialCancelAction | undefined;
 export {};

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NUM_TRY_INFORM_RESERVATION = exports.optimizeUnderName4inform = void 0;
+exports.createCancelPendingReservationAction = exports.createMoneyTransferActions = exports.NUM_TRY_INFORM_RESERVATION = exports.optimizeUnderName4inform = void 0;
+const factory = require("../../factory");
 function optimizeUnderName4inform(params) {
     // ReservationPackage通知アクションのobject.underNameを最小化(2024-03-19~)
     // ? {
@@ -17,3 +18,75 @@ function optimizeUnderName4inform(params) {
 }
 exports.optimizeUnderName4inform = optimizeUnderName4inform;
 exports.NUM_TRY_INFORM_RESERVATION = 10;
+function createMoneyTransferActions(params) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    const pointAward = (_b = (_a = params.acceptedOffer) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.pointAward;
+    const moneyTransfer = [];
+    // ポイント特典があれば適用
+    const pointAwardToLocationIdentifier = (_c = pointAward === null || pointAward === void 0 ? void 0 : pointAward.toLocation) === null || _c === void 0 ? void 0 : _c.identifier;
+    const pointAwardToLocationTypeOf = (_d = pointAward === null || pointAward === void 0 ? void 0 : pointAward.toLocation) === null || _d === void 0 ? void 0 : _d.typeOf;
+    if (typeof ((_e = pointAward === null || pointAward === void 0 ? void 0 : pointAward.amount) === null || _e === void 0 ? void 0 : _e.value) === 'number'
+        && typeof pointAwardToLocationIdentifier === 'string'
+        && typeof pointAwardToLocationTypeOf === 'string') {
+        const fromLocation = {
+            typeOf: (typeof ((_f = params.reservation.reservedTicket.issuedBy) === null || _f === void 0 ? void 0 : _f.typeOf) === 'string')
+                ? params.reservation.reservedTicket.issuedBy.typeOf
+                : params.transaction.typeOf,
+            name: (typeof ((_g = params.reservation.reservedTicket.issuedBy) === null || _g === void 0 ? void 0 : _g.name) === 'string')
+                ? params.reservation.reservedTicket.issuedBy.name
+                : params.transaction.id
+        };
+        const toLocation = {
+            identifier: pointAwardToLocationIdentifier,
+            typeOf: factory.permit.PermitType.Permit,
+            issuedThrough: { id: String((_j = (_h = pointAward.toLocation) === null || _h === void 0 ? void 0 : _h.issuedThrough) === null || _j === void 0 ? void 0 : _j.id) }
+        };
+        const recipient = {
+            typeOf: (typeof ((_k = params.underName) === null || _k === void 0 ? void 0 : _k.typeOf) === 'string')
+                ? (_l = params.underName) === null || _l === void 0 ? void 0 : _l.typeOf
+                : factory.personType.Person,
+            id: (typeof ((_m = params.underName) === null || _m === void 0 ? void 0 : _m.id) === 'string')
+                ? (_o = params.underName) === null || _o === void 0 ? void 0 : _o.id
+                : '',
+            name: String((_p = params.underName) === null || _p === void 0 ? void 0 : _p.name)
+        };
+        moneyTransfer.push(Object.assign(Object.assign({ project: params.transaction.project, typeOf: factory.actionType.MoneyTransfer, agent: params.transaction.project, recipient, object: {
+                typeOf: factory.account.transactionType.Deposit
+            }, purpose: Object.assign({ typeOf: params.transaction.typeOf, id: params.transaction.id }, (typeof ((_q = pointAward.purpose) === null || _q === void 0 ? void 0 : _q.identifier) === 'string') ? { identifier: pointAward.purpose.identifier } : undefined), amount: {
+                typeOf: 'MonetaryAmount',
+                value: (_r = pointAward.amount) === null || _r === void 0 ? void 0 : _r.value,
+                currency: (_s = pointAward.amount) === null || _s === void 0 ? void 0 : _s.currency
+            }, fromLocation: fromLocation, toLocation: toLocation }, (typeof pointAward.description === 'string') ? { description: pointAward.description } : undefined), (pointAward.recipient !== undefined) ? { recipient: pointAward.recipient } : undefined));
+    }
+    return moneyTransfer;
+}
+exports.createMoneyTransferActions = createMoneyTransferActions;
+function createCancelPendingReservationAction(params) {
+    const transaction = params.transaction;
+    const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
+    let cancelActionAttributes;
+    if (pendingReservations.length > 0) {
+        const reservationFor = transaction.object.reservationFor;
+        if (reservationFor === undefined) {
+            throw new factory.errors.NotFound('transaction.object.reservationFor');
+        }
+        // ReservationPackageに対応(2022-12-23~)
+        const reservationPackage = {
+            typeOf: factory.reservationType.ReservationPackage,
+            reservationNumber: transaction.transactionNumber,
+            reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
+            reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
+                ? params.transaction.object.reservationStatus
+                : factory.reservationStatusType.ReservationPending
+        };
+        cancelActionAttributes = {
+            project: transaction.project,
+            typeOf: factory.actionType.CancelAction,
+            purpose: { typeOf: transaction.typeOf, id: transaction.id },
+            agent: transaction.project,
+            object: reservationPackage
+        };
+    }
+    return cancelActionAttributes;
+}
+exports.createCancelPendingReservationAction = createCancelPendingReservationAction;

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.377.0-alpha.3",
-    "@cinerino/sdk": "8.0.0",
+    "@chevre/factory": "4.377.0-alpha.4",
+    "@cinerino/sdk": "8.1.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -103,12 +103,12 @@
     "mocha": "mocha",
     "nyc": "nyc mocha \"src/**/*.spec.ts\"",
     "coverage": "npm run nyc && nyc report --reporter=text-lcov | coveralls",
-    "test": "npm run check && npm run coverage",
+    "test": "npm run check",
     "tslint": "tslint --project tsconfig.json -c tslint.json --exclude \"**/*.spec.ts\" \"src/**/*.ts\"",
     "preversion": "npm run clean && npm run build && npm test && npm run doc",
     "version": "git add -A",
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.37.0-alpha.5"
+  "version": "21.37.0-alpha.7"
 }