@chevre/domain 20.4.0-alpha.3 → 20.4.0-alpha.30

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -17,6 +17,7 @@ const createDebug = require("debug");
 const moment = require("moment-timezone");
 const event_1 = require("../../../repo/event");
 const factory = require("../../../factory");
+const settings_1 = require("../../../settings");
 const debug = createDebug('chevre-domain:service');
 /**
  * イベントデータをID指定で集計する
@@ -28,31 +29,34 @@ function aggregateScreeningEvent(params) {
         // const event = await repos.event.findById<factory.eventType.ScreeningEvent | factory.eventType.Event>(params);
         const event = yield repos.event.findMinimizedIndividualEventById(params);
         let aggregatingEvents = [event];
-        const availableOffers = yield findOffers({ event })(repos);
-        const offerRateLimitExists = availableOffers.some((o) => { var _a; return typeof ((_a = o.validRateLimit) === null || _a === void 0 ? void 0 : _a.scope) === 'string'; });
-        if (offerRateLimitExists) {
-            // 同location、かつ同時間帯、のイベントに関しても集計する(ttts暫定対応)
-            const startFrom = moment(event.startDate)
-                .startOf('hour')
-                .toDate();
-            const startThrough = moment(startFrom)
-                .add(1, 'hour')
-                .add(-1, 'second')
-                .toDate();
-            // 取得属性最適化(2023-01-25~)
-            aggregatingEvents = yield repos.event.search({
-                limit: 100,
-                page: 1,
-                project: { id: { $eq: event.project.id } },
-                typeOf: event.typeOf,
-                eventStatuses: [factory.eventStatusType.EventScheduled],
-                startFrom: startFrom,
-                startThrough: startThrough,
-                location: { branchCode: { $eq: event.location.branchCode } }
-            }, event_1.PROJECTION_MINIMIZED_EVENT);
-            // ID指定されたイベントについてはEventScheduledでなくても集計したいので、集計対象を調整
-            aggregatingEvents = aggregatingEvents.filter((e) => e.id !== event.id);
-            aggregatingEvents = [event, ...aggregatingEvents];
+        // プロジェクト限定(2023-02-22~)
+        if (settings_1.settings.useOfferRateLimitProjects.includes(event.project.id)) {
+            const availableOffers = yield findOffers({ event })(repos);
+            const offerRateLimitExists = availableOffers.some((o) => { var _a; return typeof ((_a = o.validRateLimit) === null || _a === void 0 ? void 0 : _a.scope) === 'string'; });
+            if (offerRateLimitExists) {
+                // 同location、かつ同時間帯、のイベントに関しても集計する(ttts暫定対応)
+                const startFrom = moment(event.startDate)
+                    .startOf('hour')
+                    .toDate();
+                const startThrough = moment(startFrom)
+                    .add(1, 'hour')
+                    .add(-1, 'second')
+                    .toDate();
+                // 取得属性最適化(2023-01-25~)
+                aggregatingEvents = yield repos.event.search({
+                    limit: 100,
+                    page: 1,
+                    project: { id: { $eq: event.project.id } },
+                    typeOf: event.typeOf,
+                    eventStatuses: [factory.eventStatusType.EventScheduled],
+                    startFrom: startFrom,
+                    startThrough: startThrough,
+                    location: { branchCode: { $eq: event.location.branchCode } }
+                }, event_1.PROJECTION_MINIMIZED_EVENT);
+                // ID指定されたイベントについてはEventScheduledでなくても集計したいので、集計対象を調整
+                aggregatingEvents = aggregatingEvents.filter((e) => e.id !== event.id);
+                aggregatingEvents = [event, ...aggregatingEvents];
+            }
         }
         debug(aggregatingEvents.length, 'aggregatingEvents found', aggregatingEvents.map((e) => e.id));
         for (const aggregatingEvent of aggregatingEvents) {
@@ -79,41 +83,29 @@ function aggregateByEvent(params) {
             branchCode: { $eq: event.location.branchCode },
             containedInPlace: { id: { $eq: movieTheaterId } }
         });
-        // 施設取得
-        // const movieTheater = await findLocation(params)(repos);
-        // // 万が一施設が存在しなければ処理終了
-        // if (movieTheater === undefined) {
-        //     return;
-        // }
-        // const screeningRoom = <factory.place.screeningRoom.IPlace | undefined>
-        //     movieTheater.containsPlace.find((p) => p.branchCode === event.location.branchCode);
-        // if (screeningRoom === undefined) {
-        //     // 基本的にありえないはずだが、万が一スクリーンが見つからなければcapacityは0のまま
-        //     // tslint:disable-next-line:no-console
-        //     console.error(new Error(`Screening room not found. branchCode: ${event.location.branchCode}`));
-        //     return;
-        // }
         // 予約集計
         const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = yield aggregateReservationByEvent({
             aggregateDate: now,
             event: event,
             screeningRoom: screeningRoom
         })(repos);
+        // プロジェクト限定(2023-02-22~)
         // オファーごとの集計
-        const aggregateOffer = yield aggregateOfferByEvent({
-            aggregateDate: now,
-            event: Object.assign(Object.assign({}, event), { maximumAttendeeCapacity,
-                remainingAttendeeCapacity }),
-            screeningRoom: screeningRoom
-        })(repos);
-        debug('offers aggregated', aggregateOffer);
+        let aggregateOffer;
+        if (settings_1.settings.useAggregateOfferProjects.includes(event.project.id)) {
+            aggregateOffer = yield aggregateOfferByEvent({
+                aggregateDate: now,
+                event: Object.assign(Object.assign({}, event), { maximumAttendeeCapacity,
+                    remainingAttendeeCapacity }),
+                screeningRoom: screeningRoom
+            })(repos);
+            debug('offers aggregated', aggregateOffer);
+        }
         // 値がundefinedの場合に更新しないように注意
         const update = {
-            $set: Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date(), // $setオブジェクトが空だとMongoエラーになるので
-                // aggregateEntranceGate,
-                aggregateReservation,
-                aggregateOffer }, (maximumAttendeeCapacity !== undefined) ? { maximumAttendeeCapacity: maximumAttendeeCapacity } : undefined), (remainingAttendeeCapacity !== undefined) ? { remainingAttendeeCapacity: remainingAttendeeCapacity } : undefined), (aggregateReservation.checkInCount !== undefined) ? { checkInCount: aggregateReservation.checkInCount } : undefined), (aggregateReservation.attendeeCount !== undefined) ? { attendeeCount: aggregateReservation.attendeeCount } : undefined),
-            $unset: Object.assign(Object.assign({ noExistingAttributeName: 1 }, (maximumAttendeeCapacity === undefined) ? { maximumAttendeeCapacity: '' } : undefined), (remainingAttendeeCapacity === undefined) ? { remainingAttendeeCapacity: '' } : undefined)
+            $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date(), // $setオブジェクトが空だとMongoエラーになるので
+                aggregateReservation }, (typeof (aggregateOffer === null || aggregateOffer === void 0 ? void 0 : aggregateOffer.typeOf) === 'string') ? { aggregateOffer: aggregateOffer } : undefined), (maximumAttendeeCapacity !== undefined) ? { maximumAttendeeCapacity: maximumAttendeeCapacity } : undefined), (remainingAttendeeCapacity !== undefined) ? { remainingAttendeeCapacity: remainingAttendeeCapacity } : undefined), (aggregateReservation.checkInCount !== undefined) ? { checkInCount: aggregateReservation.checkInCount } : undefined), (aggregateReservation.attendeeCount !== undefined) ? { attendeeCount: aggregateReservation.attendeeCount } : undefined),
+            $unset: Object.assign(Object.assign(Object.assign({ noExistingAttributeName: 1 }, (typeof (aggregateOffer === null || aggregateOffer === void 0 ? void 0 : aggregateOffer.typeOf) !== 'string') ? { aggregateOffer: '' } : undefined), (maximumAttendeeCapacity === undefined) ? { maximumAttendeeCapacity: '' } : undefined), (remainingAttendeeCapacity === undefined) ? { remainingAttendeeCapacity: '' } : undefined)
         };
         debug('update:', update);
         // 保管
@@ -125,37 +117,6 @@ function aggregateByEvent(params) {
     });
 }
 exports.aggregateByEvent = aggregateByEvent;
-/**
- * イベントロケーション取得
- * NotFoundエラーをハンドリングする
- */
-// function findLocation(params: {
-//     event: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
-// }) {
-//     return async (repos: {
-//         place: PlaceRepo;
-//     }): Promise<factory.place.movieTheater.IPlace | undefined> => {
-//         let movieTheater: factory.place.movieTheater.IPlace | undefined;
-//         try {
-//             if (params.event.typeOf === factory.eventType.ScreeningEvent) {
-//                 movieTheater = await repos.place.findById({ id: params.event.superEvent.location.id });
-//             } else {
-//                 const movieTheaterId: string =
-//                     String(params.event.offers?.itemOffered.availableChannel.serviceLocation.containedInPlace.id);
-//                 movieTheater = await repos.place.findById({ id: movieTheaterId });
-//             }
-//         } catch (error) {
-//             let throwsError = true;
-//             if (error instanceof factory.errors.NotFound) {
-//                 throwsError = false;
-//             }
-//             if (throwsError) {
-//                 throw error;
-//             }
-//         }
-//         return movieTheater;
-//     };
-// }
 /**
  * 集計後アクション
  */
