@chevre/domain 20.4.0-alpha.15 → 20.4.0-alpha.17

package/example/src/chevre/deleteMovieTicketCategoryChargePriceSpecs.ts

@@ -11,7 +11,7 @@ async function main() {
     const priceSpecificationRepo = new chevre.repository.PriceSpecification(mongoose.connection);
 
     const result = await priceSpecificationRepo.deleteUnnecessaryMovieTicketTypeChargePriceSpecs({
-        project: { id: 'cinerino' }
+        // project: { id: 'cinerino' }
     });
     console.log('deleted', result);
 }

package/example/src/chevre/searchEventTicketOffers.ts

@@ -22,7 +22,7 @@ async function main() {
     const productRepo = new chevre.repository.Product(mongoose.connection);
 
     const { ticketOffers } = await chevre.service.offer.event.searchEventTicketOffers({
-        event: { id: 'ale5c99n2' },
+        event: { id: 'ale6qiedi' },
         onlyValid: true,
         sort: false,
         validateOfferRateLimit: true,

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -7,7 +7,8 @@ async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
     // const accountRepo = new chevre.repository.Account(mongoose.connection);
-    const permitRepo = new chevre.repository.ServiceOutput(mongoose.connection);
+    // const permitRepo = new chevre.repository.ServiceOutput(mongoose.connection);
+    const eventRepo = new chevre.repository.Event(mongoose.connection);
 
     let updateResult: any;
     // updateResult = await accountRepo.unsetUnnecessaryFields({
@@ -15,16 +16,21 @@ async function main() {
     //     $unset: { status: 1 }
     // });
     // console.log('accounts unset.', updateResult);
-    updateResult = await permitRepo.unsetUnnecessaryFields({
-        filter: { 'paymentAccount.project': { $exists: true } },
-        $unset: { 'paymentAccount.project': 1 }
-    });
-    console.log('permits unset', updateResult);
-    updateResult = await permitRepo.unsetUnnecessaryFields({
-        filter: { 'issuedThrough.project': { $exists: true } },
-        $unset: { 'issuedThrough.project': 1 }
+    // updateResult = await permitRepo.unsetUnnecessaryFields({
+    //     filter: { 'paymentAccount.project': { $exists: true } },
+    //     $unset: { 'paymentAccount.project': 1 }
+    // });
+    // console.log('permits unset', updateResult);
+    // updateResult = await permitRepo.unsetUnnecessaryFields({
+    //     filter: { 'issuedThrough.project': { $exists: true } },
+    //     $unset: { 'issuedThrough.project': 1 }
+    // });
+    // console.log('permits unset', updateResult);
+    updateResult = await eventRepo.unsetUnnecessaryFields({
+        filter: { hasOfferCatalog: { $exists: true } },
+        $unset: { hasOfferCatalog: 1 }
     });
-    console.log('permits unset', updateResult);
+    console.log('events unset', updateResult);
 }
 
 main()

package/lib/chevre/repo/event.d.ts

@@ -141,9 +141,10 @@ export declare class MongoRepository {
     }, update: IUpdateAggregateReservationParams | IUpdateAggregateUseActionsParams): Promise<factory.event.IEvent<T>>;
     bulkWrite(bulkWriteOps: any[]): Promise<BulkWriteOpResultObject>;
     getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
-    deleteUnnecessaryProjectAttributesById(params: {
-        id: string;
-    }): Promise<void>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
     aggregateEvent(params: {
         project?: {
             id?: {

package/lib/chevre/repo/event.js

@@ -751,18 +751,9 @@ class MongoRepository {
             .sort({ startDate: factory.sortType.Descending })
             .cursor();
     }
-    deleteUnnecessaryProjectAttributesById(params) {
+    unsetUnnecessaryFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.eventModel.updateOne({
-                _id: { $eq: params.id }
-            }, {
-                $unset: {
-                    'location.project': 1,
-                    'workPerformed.project': 1,
-                    'superEvent.location.project': 1,
-                    'superEvent.workPerformed.project': 1
-                }
-            })
+            return this.eventModel.updateMany(params.filter, { $unset: params.$unset })
                 .exec();
         });
     }

package/lib/chevre/repo/mongoose/model/offer.js

@@ -196,6 +196,18 @@ schema.index({ additionalProperty: 1, 'priceSpecification.price': 1 }, {
         additionalProperty: { $exists: true }
     }
 });
+schema.index({ validFrom: 1, 'priceSpecification.price': 1 }, {
+    name: 'searchByValidFrom',
+    partialFilterExpression: {
+        validFrom: { $exists: true }
+    }
+});
+schema.index({ validThrough: 1, 'priceSpecification.price': 1 }, {
+    name: 'searchByValidThrough',
+    partialFilterExpression: {
+        validThrough: { $exists: true }
+    }
+});
 mongoose.model(modelName, schema)
     .on('index', 
 // tslint:disable-next-line:no-single-line-block-comment

package/lib/chevre/repo/offer.d.ts

@@ -25,6 +25,7 @@ export declare class MongoRepository {
         };
         unacceptedPaymentMethod?: string[];
         excludeAppliesToMovieTicket: boolean;
+        onlyValid?: boolean;
         limit?: number;
         page?: number;
         sort: boolean;

package/lib/chevre/repo/offer.js

@@ -310,6 +310,20 @@ class MongoRepository {
                 }
             });
         }
+        if (params.onlyValid === true) {
+            const now = new Date();
+            andConditions.push({
+                $or: [
+                    { validFrom: { $exists: false } },
+                    { validFrom: { $exists: true, $lte: now } }
+                ]
+            }, {
+                $or: [
+                    { validThrough: { $exists: false } },
+                    { validThrough: { $exists: true, $gte: now } }
+                ]
+            });
+        }
         return andConditions;
     }
     /**
@@ -356,7 +370,7 @@ class MongoRepository {
                                 serviceType: { $exists: false }
                             }
                             : undefined)
-                    } }), (typeof params.limit === 'number' && typeof params.page === 'number')
+                    }, onlyValid: params.onlyValid === true }), (typeof params.limit === 'number' && typeof params.page === 'number')
                     ? { sort: { _id: factory.sortType.Ascending } }
                     : undefined), (typeof params.limit === 'number') ? { limit: params.limit } : undefined), (typeof params.page === 'number') ? { page: params.page } : undefined);
                 offers = yield this.search(searchOffersConditions);

package/lib/chevre/repo/priceSpecification.d.ts

@@ -31,8 +31,8 @@ export declare class MongoRepository {
         };
     }): Promise<void>;
     deleteUnnecessaryMovieTicketTypeChargePriceSpecs(params: {
-        project: {
-            id: string;
+        project?: {
+            id?: string;
         };
     }): Promise<{
         ok?: number | undefined;

package/lib/chevre/repo/priceSpecification.js

@@ -278,12 +278,11 @@ class MongoRepository {
         });
     }
     deleteUnnecessaryMovieTicketTypeChargePriceSpecs(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            return this.priceSpecificationModel.deleteMany({
-                'project.id': { $eq: params.project.id },
-                typeOf: { $eq: factory.priceSpecificationType.MovieTicketTypeChargeSpecification },
-                price: { $eq: 0 }
-            })
+            return this.priceSpecificationModel.deleteMany(Object.assign({ typeOf: { $eq: factory.priceSpecificationType.MovieTicketTypeChargeSpecification }, price: { $eq: 0 } }, (typeof ((_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                ? { 'project.id': { $eq: params.project.id } }
+                : undefined))
                 .exec();
         });
     }

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

@@ -269,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/reserve.js

@@ -117,6 +117,7 @@ function addReservations(params) {
                 event: { id: event.id },
                 // 対応アプリケーション条件追加(2023-01-27~)
                 store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id },
+                onlyValid: true,
                 sort: false,
                 addSortIndex: false,
                 validateOfferRateLimit: true

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

@@ -224,6 +224,7 @@ function validateAcceptedOffers(params) {
             ids: offerIds,
             event: { id: params.event.id },
             store: params.store,
+            onlyValid: true,
             sort: false,
             addSortIndex: false,
             validateOfferRateLimit: true

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

@@ -39,7 +39,7 @@ declare function searchEventTicketOffers(params: {
     /**
      * 有効期間内のみかどうか
      */
-    onlyValid?: boolean;
+    onlyValid: boolean;
     /**
      * どの決済方法に対して
      */

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

@@ -35,7 +35,7 @@ function searchTransportationEventTicketOffers(params) {
             const transportation = yield repos.product.findById({ id: eventOffers.itemOffered.id });
             if (typeof ((_b = transportation.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                 const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId(Object.assign({ ids: params.ids, offerCatalog: { id: transportation.hasOfferCatalog.id }, availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id }, unacceptedPaymentMethod,
-                    excludeAppliesToMovieTicket, sort: params.sort }, (!params.sort)
+                    excludeAppliesToMovieTicket, onlyValid: params.onlyValid === true, sort: params.sort }, (!params.sort)
                     ? {
                         limit: params.limit,
                         page: params.page
@@ -81,14 +81,6 @@ function searchTransportationEventTicketOffers(params) {
                 return true;
             }
         });
-        // paging処理を追加(2023-02-21~)
-        if (params.sort) {
-            if (typeof params.limit === 'number' && typeof params.page === 'number') {
-                const start = params.limit * (params.page - 1);
-                const end = params.limit * params.page;
-                availableOffers = availableOffers.slice(start, end);
-            }
-        }
         let offers4event = availableOffers.map((availableOffer) => {
             let sortIndex;
             if (params.addSortIndex) {
@@ -157,7 +149,7 @@ function searchScreeningEventTicketOffers(params) {
             const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
             if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                 const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId(Object.assign({ ids: params.ids, offerCatalog: { id: eventService.hasOfferCatalog.id }, availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id }, unacceptedPaymentMethod,
-                    excludeAppliesToMovieTicket, sort: params.sort }, (!params.sort)
+                    excludeAppliesToMovieTicket, onlyValid: params.onlyValid === true, sort: params.sort }, (!params.sort)
                     ? {
                         limit: params.limit,
                         page: params.page
@@ -222,14 +214,6 @@ function searchScreeningEventTicketOffers(params) {
                 }
             });
         }
-        // paging処理を追加(2023-02-21~)
-        if (params.sort) {
-            if (typeof params.limit === 'number' && typeof params.page === 'number') {
-                const start = params.limit * (params.page - 1);
-                const end = params.limit * params.page;
-                availableOffers = availableOffers.slice(start, end);
-            }
-        }
         let offers4event = availableOffers.map((availableOffer) => {
             let sortIndex;
             if (params.addSortIndex) {
@@ -420,7 +404,8 @@ function searchEventTicketOffers(params) {
                         page: params.page,
                         sort: params.sort,
                         addSortIndex: params.addSortIndex,
-                        validateOfferRateLimit: params.validateOfferRateLimit
+                        validateOfferRateLimit: params.validateOfferRateLimit,
+                        onlyValid: params.onlyValid === true
                     })(repos);
                     offers = searchOffersResult.ticketOffers;
                     unitPriceOffers = searchOffersResult.unitPriceOffers;
@@ -434,7 +419,8 @@ function searchEventTicketOffers(params) {
                         page: params.page,
                         sort: params.sort,
                         addSortIndex: params.addSortIndex,
-                        validateOfferRateLimit: params.validateOfferRateLimit
+                        validateOfferRateLimit: params.validateOfferRateLimit,
+                        onlyValid: params.onlyValid === true
                     })(repos);
                     offers = searchOffersResult.ticketOffers;
                     unitPriceOffers = searchOffersResult.unitPriceOffers;
@@ -451,21 +437,22 @@ function searchEventTicketOffers(params) {
                 //             && o.availableAtOrFrom.some((availableApplication) => availableApplication.id === specifiedStoreId);
                 //     });
                 // }
+                // mongo条件へ移行(2023-02-24~)
                 // 有効期間を適用
-                if (params.onlyValid === true) {
-                    offers = offers.filter((o) => {
-                        let isvalid = true;
-                        if (o.validFrom !== undefined && moment(o.validFrom)
-                            .isAfter(now)) {
-                            isvalid = false;
-                        }
-                        if (o.validThrough !== undefined && moment(o.validThrough)
-                            .isBefore(now)) {
-                            isvalid = false;
-                        }
-                        return isvalid;
-                    });
-                }
+                // if (params.onlyValid === true) {
+                //     offers = offers.filter((o) => {
+                //         let isvalid = true;
+                //         if (o.validFrom !== undefined && moment(o.validFrom)
+                //             .isAfter(now)) {
+                //             isvalid = false;
+                //         }
+                //         if (o.validThrough !== undefined && moment(o.validThrough)
+                //             .isBefore(now)) {
+                //             isvalid = false;
+                //         }
+                //         return isvalid;
+                //     });
+                // }
                 for (const offer of offers) {
                     if (Array.isArray(offer.addOn)) {
                         // store.idでのフィルターをmongoに移行(2023-01-27~)

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

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompoundPriceSpec4event = void 0;
 const factory = require("../../factory");
@@ -102,8 +91,16 @@ function createCompoundPriceSpec4event(params) {
         valueAddedTaxIncluded: true,
         priceComponent
     };
-    // 不要な属性を除外(2022-11-07~)
-    const _b = params.offer, { project } = _b, unitOfferFields4ticketOffer = __rest(_b, ["project"]);
-    return Object.assign(Object.assign(Object.assign({}, unitOfferFields4ticketOffer), { eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification }), (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined);
+    // 必要な属性のみに限定(2023-02-24~)
+    // const { project, ...unitOfferFields4ticketOffer } = params.offer;
+    const { name, description, alternateName, color, typeOf, id, addOn, availability, availableAtOrFrom, category, eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation, priceCurrency, validFrom, validThrough, validRateLimit, additionalProperty, identifier, itemOffered } = params.offer;
+    return Object.assign({ 
+        // ...unitOfferFields4ticketOffer,
+        name, description, alternateName, color, typeOf, id,
+        addOn, availability, availableAtOrFrom, category,
+        eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation,
+        priceCurrency,
+        validFrom, validThrough, validRateLimit, additionalProperty,
+        identifier, itemOffered, eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification }, (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined);
 }
 exports.createCompoundPriceSpec4event = createCompoundPriceSpec4event;

package/lib/chevre/service/payment/any/factory.js

@@ -13,8 +13,9 @@ function creatPayTransactionStartParams(params) {
     const accountId = (typeof params.accountId === 'string')
         ? params.accountId
         : (typeof params.object.accountId === 'string') ? params.object.accountId : undefined;
+    // movieTickets最適化(2023-02-24~)
+    const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(createMovieTicket) : undefined;
     return Object.assign(Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
-            // Sellerに変更(2022-05-30~)
             typeOf: params.transaction.seller.typeOf,
             id: String(params.transaction.seller.id),
             name: (typeof params.transaction.seller.name === 'string')
@@ -38,7 +39,7 @@ function creatPayTransactionStartParams(params) {
             typeOf: params.paymentServiceType,
             // 決済サービスIDを連携(2022-04-12~)
             id: issuedThroughId,
-            paymentMethod: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: params.object.paymentMethod, amount: params.object.amount, additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [] }, (typeof params.object.method === 'string') ? { method: params.object.method } : undefined), (typeof params.object.name === 'string') ? { name: params.object.name } : undefined), (typeof accountId === 'string') ? { accountId } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined), (typeof params.object.fromLocation === 'string') ? { fromLocation: params.object.fromLocation } : undefined), (params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined), (Array.isArray(params.object.movieTickets)) ? { movieTickets: params.object.movieTickets } : undefined)
+            paymentMethod: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: params.object.paymentMethod, amount: params.object.amount, additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [] }, (typeof params.object.method === 'string') ? { method: params.object.method } : undefined), (typeof params.object.name === 'string') ? { name: params.object.name } : undefined), (typeof accountId === 'string') ? { accountId } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined), (typeof params.object.fromLocation === 'string') ? { fromLocation: params.object.fromLocation } : undefined), (params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined)
         }, expires: expires }, (typeof confirmationNumber === 'string')
         ? {
             purpose: {
@@ -51,6 +52,31 @@ function creatPayTransactionStartParams(params) {
         : undefined);
 }
 exports.creatPayTransactionStartParams = creatPayTransactionStartParams;
+function createMovieTicket(params) {
+    const serviceOutput = {
+        reservationFor: {
+            typeOf: params.serviceOutput.reservationFor.typeOf,
+            id: params.serviceOutput.reservationFor.id
+        },
+        reservedTicket: {
+            ticketedSeat: {
+                typeOf: factory.placeType.Seat,
+                seatNumber: params.serviceOutput.reservedTicket.ticketedSeat.seatNumber,
+                seatRow: params.serviceOutput.reservedTicket.ticketedSeat.seatRow,
+                seatSection: params.serviceOutput.reservedTicket.ticketedSeat.seatSection
+            }
+        }
+    };
+    return {
+        project: { id: params.project.id, typeOf: factory.organizationType.Project },
+        typeOf: params.typeOf,
+        identifier: params.identifier,
+        accessCode: params.accessCode,
+        category: { codeValue: params.category.codeValue },
+        serviceType: params.serviceType,
+        serviceOutput
+    };
+}
 function createAuthorizeResult(params) {
     var _a, _b, _c, _d;
     const payTransactionObject = params.payTransaction.object;

package/lib/chevre/service/payment/movieTicket.d.ts

@@ -57,9 +57,14 @@ declare function checkByIdentifier(params: {
     project: ProjectRepo;
 }) => Promise<ICheckResult>;
 interface IAuthorizeResult {
-    checkResult: ICheckResult;
-    payAction?: factory.action.IAction<factory.action.IAttributes<factory.actionType.PayAction, any, any>>;
+    accountId: string;
+    checkResult?: ICheckResult;
+    payAction: factory.action.trade.pay.IAction;
 }
+/**
+ * MovieTicket承認
+ * オーソリサービスが存在するわけではないので、実質着券する
+ */
 declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, transaction: factory.assetTransaction.pay.ITransaction, paymentServiceId: string): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;

package/lib/chevre/service/payment/movieTicket.js

@@ -17,6 +17,7 @@ const surfrock = require("@surfrock/sdk");
 const moment = require("moment-timezone");
 const credentials_1 = require("../../credentials");
 const factory = require("../../factory");
+const settings_1 = require("../../settings");
 const factory_1 = require("./movieTicket/factory");
 const validation_1 = require("../assetTransaction/pay/movieTicket/validation");
 const errorHandler_1 = require("../../errorHandler");
@@ -258,14 +259,22 @@ function purchaseNumberAuthResult2movieTickets(params) {
     }
     return movieTickets;
 }
+/**
+ * MovieTicket承認
+ * オーソリサービスが存在するわけではないので、実質着券する
+ */
 function authorize(params, transaction, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
+        let accountId;
         let checkResult;
         let payAction;
         try {
-            // MovieTicket決済の場合、認証
-            checkResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId)(repos);
+            // オプション追加(2023-02-24~)
+            if (settings_1.settings.useCheckMovieTicketBeforePay) {
+                // MovieTicket決済の場合、認証
+                checkResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId)(repos);
+            }
             const paymentMethod = transaction.object.paymentMethod;
             const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf);
             const additionalProperty = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.additionalProperty;
@@ -273,7 +282,10 @@ function authorize(params, transaction, paymentServiceId) {
                 ? paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.paymentMethodId
                 : transaction.id;
             const paymentMethodName = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.name) === 'string') ? paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.name : paymentMethodType;
