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

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");
@@ -21,6 +10,7 @@ function mvtkChargePriceSpec2component(params) {
     var _a;
     return Object.assign({ id: params.id, typeOf: params.typeOf, name: params.name, price: params.price, priceCurrency: params.priceCurrency, valueAddedTaxIncluded: params.valueAddedTaxIncluded, appliesToVideoFormat: params.appliesToVideoFormat, appliesToMovieTicket: params.appliesToMovieTicket }, (typeof ((_a = params.accounting) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { accounting: params.accounting } : undefined);
 }
+// tslint:disable-next-line:max-func-body-length
 function createCompoundPriceSpec4event(params) {
     var _a;
     // priceSpecificationはマスタ管理の仕様上必ず存在するはず
@@ -39,20 +29,38 @@ function createCompoundPriceSpec4event(params) {
     const mvtkPriceComponents = [];
     // 複数決済カード対応(2022-07-11~)
     if (Array.isArray(unitPriceSpec.appliesToMovieTicket)) {
+        // 決済カード加算料金自動補完(2023-02-21~)
         unitPriceSpec.appliesToMovieTicket.forEach((appliesToMovieTicket) => {
-            // すべての上映方式に該当する加算料金を追加(2022-10-29~)
-            const mvtkSpecs4appliesToMovieTicket = params.movieTicketTypeChargeSpecs.filter((s) => {
-                var _a;
-                return ((_a = s.appliesToMovieTicket.serviceOutput) === null || _a === void 0 ? void 0 : _a.typeOf) === appliesToMovieTicket.serviceOutput.typeOf
-                    && s.appliesToMovieTicket.serviceType === appliesToMovieTicket.serviceType
-                    && params.videoFormatTypes.includes(s.appliesToVideoFormat);
+            // すべての上映方式に該当する加算料金を追加
+            params.videoFormatTypes.forEach((videoFormatType) => {
+                let existingMvtkSpec4appliesToMovieTicket = params.movieTicketTypeChargeSpecs.find((s) => {
+                    var _a;
+                    return ((_a = s.appliesToMovieTicket.serviceOutput) === null || _a === void 0 ? void 0 : _a.typeOf) === appliesToMovieTicket.serviceOutput.typeOf
+                        && s.appliesToMovieTicket.serviceType === appliesToMovieTicket.serviceType
+                        && s.appliesToVideoFormat === videoFormatType;
+                });
+                // 加算料金が存在しなければprice: 0で自動補完
+                if (existingMvtkSpec4appliesToMovieTicket === undefined) {
+                    existingMvtkSpec4appliesToMovieTicket = {
+                        typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification,
+                        price: 0,
+                        priceCurrency: factory.priceCurrency.JPY,
+                        appliesToVideoFormat: videoFormatType,
+                        valueAddedTaxIncluded: true,
+                        project: params.offer.project,
+                        id: '',
+                        name: params.offer.name,
+                        appliesToMovieTicket: {
+                            typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
+                            serviceType: appliesToMovieTicket.serviceType,
+                            serviceOutput: { typeOf: appliesToMovieTicket.serviceOutput.typeOf }
+                        }
+                    };
+                }
+                mvtkPriceComponents.push(mvtkChargePriceSpec2component(existingMvtkSpec4appliesToMovieTicket));
             });
-            mvtkPriceComponents.push(...mvtkSpecs4appliesToMovieTicket.map(mvtkChargePriceSpec2component));
         });
     }
-    else {
-        // Arrayでないケースは廃止(2022-09-12~)
-    }
     // 区分加算料金は決済カード適用でも価格要素に含まれるはず(2022-11-02~)
     const priceComponent = [
         unitPriceSpec,
@@ -68,8 +76,18 @@ function createCompoundPriceSpec4event(params) {
         valueAddedTaxIncluded: true,
         priceComponent
     };
-    // 不要な属性を除外(2022-11-07~)
-    const _b = params.offer, { project } = _b, unitOfferFields4ticketOffer = __rest(_b, ["project"]);
-    return Object.assign(Object.assign({}, unitOfferFields4ticketOffer), { eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification });
+    // 必要な属性のみに限定(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(Object.assign({ name, description, alternateName, color, typeOf, id,
+        // addOn,
+        // availability,
+        availableAtOrFrom, category,
+        eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation,
+        priceCurrency,
+        validFrom, validThrough, validRateLimit, additionalProperty,
+        identifier, itemOffered, addOn: params.addOn, eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification }, (typeof params.availability === 'string') ? { availability: params.availability } : { availability }), (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined);
 }
 exports.createCompoundPriceSpec4event = createCompoundPriceSpec4event;

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

@@ -158,7 +158,6 @@ function processStartDepositTransaction(params) {
                     description: description,
                     pendingTransaction: {
                         typeOf: factory.account.transactionType.Deposit,
-                        id: '',
                         transactionNumber: params.transactionNumber
                     }
                 },

package/lib/chevre/service/offer/moneyTransfer/returnMoneyTransfer.js

@@ -57,7 +57,6 @@ function returnMoneyTransfer(params) {
                         toLocation: depositTransaction.object.fromLocation,
                         pendingTransaction: {
                             typeOf: factory.account.transactionType.Withdraw,
-                            id: '',
                             transactionNumber: publishTransactionNumber4returnMoneyTransferResult.transactionNumber
                         }
                     }

package/lib/chevre/service/offer/product/searchProductOffers.d.ts

@@ -5,10 +5,18 @@ import { MongoRepository as ProductRepo } from '../../../repo/product';
  * プロダクトオファーを検索する
  */
 export declare function searchProductOffers(params: {
+    /**
+     * 指定したIDのオファーだけ取得する場合
+     */
+    ids?: string[];
     itemOffered: {
         id: string;
     };
-    sort: boolean;
+    availableAt?: {
+        id: string;
+    };
+    onlyValid: boolean;
+    addSortIndex: boolean;
 }): (repos: {
     offer: OfferRepo;
     product: ProductRepo;

package/lib/chevre/service/offer/product/searchProductOffers.js

@@ -23,12 +23,21 @@ function searchProductOffers(params) {
         if (typeof offerCatalogId !== 'string') {
             return [];
         }
-        const offers = yield repos.offer.findOffersByOfferCatalogId({ offerCatalog: { id: offerCatalogId }, sort: params.sort });
+        const { offers, sortedOfferIds } = yield repos.offer.findOffersByOfferCatalogId({
+            ids: params.ids,
+            offerCatalog: { id: offerCatalogId },
+            excludeAppliesToMovieTicket: false,
+            sort: false,
+            onlyValid: params.onlyValid === true,
+            availableAtOrFrom: params.availableAt
+        });
         return offers.map((o) => {
+            let sortIndex;
+            if (params.addSortIndex) {
+                sortIndex = sortedOfferIds.indexOf(String(o.id));
+            }
             const unitSpec = o.priceSpecification;
             const compoundPriceSpecification = {
-                // 不要な属性を除外(2022-11-02~)
-                // project: productWithOffers.project,
                 typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
                 priceCurrency: factory.priceCurrency.JPY,
                 valueAddedTaxIncluded: true,
@@ -36,10 +45,7 @@ function searchProductOffers(params) {
                     ...(unitSpec !== undefined) ? [unitSpec] : []
                 ]
             };
-            return Object.assign(Object.assign({ additionalProperty: (Array.isArray(o.additionalProperty)) ? o.additionalProperty : [], alternateName: o.alternateName, availability: o.availability, availableAtOrFrom: o.availableAtOrFrom, color: o.color, description: o.description, id: o.id, identifier: o.identifier, itemOffered: o.itemOffered, name: o.name, priceCurrency: o.priceCurrency, 
-                // 不要な属性を除外(2022-11-07~)
-                // project: o.project,
-                typeOf: o.typeOf, priceSpecification: compoundPriceSpecification }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined);
+            return Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray(o.additionalProperty)) ? o.additionalProperty : [], alternateName: o.alternateName, availability: o.availability, availableAtOrFrom: o.availableAtOrFrom, color: o.color, description: o.description, id: o.id, identifier: o.identifier, itemOffered: o.itemOffered, name: o.name, priceCurrency: o.priceCurrency, typeOf: o.typeOf, priceSpecification: compoundPriceSpecification }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined), (typeof sortIndex === 'number') ? { sortIndex } : undefined);
         });
     });
 }

package/lib/chevre/service/offer/product.d.ts

@@ -37,6 +37,10 @@ export { searchProductOffers };
  * プロダクトオファーを検索する
  */
 export declare function search(params: {
+    /**
+     * 指定したIDのオファーだけ取得する場合
+     */
+    ids?: string[];
     project: {
         id: string;
     };
@@ -50,7 +54,7 @@ export declare function search(params: {
         id: string;
     };
     onlyValid: boolean;
-    sort: boolean;
+    addSortIndex: boolean;
 }): (repos: {
     offer: OfferRepo;
     product: ProductRepo;

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

@@ -25,9 +25,8 @@ exports.ERROR_MESSAGE_ALREADY_REGISTERED = 'Already registered';
  */
 function search(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         const now = moment();
-        let offers = [];
         const searchProductsResult = yield repos.product.search({
             limit: 1,
             page: 1,
@@ -39,54 +38,63 @@ function search(params) {
             throw new factory.errors.NotFound('Product');
         }
         // 販売者指定の場合、検証
-        if (typeof ((_a = params.seller) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-            const productOffers = product.offers;
-            if (!Array.isArray(productOffers)) {
-                return offers;
-            }
-            const hasValidOffer = productOffers.some((o) => {
-                var _a, _b;
-                return ((_a = o.seller) === null || _a === void 0 ? void 0 : _a.id) === ((_b = params.seller) === null || _b === void 0 ? void 0 : _b.id)
-                    && o.validFrom !== undefined
-                    && moment(o.validFrom)
-                        .isSameOrBefore(now)
-                    && o.validThrough !== undefined
-                    && moment(o.validThrough)
-                        .isSameOrAfter(now);
-            });
-            if (!hasValidOffer) {
-                return offers;
+        if (product.typeOf === factory.product.ProductType.MembershipService
+            || product.typeOf === factory.product.ProductType.PaymentCard) {
+            if (typeof ((_a = params.seller) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+                const productOffers = product.offers;
+                if (!Array.isArray(productOffers)) {
+                    return [];
+                }
+                const hasValidOffer = productOffers.some((o) => {
+                    var _a, _b;
+                    return ((_a = o.seller) === null || _a === void 0 ? void 0 : _a.id) === ((_b = params.seller) === null || _b === void 0 ? void 0 : _b.id)
+                        && o.validFrom !== undefined
+                        && moment(o.validFrom)
+                            .isSameOrBefore(now)
+                        && o.validThrough !== undefined
+                        && moment(o.validThrough)
+                            .isSameOrAfter(now);
+                });
+                if (!hasValidOffer) {
+                    return [];
+                }
             }
         }
-        offers = yield (0, searchProductOffers_1.searchProductOffers)({
+        // let offers: factory.product.ITicketOffer[] = [];
+        return (0, searchProductOffers_1.searchProductOffers)({
+            ids: params.ids,
             itemOffered: { id: params.itemOffered.id },
-            sort: params.sort
+            availableAt: params.availableAt,
+            onlyValid: params.onlyValid,
+            addSortIndex: params.addSortIndex
         })(repos);
+        // Mongoへ移行(2023-03-01~)
         // 店舗条件によって対象を絞る
-        const storeId = (_b = params.availableAt) === null || _b === void 0 ? void 0 : _b.id;
-        if (typeof storeId === 'string') {
-            // アプリケーションが利用可能なオファーに絞る
-            offers = offers.filter((o) => {
-                return Array.isArray(o.availableAtOrFrom)
-                    && o.availableAtOrFrom.some((availableApplication) => availableApplication.id === storeId);
-            });
-        }
+        // const storeId = params.availableAt?.id;
+        // if (typeof storeId === 'string') {
+        //     // アプリケーションが利用可能なオファーに絞る
+        //     offers = offers.filter((o) => {
+        //         return Array.isArray(o.availableAtOrFrom)
+        //             && o.availableAtOrFrom.some((availableApplication) => availableApplication.id === storeId);
+        //     });
+        // }
+        // Mongoへ移行(2023-03-01~)
         // 有効期間を適用
-        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;
-            });
-        }
-        return offers;
+        // 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;
+        //     });
+        // }
+        // return offers;
     });
 }
 exports.search = search;
@@ -202,8 +210,7 @@ function fixProductAndOffers(params) {
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }
-        const availableOffers = yield search(Object.assign(Object.assign({ project: { id: params.project.id }, itemOffered: { id: String(product.id) }, onlyValid: true }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { availableAt: { id: params.location.id } } : undefined), { sort: false // ソート不要(2023-01-27~)
-         }))(repos);
+        const availableOffers = yield search(Object.assign({ ids: params.object.map((o) => String(o.id)), project: { id: params.project.id }, itemOffered: { id: String(product.id) }, onlyValid: true, addSortIndex: false }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { availableAt: { id: params.location.id } } : undefined))(repos);
         return { product, availableOffers };
     });
 }

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,32 @@ function creatPayTransactionStartParams(params) {
         : undefined);
 }
 exports.creatPayTransactionStartParams = creatPayTransactionStartParams;
+function createMovieTicket(params) {
+    var _a;
+    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: (typeof ((_a = params.category) === null || _a === void 0 ? void 0 : _a.codeValue) === 'string') ? 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/any.js

@@ -97,10 +97,17 @@ exports.invalidatePaymentUrl = invalidatePaymentUrl;
  */
 function processVoidPayTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.findById({
-            typeOf: params.purpose.typeOf,
-            id: params.purpose.id
-        });
+        let transaction;
+        // アクションID指定の場合、進行中取引検証(2023-02-24~)
+        if (typeof params.id === 'string') {
+            transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id });
+        }
+        else {
+            transaction = yield repos.transaction.findById({
+                typeOf: params.purpose.typeOf,
+                id: params.purpose.id
+            });
+        }
         // 承認アクションを取得
         let authorizeActions;
         if (typeof params.id === 'string') {

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/service/payment/paymentCard.d.ts

@@ -6,11 +6,15 @@ import { MongoRepository as ProductRepo } from '../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../repo/project';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 import { RedisRepository as TransactionNumberRepo } from '../../repo/transactionNumber';
-declare type IPendingTransaction = Pick<factory.account.transaction.withdraw.ITransaction, 'id' | 'object' | 'transactionNumber' | 'typeOf'>;
+declare type IPendingTransaction = Pick<factory.account.transaction.withdraw.ITransaction, 'id' | 'transactionNumber' | 'typeOf'>;
 declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string): (repos: {
     product: ProductRepo;
     project: ProjectRepo;
-}) => Promise<IPendingTransaction>;
+}) => Promise<{
+    pendingTransaction: IPendingTransaction;
+    currency: string;
+    accountNumber: string;
+}>;
 declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
     product: ProductRepo;
 }) => Promise<void>;

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