@@ -208,10 +169,12 @@ function findOffers(params) {
             if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
                 const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-                    availableOffers = yield repos.offer.findOffersByOfferCatalogId({
+                    const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                         offerCatalog: { id: eventService.hasOfferCatalog.id },
+                        excludeAppliesToMovieTicket: false,
                         sort: false // ソート不要(2023-01-27~)
                     });
+                    availableOffers = findOffersByOfferCatalogIdResult.offers;
                 }
             }
             else {

package/lib/chevre/service/aggregation/event/aggregateUseActionsOnEvent.js

@@ -91,10 +91,12 @@ function findOffers(params) {
             if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
                 const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-                    availableOffers = yield repos.offer.findOffersByOfferCatalogId({
+                    const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                         offerCatalog: { id: eventService.hasOfferCatalog.id },
+                        excludeAppliesToMovieTicket: false,
                         sort: false // ソート不要(2023-01-27~)
                     });
+                    availableOffers = findOffersByOfferCatalogIdResult.offers;
                 }
             }
             else {

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

@@ -62,20 +62,29 @@ function start(params) {
             recipient: params.recipient,
             object: Object.assign(Object.assign({ amount,
                 fromLocation,
-                toLocation, pendingTransaction: Object.assign({ typeOf: transactionType, id: '', transactionNumber: transactionNumber }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined) }, (typeof params.object.description === 'string') ? { description: params.object.description } : {}), { force: params.object.force === true }),
+                toLocation, pendingTransaction: Object.assign({ typeOf: transactionType, transactionNumber: transactionNumber }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined) }, (typeof params.object.description === 'string') ? { description: params.object.description } : {}), { force: params.object.force === true }),
             expires: params.expires
         };
         // 取引開始
         let transaction;
         try {
             transaction = yield repos.assetTransaction.start(startParams);
-            const pendingTransaction = yield authorizeAccount({ transaction })(repos);
-            yield repos.assetTransaction.findByIdAndUpdate({
-                id: transaction.id,
-                update: {
-                    'object.pendingTransaction': Object.assign({ typeOf: pendingTransaction.typeOf, id: pendingTransaction.id, transactionNumber: pendingTransaction.transactionNumber }, (typeof pendingTransaction.identifier === 'string') ? { identifier: pendingTransaction.identifier } : undefined)
-                }
-            });
+            // const pendingTransaction = await authorizeAccount({ transaction })(repos);
+            yield authorizeAccount({ transaction })(repos);
+            // 更新不要(2023-02-20~)
+            // await repos.assetTransaction.findByIdAndUpdate<factory.assetTransactionType.MoneyTransfer>({
+            //     id: transaction.id,
+            //     update: {
+            //         'object.pendingTransaction': {
+            //             typeOf: pendingTransaction.typeOf,
+            //             id: pendingTransaction.id,
+            //             transactionNumber: pendingTransaction.transactionNumber,
+            //             ...(typeof pendingTransaction.identifier === 'string')
+            //                 ? { identifier: pendingTransaction.identifier }
+            //                 : undefined
+            //         }
+            //     }
+            // });
         }
         catch (error) {
             // tslint:disable-next-line:no-single-line-block-comment
@@ -113,13 +122,12 @@ function authorizeAccount(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         const transaction = params.transaction;
-        let pendingTransaction;
         const fromLocation = transaction.object.fromLocation;
         const toLocation = transaction.object.toLocation;
         if (typeof ((_a = transaction.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.typeOf) !== 'string') {
             throw new factory.errors.NotFound('transaction.object.pendingTransaction.typeOf');
         }
-        pendingTransaction = yield MoneyTransferService.authorize({
+        yield MoneyTransferService.authorize({
             typeOf: transaction.object.pendingTransaction.typeOf,
             identifier: transaction.object.pendingTransaction.identifier,
             transactionNumber: transaction.object.pendingTransaction.transactionNumber,
@@ -143,7 +151,7 @@ function authorizeAccount(params) {
             recipient: transaction.recipient,
             purpose: { typeOf: transaction.typeOf, id: transaction.id }
         })(repos);
-        return pendingTransaction;
+        // return pendingTransaction;
     });
 }
 function fixMonetaryAmount(params, product) {

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

@@ -220,26 +220,32 @@ function validateSeller(params) {
 }
 function processAuthorizeAccount(params, transaction, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const amount = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.amount;
+        if (typeof amount !== 'number') {
+            throw new factory.errors.ArgumentNull('object.paymentMethod?.amount');
+        }
         yield (0, validation_1.validateAccount)(params)(repos);
-        const authorizeResult = yield PaymentCardPayment.authorize(params, paymentServiceId)(repos);
+        const { pendingTransaction, currency, accountNumber } = yield PaymentCardPayment.authorize(params, paymentServiceId)(repos);
         const totalPaymentDue = {
             typeOf: 'MonetaryAmount',
-            currency: authorizeResult.object.fromLocation.accountType,
-            value: (typeof authorizeResult.object.amount === 'number')
-                ? authorizeResult.object.amount
-                : authorizeResult.object.amount.value
+            currency,
+            value: amount
+            // value: (typeof pendingTransaction.object.amount === 'number')
+            //     ? pendingTransaction.object.amount
+            //     : pendingTransaction.object.amount.value
         };
-        const pendingTransaction = {
-            typeOf: authorizeResult.typeOf,
-            id: authorizeResult.id,
-            transactionNumber: authorizeResult.transactionNumber,
-            object: { fromLocation: { accountNumber: authorizeResult.object.fromLocation.accountNumber } }
+        const savingPendingTransaction = {
+            typeOf: pendingTransaction.typeOf,
+            id: pendingTransaction.id,
+            transactionNumber: pendingTransaction.transactionNumber,
+            object: { fromLocation: { accountNumber } }
         };
         return saveAuthorizeResult({
             id: transaction.id,
             update: {
                 'object.paymentMethod.totalPaymentDue': totalPaymentDue,
-                'object.pendingTransaction': pendingTransaction
+                'object.pendingTransaction': savingPendingTransaction
             }
         })(repos);
     });
@@ -263,11 +269,10 @@ function processAuthorizeCreditCard(params, transaction, paymentServiceId) {
 }
 function processAuthorizeMovieTicket(params, transaction, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const authorizeResult = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId)(repos);
+        const { accountId, checkResult, payAction } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId)(repos);
         return saveAuthorizeResult({
             id: transaction.id,
-            update: Object.assign({ 'object.accountId': (_a = authorizeResult.checkResult) === null || _a === void 0 ? void 0 : _a.movieTickets[0].identifier, 'object.paymentMethod.accountId': (_b = authorizeResult.checkResult) === null || _b === void 0 ? void 0 : _b.movieTickets[0].identifier, 'object.checkResult': authorizeResult.checkResult }, (authorizeResult.payAction !== undefined) ? { 'object.payAction': authorizeResult.payAction } : undefined)
+            update: Object.assign({ 'object.accountId': accountId, 'object.paymentMethod.accountId': accountId, 'object.payAction': payAction }, (checkResult !== undefined) ? { 'object.checkResult': checkResult } : undefined)
         })(repos);
     });
 }

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