-            const accountId = (Array.isArray(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets)) ? (_a = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets[0]) === null || _a === void 0 ? void 0 : _a.identifier : undefined;
+            accountId = (Array.isArray(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets)) ? (_a = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets[0]) === null || _a === void 0 ? void 0 : _a.identifier : undefined;
+            if (typeof accountId !== 'string' || accountId.length === 0) {
+                throw new factory.errors.ArgumentNull('object.paymentMethod.movieTickets.identifier');
+            }
             const payObject = {
                 typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
                 id: paymentServiceId,
@@ -284,10 +296,7 @@ function authorize(params, transaction, paymentServiceId) {
                     }, typeOf: paymentMethodType }, (typeof accountId === 'string') ? { accountId } : undefined),
                 movieTickets: paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets
             };
-            const payActionAttributes = Object.assign({ project: transaction.project, typeOf: factory.actionType.PayAction, object: [payObject], 
-                // agent:Projectに変更(2022-05-19~)
-                // agent: transaction.agent,
-                agent: transaction.project, recipient: transaction.recipient }, (params.purpose !== undefined)
+            const payActionAttributes = Object.assign({ project: transaction.project, typeOf: factory.actionType.PayAction, object: [payObject], agent: transaction.project, recipient: transaction.recipient }, (params.purpose !== undefined)
                 ? { purpose: params.purpose }
                 : { purpose: { typeOf: transaction.typeOf, transactionNumber: transaction.transactionNumber, id: transaction.id } });
             // 着券させざるをえないが、informPaymentはしない(注文がまだ存在しないため)
@@ -296,7 +305,7 @@ function authorize(params, transaction, paymentServiceId) {
         catch (error) {
             throw (0, errorHandler_1.handleMvtkReserveError)(error);
         }
-        return Object.assign({ checkResult }, (payAction !== undefined) ? { payAction } : undefined);
+        return { accountId, checkResult, payAction };
     });
 }
 exports.authorize = authorize;