@@ -29,7 +29,7 @@ function authorize(params, paymentServiceId) {
             throw new factory.errors.ArgumentNull('transactionNumber');
         }
         // 決済方法検証
-        const permit = yield validatePaymentMethod(params, paymentServiceId)(repos);
+        const { permit, currency } = yield validatePaymentMethod(params, paymentServiceId)(repos);
         const accountNumber = (_a = permit.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber;
         if (typeof accountNumber !== 'string') {
             throw new factory.errors.ArgumentNull('permit.paymentAccount.accountNumber');
@@ -55,13 +55,13 @@ function authorize(params, paymentServiceId) {
             // PecorinoAPIのエラーをハンドリング
             throw (0, errorHandler_1.handlePecorinoError)(error);
         }
-        return pendingTransaction;
+        return { pendingTransaction, currency, accountNumber };
     });
 }
 exports.authorize = authorize;
 function validatePaymentMethod(params, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const serviceOutputIdentifier = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.accountId;
         const amount = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.amount;
         const paymentMethodType = (_c = params.object.paymentMethod) === null || _c === void 0 ? void 0 : _c.typeOf;
@@ -74,6 +74,14 @@ function validatePaymentMethod(params, paymentServiceId) {
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
         }
+        // プロダクトから通貨区分を取得
+        const paymentCatdProduct = yield repos.product.findById({
+            id: paymentServiceId
+        });
+        const currency = (_e = (_d = paymentCatdProduct.serviceOutput) === null || _d === void 0 ? void 0 : _d.amount) === null || _e === void 0 ? void 0 : _e.currency;
+        if (typeof currency !== 'string') {
+            throw new factory.errors.NotFound('product.serviceOutput.amount.currency');
+        }
         // プロダクトのavailableChannelを取得する
         const availableChannel = yield repos.product.findAvailableChannel({
             project: { id: params.project.id },
@@ -83,9 +91,9 @@ function validatePaymentMethod(params, paymentServiceId) {
         const permitService = new pecorinoapi.service.Permit({
             endpoint: String(availableChannel.serviceUrl),
             auth: new pecorinoapi.auth.ClientCredentials({
-                domain: String((_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.authorizeServerDomain),
-                clientId: String((_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.clientId),
-                clientSecret: String((_f = availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.clientSecret),
+                domain: String((_f = availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.authorizeServerDomain),
+                clientId: String((_g = availableChannel.credentials) === null || _g === void 0 ? void 0 : _g.clientId),
+                clientSecret: String((_h = availableChannel.credentials) === null || _h === void 0 ? void 0 : _h.clientSecret),
                 scopes: [],
                 state: ''
             })
@@ -97,7 +105,7 @@ function validatePaymentMethod(params, paymentServiceId) {
             issuedThrough: { typeOf: factory.product.ProductType.PaymentCard }
         });
         // サービスタイプを確認
-        if (((_h = (_g = serviceOutput.issuedThrough) === null || _g === void 0 ? void 0 : _g.serviceType) === null || _h === void 0 ? void 0 : _h.codeValue) !== paymentMethodType) {
+        if (((_k = (_j = serviceOutput.issuedThrough) === null || _j === void 0 ? void 0 : _j.serviceType) === null || _k === void 0 ? void 0 : _k.codeValue) !== paymentMethodType) {
             throw new factory.errors.Argument('object.paymentMethod.accountId', 'paymentMethodType not matched');
         }
         // 出金金額設定を確認
@@ -112,7 +120,7 @@ function validatePaymentMethod(params, paymentServiceId) {
                 throw new factory.errors.Argument('object.paymentMethod.amount', `maximum payment amount requirement not satisfied`);
             }
         }
-        return serviceOutput;
+        return { permit: serviceOutput, currency };
     });
 }
 function processAccountTransaction(params) {

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

@@ -30,6 +30,9 @@ export declare function activate(params: {
 }): (repos: {
     serviceOutput: ServiceOutputRepo;
 }) => Promise<factory.permit.IPermit>;
+declare type IPermitWithAccountDetail = Omit<factory.permit.IPermit, 'paymentAccount'> & {
+    paymentAccount?: factory.permit.IPaymentAccountWithDetail;
+};
 /**
  * プロジェクト指定で、許可証を検索する(ペイメントカードプロダクトの場合、口座詳細込み)
  */
@@ -38,4 +41,5 @@ export declare function search(project: {
 }, params: factory.product.IServiceOutputSearchConditions, projection?: any): (repos: {
     account: AccountRepo;
     serviceOutput: ServiceOutputRepo;
-}) => Promise<factory.permit.IPermit[]>;
+}) => Promise<IPermitWithAccountDetail[]>;
+export {};