@@ -58,13 +58,15 @@ function createServiceOutput(params) {
                 throw new factory.errors.ArgumentNull('object.itemOffered.serviceOutput.accessCode');
             }
             paymentAccount = {
-                project: { typeOf: product.project.typeOf, id: product.project.id },
+                // 廃止(2023-02-20~)
+                // project: { typeOf: product.project.typeOf, id: product.project.id },
                 // ひとまず固定
                 // 口座は複数のプロダクトに結合する可能性もあり、どのように利用されるかは知らない。ただbalanceを管理するだけ。通貨は知っている。
                 typeOf: factory.accountType.Account,
                 // ひとまずPermit識別子と口座番号は同一
-                accountNumber: identifier,
-                accountType: amount.currency
+                accountNumber: identifier
+                // 廃止(2023-02-16~)
+                // accountType: amount.currency
             };
             break;
         case factory.product.ProductType.MembershipService:
@@ -73,7 +75,10 @@ function createServiceOutput(params) {
         default:
             throw new factory.errors.NotImplemented(`Product type ${product.typeOf} not implemented`);
     }
-    const issuedThrough = Object.assign({ project: { typeOf: product.project.typeOf, id: product.project.id }, typeOf: product.typeOf, id: product.id }, (typeof ((_m = product.serviceType) === null || _m === void 0 ? void 0 : _m.typeOf) === 'string') ? { serviceType: product.serviceType } : undefined);
+    const issuedThrough = Object.assign({ 
+        // 廃止(2023-02-20~)
+        // project: { typeOf: product.project.typeOf, id: product.project.id },
+        typeOf: product.typeOf, id: product.id }, (typeof ((_m = product.serviceType) === null || _m === void 0 ? void 0 : _m.typeOf) === 'string') ? { serviceType: product.serviceType } : undefined);
     return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ project: { typeOf: product.project.typeOf, id: product.project.id }, identifier: identifier, issuedThrough, typeOf: serviceOutputType, dateIssued: params.dateIssued }, (typeof accessCode === 'string') ? { accessCode } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof validFor === 'string') ? { validFor } : undefined), (name !== undefined) ? { name } : undefined), (amount !== undefined) ? { amount } : undefined), (depositAmount !== undefined) ? { depositAmount } : undefined), (paymentAmount !== undefined) ? { paymentAmount } : undefined), (paymentAccount !== undefined) ? { paymentAccount } : undefined), (issuedBy !== undefined) ? { issuedBy } : undefined);
 }
 exports.createServiceOutput = createServiceOutput;

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