package/lib/chevre/settings.d.ts

@@ -26,6 +26,7 @@ export declare type ISettings = factory.project.ISettings & {
     useAggregateEntranceGateProjects: string[];
     useAggregateOfferProjects: string[];
     useOfferRateLimitProjects: string[];
+    useCheckMovieTicketBeforePay: boolean;
 };
 export declare const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;

package/lib/chevre/settings.js

@@ -100,4 +100,4 @@ exports.settings = Object.assign(Object.assign({ transactionWebhookUrls, onOrder
         ? process.env.USE_AGGREGATE_OFFER_PROJECTS.split(',')
         : [], useOfferRateLimitProjects: (typeof process.env.USE_OFFER_RATE_LIMIT_PROJECTS === 'string')
         ? process.env.USE_OFFER_RATE_LIMIT_PROJECTS.split(',')
-        : [] });
+        : [], useCheckMovieTicketBeforePay: process.env.USE_CHECK_MOVIE_TICKET_BEFORE_PAY === '1' });

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.289.0-alpha.11",
-    "@cinerino/sdk": "3.140.0-alpha.11",
+    "@chevre/factory": "4.289.0-alpha.14",
+    "@cinerino/sdk": "3.140.0-alpha.15",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.4.0-alpha.15"
+  "version": "20.4.0-alpha.17"
 }