@@ -117,26 +117,13 @@ function addReservations(params) {
                 event: { id: event.id },
                 // 対応アプリケーション条件追加(2023-01-27~)
                 store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id },
-                sort: false,
+                onlyValid: true,
+                addSortIndex: false,
                 validateOfferRateLimit: true
             })(repos);
             ticketOffers = searchEventTicketOffersResult.ticketOffers;
             availableOffers = searchEventTicketOffersResult.unitPriceOffers;
         }
-        // 冗長なfindOffersByOfferCatalogId処理を削除(2023-01-26~)
-        // let availableOffers: factory.unitPriceOffer.IUnitPriceOffer[] = [];
-        // // 興行設定があれば興行のカタログを参照する(2022-08-31~)
-        // const eventOffers = <factory.event.screeningEvent.IOffer | undefined>event.offers;
-        // if (typeof eventOffers?.itemOffered?.id === 'string') {
-        //     const eventService = <factory.product.IProduct>await repos.product.findById({ id: eventOffers.itemOffered.id });
-        //     if (typeof eventService.hasOfferCatalog?.id === 'string') {
-        //         availableOffers = await repos.offer.findOffersByOfferCatalogId({
-        //             offerCatalog: { id: eventService.hasOfferCatalog.id }
-        //         });
-        //     }
-        // } else {
-        //     throw new factory.errors.NotFound('event.offers.itemOffered.id');
-        // }
         const availableSeatOffers = yield searchAvailableSeatOffers({ acceptedOffers, event: { id: event.id } })(repos);
         // 仮予約作成
         const { acceptedOffers4transactionObject, objectSubReservations } = yield createAcceptedOffers4transactionObject({

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

@@ -33,4 +33,4 @@ export declare function exportTasks<T extends factory.assetTransactionType>(para
     project: ProjectRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
-}) => Promise<(import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/deleteAssetTransaction").ITask | import("@chevre/factory/lib/task/deleteAuthorization").ITask | import("@chevre/factory/lib/task/deleteOrder").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/deleteMember").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask)[] | undefined>;
+}) => Promise<(import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/deleteAssetTransaction").ITask | import("@chevre/factory/lib/task/deleteOrder").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/deleteMember").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask)[] | undefined>;

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

@@ -3,14 +3,6 @@ import { MongoRepository as AuthorizationRepo } from '../repo/code';
 import * as factory from '../factory';
 export declare type IToken = string;
 export declare type ICode = string;
-/**
- * 承認を削除する
- * 冪等性を確保すること
- */
-export declare function deleteAuthorization(params: factory.task.IData<factory.taskName.DeleteAuthorization>): (repos: {
-    action: ActionRepo;
-    authorization: AuthorizationRepo;
-}) => Promise<void>;
 /**
  * コードをトークンに変換する
  */

package/lib/chevre/service/code.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyToken = exports.getToken = exports.deleteAuthorization = void 0;
+exports.verifyToken = exports.getToken = void 0;
 /**
  * 承認サービス
  */
@@ -17,43 +17,6 @@ const jwt = require("jsonwebtoken");
 const code_1 = require("../repo/code");
 const factory = require("../factory");
 const credentials_1 = require("../credentials");
-/**
- * 承認を削除する
- * 冪等性を確保すること
- */
-function deleteAuthorization(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const authorization = params.object;
-        // Deleteアクションを作成(logとしての意味合いも含めて)
-        const actionAttributes = {
-            typeOf: factory.actionType.DeleteAction,
-            project: authorization.project,
-            object: authorization,
-            agent: authorization.project
-        };
-        let deleteAuthorizationResult;
-        const action = yield repos.action.start(actionAttributes);
-        try {
-            // 承認削除
-            deleteAuthorizationResult = yield repos.authorization.deleteByCode({ code: authorization.code });
-        }
-        catch (error) {
-            // actionにエラー結果を追加
-            try {
-                const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
-            }
-            catch (__) {
-                // 失敗したら仕方ない
-            }
-            throw error;
-        }
-        // アクション完了
-        const actionResult = { deleteAuthorizationResult };
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
-    });
-}
-exports.deleteAuthorization = deleteAuthorization;
 /**
  * コードをトークンに変換する
  */

package/lib/chevre/service/delivery.js

@@ -88,7 +88,10 @@ function createGivePointAwardStartParams4moneyTransfer(params, transactionNumber
                 : params.purpose.typeOf,
             fromLocation: agent,
             toLocation,
-            pendingTransaction: { typeOf: factory.account.transactionType.Deposit, id: '', transactionNumber }
+            pendingTransaction: {
+                typeOf: factory.account.transactionType.Deposit,
+                transactionNumber
+            }
         } }, (typeof params.object.identifier === 'string') ? { identifier: params.object.identifier } : undefined);
 }
 /**
@@ -181,7 +184,10 @@ function processReturnPointAwardByTransactionIdentifier(params) {
                     fromLocation,
                     toLocation: depositTransaction.object.fromLocation,
                     description: `[Return Award]${depositTransaction.object.description}`,
-                    pendingTransaction: { typeOf: factory.account.transactionType.Withdraw, id: '', transactionNumber },
+                    pendingTransaction: {
+                        typeOf: factory.account.transactionType.Withdraw,
+                        transactionNumber
+                    },
                     force: true
                 }
             })(repos);
@@ -260,7 +266,10 @@ function processReturnPointAwardByTransactionFromLocationIdentifier(params) {
                         // },
                         toLocation,
                         description: `[Return Award]${returningTransaction.object.description}`,
-                        pendingTransaction: { typeOf: factory.account.transactionType.Transfer, id: '', transactionNumber },
+                        pendingTransaction: {
+                            typeOf: factory.account.transactionType.Transfer,
+                            transactionNumber
+                        },
                         force: true
                     }
                 })(repos);

package/lib/chevre/service/event.js

@@ -456,10 +456,7 @@ function createScreeningEventFromCOA(params) {
         identifier: id,
         name: params.superEvent.name,
         eventStatus: factory.eventStatusType.EventScheduled,
-        workPerformed: params.superEvent.workPerformed,
         location: {
-            // 不要なので廃止(2022-12-19~)
-            // project: { typeOf: params.project.typeOf, id: params.project.id },
             typeOf: params.screenRoom.typeOf,
             branchCode: params.screenRoom.branchCode,
             name: params.screenRoom.name

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

@@ -52,7 +52,7 @@ export declare function authorize(params: {
         typeOf: factory.assetTransactionType;
         id: string;
     };
-}): IAuthorizeOperation<factory.action.transfer.moneyTransfer.IPendingTransaction>;
+}): IAuthorizeOperation<void>;
 /**
  * 口座承認取消
  */

package/lib/chevre/service/moneyTransfer.js

@@ -28,9 +28,9 @@ function authorize(params) {
             id: params.purpose.id
         });
         // 口座取引開始
-        let pendingTransaction;
+        // let pendingTransaction: factory.action.transfer.moneyTransfer.IPendingTransaction;
         try {
-            pendingTransaction = yield processAccountTransaction({
+            yield processAccountTransaction({
                 typeOf: params.typeOf,
                 identifier: params.identifier,
                 transactionNumber: params.transactionNumber,
@@ -46,13 +46,12 @@ function authorize(params) {
             error = (0, errorHandler_1.handlePecorinoError)(error);
             throw error;
         }
-        return pendingTransaction;
+        // return pendingTransaction;
     });
 }
 exports.authorize = authorize;
 function processAccountTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let pendingTransaction;
         const transaction = params.transaction;
         const agent = createAccountTransactionAgent(params);
         const recipient = createAccountTransactionRecipient(params);
@@ -75,7 +74,7 @@ function processAccountTransaction(params) {
         });
         switch (params.typeOf) {
             case factory.account.transactionType.Deposit:
-                pendingTransaction = yield processDepositTransaction({
+                yield processDepositTransaction({
                     identifier: params.identifier,
                     transactionNumber: params.transactionNumber,
                     project: params.project,
@@ -88,7 +87,7 @@ function processAccountTransaction(params) {
                 })({ permit: permitService });
                 break;
             case factory.account.transactionType.Transfer:
-                pendingTransaction = yield processTransferTransaction({
+                yield processTransferTransaction({
                     identifier: params.identifier,
                     transactionNumber: params.transactionNumber,
                     project: params.project,
@@ -101,7 +100,7 @@ function processAccountTransaction(params) {
                 })({ permit: permitService });
                 break;
             case factory.account.transactionType.Withdraw:
-                pendingTransaction = yield processWithdrawTransaction({
+                yield processWithdrawTransaction({
                     identifier: params.identifier,
                     transactionNumber: params.transactionNumber,
                     project: params.project,
@@ -116,7 +115,7 @@ function processAccountTransaction(params) {
             default:
                 throw new factory.errors.Argument('Object', 'At least one of accounts from and to must be specified');
         }
-        return pendingTransaction;
+        // return pendingTransaction;
     });
 }
 function processDepositTransaction(params) {

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

@@ -223,9 +223,9 @@ function validateAcceptedOffers(params) {
             // 受け入れたオファーIDだけ取得する(2023-01-26~)
             ids: offerIds,
             event: { id: params.event.id },
-            // seller: params.seller,
             store: params.store,
-            sort: false,
+            onlyValid: true,
+            addSortIndex: false,
             validateOfferRateLimit: true
         })(repos);
         // 利用可能なチケットオファーであれば受け入れる
@@ -313,9 +313,8 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
             addOn: (Array.isArray(offerWithoutDetail.addOn))
                 ? offerWithoutDetail.addOn.map((a) => {
                     return {
-                        // project: offer.project,
                         typeOf: factory.offerType.Offer,
-                        id: a.id,
+                        id: String(a.id),
                         priceCurrency: offer.priceCurrency
                     };
                 })

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

@@ -294,7 +294,7 @@ function coaTicket2offer(params) {
     const eligibleMembershipType = (params.ticketResult.flgMember === COA.factory.master.FlgMember.Member
         && typeof ((_b = params.defaultMembershipType) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
         ? [{
-                project: params.defaultMembershipType.project,
+                // project: params.defaultMembershipType.project,
                 typeOf: params.defaultMembershipType.typeOf,
                 id: params.defaultMembershipType.id,
                 codeValue: params.defaultMembershipType.codeValue,